Resolves #32 - Cross-dependency issue between server/parser

lispercat · Dec 15, 2022 · 0a57f05 · 0a57f05
1 parent d9a1ff9
commit 0a57f05
Show file tree

Hide file tree

Showing 23 changed files with 3,481 additions and 58 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,11 @@
     "license": "MIT",
     "publisher": "AndreiStebakov",
     "contributors": [
-        "Andrei Stebakov"
+        "Andrei Stebakov",
+        {
+            "name": "Anthony Conrad",
+            "email": "parithon@outlook.com"
+        }
     ],
     "categories": [
         "Other"
@@ -292,7 +296,7 @@
         "watch": "tsc -b -w",
         "postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
         "test": "node ./test/out/runTest.js",
-        "antlr4ts": "del-cli parser/src/SPBS* !parser/src/*Impl.ts && antlr4ts -visitor -o parser/src -Xexact-output-dir beanshell_grammar/SPBSLexer.g4 beanshell_grammar/SPBSParser.g4"
+        "antlr4ts": "del-cli server/src/parser/SPBS* !server/src/parser/*Impl.ts && antlr4ts -visitor -o server/src/parser -Xexact-output-dir beanshell_grammar/SPBSLexer.g4 beanshell_grammar/SPBSParser.g4"
     },
     "devDependencies": {
         "@types/glob": "^7.1.4",

diff --git a/parser/package.json b/parser/package.json
diff --git a/parser/tsconfig.json b/parser/tsconfig.json
diff --git a/parser/tsconfig.tsbuildinfo b/parser/tsconfig.tsbuildinfo
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/parser/src/LexerErrorListenerImpl.ts → server/src/parser/LexerErrorListenerImpl.ts b/parser/src/LexerErrorListenerImpl.ts → server/src/parser/LexerErrorListenerImpl.ts
diff --git a/parser/src/ParserErrorListenerImpl.ts → server/src/parser/ParserErrorListenerImpl.ts b/parser/src/ParserErrorListenerImpl.ts → server/src/parser/ParserErrorListenerImpl.ts
diff --git a/parser/src/SPBSLexer.interp → server/src/parser/SPBSLexer.interp b/parser/src/SPBSLexer.interp → server/src/parser/SPBSLexer.interp
diff --git a/parser/src/SPBSLexer.tokens → server/src/parser/SPBSLexer.tokens b/parser/src/SPBSLexer.tokens → server/src/parser/SPBSLexer.tokens
diff --git a/parser/src/SPBSLexer.ts → server/src/parser/SPBSLexer.ts b/parser/src/SPBSLexer.ts → server/src/parser/SPBSLexer.ts
diff --git a/parser/src/SPBSObjectParserVisitorImpl.ts → ...src/parser/SPBSObjectParserVisitorImpl.ts b/parser/src/SPBSObjectParserVisitorImpl.ts → ...src/parser/SPBSObjectParserVisitorImpl.ts
diff --git a/parser/src/SPBSParser.interp → server/src/parser/SPBSParser.interp b/parser/src/SPBSParser.interp → server/src/parser/SPBSParser.interp
diff --git a/parser/src/SPBSParser.tokens → server/src/parser/SPBSParser.tokens b/parser/src/SPBSParser.tokens → server/src/parser/SPBSParser.tokens
diff --git a/parser/src/SPBSParser.ts → server/src/parser/SPBSParser.ts b/parser/src/SPBSParser.ts → server/src/parser/SPBSParser.ts
diff --git a/parser/src/SPBSParserListener.ts → server/src/parser/SPBSParserListener.ts b/parser/src/SPBSParserListener.ts → server/src/parser/SPBSParserListener.ts
diff --git a/parser/src/SPBSParserListenerImpl.ts → server/src/parser/SPBSParserListenerImpl.ts b/parser/src/SPBSParserListenerImpl.ts → server/src/parser/SPBSParserListenerImpl.ts
@@ -2,7 +2,7 @@ import { ErrorNode } from 'antlr4ts/tree/ErrorNode';
 import {SPBSParserListener} from './SPBSParserListener'
 import { Xml_elementContext } from "./SPBSParser";
 import { TerminalNode } from 'antlr4ts/tree/TerminalNode';
-import {IIQObjectInfoImpl}  from '../../server/out/common-types'; 
+import {IIQObjectInfoImpl, IIQObjectType}  from '../common-types'; 
 
 export class SPBSParserListenerImpl implements SPBSParserListener{
   private m_errors: Object[];
@@ -51,7 +51,7 @@ export class SPBSParserListenerImpl implements SPBSParserListener{
                             .filter(attr => attr.XMLName().text == "language")
                             .map(el => el.STRING().text.replace(/'|"/g, ""))
                             .reduce((prev, curr) => prev + curr, "");
-      this.m_data["type"] = "Rule";
+      this.m_data["type"] = IIQObjectType.Rule;
       this.m_data["name"] = name;
       if(null == this.m_data["language"]){
         this.m_data["language"] = language;

diff --git a/parser/src/SPBSParserVisitor.ts → server/src/parser/SPBSParserVisitor.ts b/parser/src/SPBSParserVisitor.ts → server/src/parser/SPBSParserVisitor.ts
diff --git a/parser/src/SPBSParserVisitorImpl.ts → server/src/parser/SPBSParserVisitorImpl.ts b/parser/src/SPBSParserVisitorImpl.ts → server/src/parser/SPBSParserVisitorImpl.ts
diff --git a/server/src/server.ts b/server/src/server.ts
@@ -15,13 +15,13 @@ import {
 
 import { createConnection } from 'vscode-languageserver/node';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import {SPBSLexer} from '../../parser/out/SPBSLexer';
-import {SPBSParser} from '../../parser/out/SPBSParser';
-import {SPBSParserVisitorImpl} from '../../parser/out/SPBSParserVisitorImpl';
+import {SPBSLexer} from './parser/SPBSLexer';
+import {SPBSParser} from './parser/SPBSParser';
+import {SPBSParserVisitorImpl} from './parser/SPBSParserVisitorImpl';
 import {CharStreams, CommonTokenStream} from 'antlr4ts';
-import {ParserErrorListenerImpl} from "../../parser/out/ParserErrorListenerImpl";
-import {LexerErrorListenerImpl} from "../../parser/out/LexerErrorListenerImpl";
-import {SPBSParserListenerImpl} from "../../parser/out/SPBSParserListenerImpl";
+import {ParserErrorListenerImpl} from "./parser/ParserErrorListenerImpl";
+import {LexerErrorListenerImpl} from "./parser/LexerErrorListenerImpl";
+import {SPBSParserListenerImpl} from "./parser/SPBSParserListenerImpl";
 import { IIQObjectInfo, IIQDictionary, IIQObjectInfoImpl } from './common-types'; 
 import * as proto from 'vscode-languageserver-protocol';
 import * as fs from 'fs';

diff --git a/server/tsconfig.json b/server/tsconfig.json
@@ -8,8 +8,5 @@
     "rootDir": "src"
   },
   "include": ["src"],
-  "exclude": ["node_modules", ".vscode-test"],
-  "references": [
-    { "path": "../parser" }
-  ]
+  "exclude": ["node_modules", ".vscode-test"]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -16,7 +16,6 @@
   ],
   "references": [
     { "path": "./client" },
-    { "path": "./parser" },
     { "path": "./server" },
     { "path": "./test" }
   ]