Update grammar files and move from antlr4ts to antlr4

Author: rkalis

package-lock.json

@@ -73,17 +73,17 @@
         ]
     },
     "dependencies": {
-        "antlr4ts": "^0.5.0-alpha.4",
+        "antlr4": "^4.13.1-patch-1",
         "vsce": "^2.15.0",
         "vscode-languageclient": "^7.0.0",
         "vscode-languageserver": "^7.0.0",
         "vscode-languageserver-textdocument": "^1.0.4",
         "vscode-test": "^1.6.1"
     },
     "devDependencies": {
-        "@types/node": "^20.3.3",
+        "@types/node": "^18.7.23",
         "@types/vscode": "^1.83.0",
         "esbuild": "^0.12.29",
-        "typescript": "^4.5.5"
+        "typescript": "^5.5.4"
     }
 }

package.json

@@ -1,30 +1,26 @@
-import { ANTLRInputStream, CommonTokenStream } from 'antlr4ts';
+import { CharStream, CommonTokenStream } from 'antlr4';
 import { Diagnostic } from 'vscode-languageserver';
 import { SafeErrorListener, SafeErrorStrategy } from './ErrorListeners';
-import { CashScriptLexer } from './grammar/CashScriptLexer';
-import { CashScriptParser } from './grammar/CashScriptParser';
+import CashScriptLexer from './grammar/CashScriptLexer';
+import CashScriptParser from './grammar/CashScriptParser';
 
 export default class CashscriptLinter {
-
-	static getDiagnostics(code:string):Diagnostic[]{
-
+	static getDiagnostics(code: string): Diagnostic[] {
 		const errListener = new SafeErrorListener();
 
-		const inputStream = new ANTLRInputStream(code);
+		const inputStream = new CharStream(code);
 		const lexer = new CashScriptLexer(inputStream);
 		lexer.removeErrorListeners();
 		lexer.addErrorListener(errListener);
 
 		const tokenStream = new CommonTokenStream(lexer);
 		const parser = new CashScriptParser(tokenStream);
-		parser.errorHandler = new SafeErrorStrategy();
+		parser._errHandler = new SafeErrorStrategy();
 		parser.removeErrorListeners();
 		parser.addErrorListener(errListener);
 		const parseTree = parser.sourceFile();
-		
+
 		return errListener.getErrs()
 	}
 
 }
-
-

src/CashscriptLinter/CashscriptLinter.ts

@@ -1,7 +1,7 @@
-import { ANTLRErrorListener, DefaultErrorStrategy, Parser, RecognitionException, Recognizer } from 'antlr4ts';
+import { ErrorListener, DefaultErrorStrategy, Parser, RecognitionException, Recognizer } from 'antlr4';
 import { Diagnostic, DiagnosticSeverity, Range } from 'vscode-languageserver';
 
-export class SafeErrorListener implements ANTLRErrorListener<any> {
+export class SafeErrorListener extends ErrorListener<any> {
     static readonly INSTANCE = new SafeErrorListener();
 
 	errs:Diagnostic[] = []
@@ -11,7 +11,7 @@ export class SafeErrorListener implements ANTLRErrorListener<any> {
 	}
 
 	syntaxError<T>(
-	  recognizer: Recognizer<T, any>,
+	  recognizer: Recognizer<T>,
 	  offendingSymbol: T,
 	  line: number,
 	  charPositionInLine: number,
@@ -42,4 +42,4 @@ export class SafeErrorStrategy extends DefaultErrorStrategy{
 	sync(recognizer: Parser): void {
 		return
 	}
-}
+}

src/CashscriptLinter/ErrorListeners.ts

@@ -68,11 +68,11 @@ assignStatement
     ;
 
 timeOpStatement
-    : 'require' '(' TxVar '>=' expression (',' StringLiteral)? ')' ';'
+    : 'require' '(' TxVar '>=' expression (',' requireMessage)? ')' ';'
     ;
 
 requireStatement
-    : 'require' '(' expression (',' StringLiteral)? ')' ';'
+    : 'require' '(' expression (',' requireMessage)? ')' ';'
     ;
 
 ifStatement
@@ -83,12 +83,13 @@ consoleStatement
     : 'console.log' consoleParameterList ';'
     ;
 
+requireMessage
+    : StringLiteral
+    ;
+
 consoleParameter
     : Identifier
-    | StringLiteral
-    | NumberLiteral
-    | HexLiteral
-    | BooleanLiteral
+    | literal
     ;
 
 consoleParameterList
@@ -164,7 +165,15 @@ NumberUnit
     ;
 
 NumberLiteral
-    : [-]?[0-9]+ ([eE] [0-9]+)?
+    : '-'? NumberPart ExponentPart?
+    ;
+
+NumberPart
+    : [0-9]+ ('_' [0-9]+)*
+    ;
+
+ExponentPart
+    : [eE] NumberPart
     ;
 
 Bytes