Merge pull request #150 from svmukhin/147

147 Migrate from unmaintained antlr4ts to official ANTLR4 TypeScript target

Author: yegor256

.gitignore

@@ -10,3 +10,4 @@ src/parser/
 .claude/
 Eo.g4
 compiled/
+antlr4/

Makefile

@@ -8,6 +8,12 @@ SHELL := bash
 
 VERSION := 0.58.8
 GRAMMAR_URL := https://raw.githubusercontent.com/objectionary/eo/refs/tags/$(VERSION)/eo-parser/src/main/antlr4/org/eolang/parser/Eo.g4
+ANTLR4_VERSION := 4.13.2
+
+# a few URLs for download antlr4 tools
+# ANTLR4_URL := https://github.com/antlr/website-antlr4/blob/gh-pages/download/antlr-${ANTLR4_VERSION}-complete.jar
+# ANTLR4_URL := https://repo1.maven.org/maven2/org/antlr/antlr4/${ANTLR4_VERSION}/antlr4-${ANTLR4_VERSION}-complete.jar
+ANTLR4_URL := https://www.antlr.org/download/antlr-${ANTLR4_VERSION}-complete.jar
 
 TSS := $(shell find src -name '*.ts')
 
@@ -30,8 +36,12 @@ tsc-compiled: $(TSS) Makefile
 Eo.g4: Makefile
 	curl --silent $(GRAMMAR_URL) > $@
 
-src/parser: Eo.g4 Makefile
-	npx antlr4ts -visitor $< -o src/parser
+antlr4: Makefile
+	mkdir -p $@
+	curl --silent ${ANTLR4_URL} > $@/antlr4-${ANTLR4_VERSION}-complete.jar
+
+src/parser: Eo.g4 antlr4 Makefile
+	java -jar antlr4/antlr4-${ANTLR4_VERSION}-complete.jar -o src/parser -visitor -Dlanguage=TypeScript Eo.g4 
 
 test: build
 	npx jest --coverage

package-lock.json

@@ -10,7 +10,6 @@
   },
   "dependencies": {
     "antlr4": "^4.13.2",
-    "antlr4ts": "^0.5.0-alpha.4",
     "vscode-languageserver": "^9.0.0",
     "vscode-languageserver-textdocument": "^1.0.4"
   },
@@ -28,7 +27,6 @@
     "@typescript-eslint/parser": "^8.0.0",
     "@vercel/ncc": "^0.38.3",
     "@yao-pkg/pkg": "^6.4.0",
-    "antlr4ts-cli": "^0.5.0-alpha.4",
     "babel-jest": "^30.0.0",
     "eslint": "^8.28.0",
     "eslint-config-eslint": "^7.0.0",

package.json

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (c) 2024-2025 Objectionary.com
 // SPDX-License-Identifier: MIT
 
-import { Token, CommonToken, Lexer, CharStream } from "antlr4ts";
-import { EoLexer } from "./parser/EoLexer";
-import { EoParser } from "./parser/EoParser";
+import { Token, CommonToken, Lexer, CharStream } from "antlr4";
+import EoLexer from "./parser/EoLexer";
+import EoParser from "./parser/EoParser";
 
 /**
  * Custom lexer that wraps EoLexer to handle indentation-based TAB/UNTAB tokens
@@ -42,7 +42,7 @@ export class IndentationLexer extends Lexer {
      */
     private emitIndent(shift: number): void {
         for (let i = 0; i < shift; i++) {
-            this.emitToken(IndentationLexer.TAB);
+            this.emitIndentationToken(IndentationLexer.TAB);
         }
     }
 
@@ -53,7 +53,7 @@ export class IndentationLexer extends Lexer {
      */
     private emitDedent(shift: number): void {
         for (let i = 0; i < shift; i++) {
-            this.emitToken(IndentationLexer.UNTAB);
+            this.emitIndentationToken(IndentationLexer.UNTAB);
         }
     }
 
@@ -63,10 +63,10 @@ export class IndentationLexer extends Lexer {
      * @param type - Token type (must be IndentationLexer.TAB or IndentationLexer.UNTAB)
      * @returns Void
      */
-    private emitToken(type: number) {
-        const tkn = new CommonToken(type, type === IndentationLexer.TAB ? "TAB" : "UNTAB");
+    private emitIndentationToken(type: number) {
+        const tkn = new CommonToken([this.wrapped, this._input], type, Token.DEFAULT_CHANNEL, 0, 0);
         tkn.line = this.wrapped.line;
-        tkn.charPositionInLine = 0;
+        tkn.column = 0;
         this.tokens.push(tkn);
     }
 
@@ -176,10 +176,7 @@ export class IndentationLexer extends Lexer {
     get ruleNames(): string[] {
         return this.wrapped.ruleNames;
     }
-    get serializedATN(): string {
+    get serializedATN(): number[] {
         return this.wrapped.serializedATN;
     }
-    get vocabulary(): any {
-        return this.wrapped.vocabulary;
-    }
 }

src/IndentationLexer.ts

@@ -8,10 +8,10 @@
 
 import {
     Token as AntlrToken,
-    ANTLRErrorListener,
+    ErrorListener as ANTLRErrorListener,
     Recognizer,
     RecognitionException
-} from "antlr4ts";
+} from "antlr4";
 import { ParserError } from "./parserError";
 
 export class ErrorListener implements ANTLRErrorListener<AntlrToken> {
@@ -21,7 +21,7 @@ export class ErrorListener implements ANTLRErrorListener<AntlrToken> {
      */
     errors: ParserError[] = [];
 
-    syntaxError(recognizer: Recognizer<AntlrToken, any>, symbol: AntlrToken | undefined, line: number,
+    syntaxError(recognizer: Recognizer<AntlrToken>, symbol: AntlrToken | undefined, line: number,
         position: number, msg: string, e: RecognitionException | undefined) {
         this.errors.push(new ParserError(line, position, msg));
     }

src/errorListener.ts

@@ -3,7 +3,7 @@
 
 import * as fs from "fs";
 import * as path from "path";
-import { Token as AntlrToken } from "antlr4ts";
+import { Token as AntlrToken } from "antlr4";
 import { Processor } from "./processor";
 import { ParserError } from "./parserError";
 import { ErrorListener } from "./errorListener";
@@ -91,7 +91,7 @@ export function getTokenTypes(): Set<string> {
 export function tokenize(input: string): AntlrToken[] {
     const processor = new Processor(input);
     processor.tokens.fill();
-    return processor.tokens.getTokens();
+    return processor.tokens.tokens;
 }
 
 /**

src/parser.ts

@@ -4,18 +4,17 @@
 import {
     CharStreams,
     CommonTokenStream,
-    CodePointCharStream
-} from "antlr4ts";
-import { EoLexer } from "./parser/EoLexer";
-import { EoParser } from "./parser/EoParser";
+    CharStream
+} from "antlr4";
 import { IndentationLexer } from "./IndentationLexer";
+import EoParser from "./parser/EoParser";
 
 export class Processor {
 
     /**
      * Text to be lexed and parsed
      */
-    stream: CodePointCharStream;
+    stream: CharStream;
 
     /**
      * EO grammar lexer with indentation support

src/processor.ts

@@ -128,8 +128,8 @@ export class SemanticTokensProvider {
             }
             tokens.push({
                 line: tk.line - 1,
-                start: tk.charPositionInLine,
-                length: tk.stopIndex - tk.startIndex + 1,
+                start: tk.column,
+                length: tk.stop - tk.start + 1,
                 tokenType: legend,
                 tokenModifier: 0
             });

src/semantics.ts

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: Copyright (c) 2024-2025 Objectionary.com
 // SPDX-License-Identifier: MIT
 
-import { CharStreams, Token, VocabularyImpl } from "antlr4ts";
+import { CharStreams, Token } from "antlr4";
 import { IndentationLexer } from "../src/IndentationLexer";
-import { EoLexer } from "../src/parser/EoLexer";
+import EoLexer from "../src/parser/EoLexer";
 
 describe("IndentationLexer", () => {
 
@@ -37,8 +37,6 @@ describe("IndentationLexer", () => {
             expect(lexer.ruleNames).toEqual(EoLexer.ruleNames);
             /* eslint-disable-next-line no-underscore-dangle */
             expect(lexer.serializedATN).toEqual(EoLexer._serializedATN);
-            expect(lexer.vocabulary).toBeInstanceOf(VocabularyImpl);
-            expect(lexer.vocabulary).toEqual(EoLexer.VOCABULARY);
         });
 
     });