antlr
diff --git a/‎.github/workflows/hosted.yml
Lines changed: 2 additions & 1 deletion b/‎.github/workflows/hosted.yml
Lines changed: 2 additions & 1 deletion
diff --git a/‎doc/javascript-target.md
Lines changed: 1 addition & 2 deletions b/‎doc/javascript-target.md
Lines changed: 1 addition & 2 deletions
diff --git a/‎doc/targets.md
Lines changed: 1 addition & 0 deletions b/‎doc/targets.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎doc/typescript-target.md
Lines changed: 125 additions & 0 deletions b/‎doc/typescript-target.md
Lines changed: 125 additions & 0 deletions
diff --git a/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserErrors/ExtraneousInput.txt
Lines changed: 1 addition & 0 deletions b/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserErrors/ExtraneousInput.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Performance/DropLoopEntryBranchInLRRule_4.txt
Lines changed: 1 addition & 0 deletions b/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/Performance/DropLoopEntryBranchInLRRule_4.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/SemPredEvalParser/PredFromAltTestedInLoopBack_1.txt
Lines changed: 1 addition & 0 deletions b/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/SemPredEvalParser/PredFromAltTestedInLoopBack_1.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/Test.ts.stg
Lines changed: 63 additions & 0 deletions b/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/Test.ts.stg
Lines changed: 63 additions & 0 deletions
diff --git a/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package.json renamed to ‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package_js.json b/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package.json renamed to ‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package_js.json
diff --git a/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package_ts.json
Lines changed: 9 additions & 0 deletions b/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package_ts.json
Lines changed: 9 additions & 0 deletions
diff --git a/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/tsconfig.json
Lines changed: 11 additions & 0 deletions b/‎runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/tsconfig.json
Lines changed: 11 additions & 0 deletions
@@ -167,6 +167,7 @@ jobs:
           go,
           java,
           javascript,
+          typescript,
           php,
           python2,
           python3,
@@ -242,7 +243,7 @@ jobs:
         architecture: 'x64'
 
     - name: Set up Node 14
-      if: matrix.target == 'javascript'
+      if: (matrix.target == 'javascript') || (matrix.target == 'typescript')
       uses: actions/[email protected]
       with:
         node-version: '14'
 
@@ -195,14 +195,13 @@ antlr4.tree.ParseTreeWalker.DEFAULT.walk(printer, tree);
 
 ## What about TypeScript?
 
-We currently do not have a TypeScript target, but Sam Harwell is [working on a port](https://github.com/tunnelvisionlabs/antlr4ts). [Here](https://github.com/ChuckJonas/extract-interface-ts) is Section 4.3 of [ANTLR 4 book](http://a.co/5jUJYmh) converted to typescript.
+We have a [TypeScript target](typescript-target.md), based on the JavaScript target.
 
 ## How do I integrate my parser with ACE editor?
 
 This specific task is described in this [dedicated page](ace-javascript-target.md).
  
 ## How can I learn more about ANTLR?
- 
 
 Further information can be found from  "The definitive ANTLR 4 reference" book.
 
 
@@ -6,6 +6,7 @@ This page lists the available and upcoming ANTLR runtimes. Please note that you
 * [C#](csharp-target.md)
 * [Python](python-target.md) (2 and 3)
 * [JavaScript](javascript-target.md)
+* [TypeScript](typescript-target.md)
 * [Go](go-target.md)
 * [C++](cpp-target.md)
 * [Swift](swift-target.md)
 
@@ -0,0 +1,125 @@
+# TypeScript
+
+Antlr4 TypeScript runtime uses the JavaScript runtime and adds type files to it.
+This guarantees the same behaviour and performance across both target languages.
+Generated lexers, parsers, listeners and visitors are generated in TypeScript.
+
+The runtime is built using TypeScript v4.8.3, node 16.17 and webpack 5.66.
+It may work with older versions but they have not been tested and they will not be supported.
+
+
+## How to create a TypeScript lexer or parser?
+
+This is pretty much the same as creating a Java lexer or parser, except you need to specify the language target, for example:
+
+```bash
+$ antlr4 -Dlanguage=TypeScript MyGrammar.g4
+```
+
+For a full list of antlr4 tool options, please visit the [tool documentation page](tool-options.md).
+
+## Where can I get the runtime?
+
+Once you've generated the lexer and/or parser code, you need to download the runtime from [npm](https://www.npmjs.com/package/antlr4).
+
+We will not document here how to refer to the runtime from your project, since this would differ a lot depending on your project type and IDE. 
+
+## How do I get the runtime in my browser?
+
+The runtime is webpacked and sits in the dist folder. A .map file is also provided.
+
+## How do I run the generated lexer and/or parser?
+
+Let's suppose that your grammar is named, as above, "MyGrammar". Let's suppose this parser comprises a rule named "MyStartRule". The tool will have generated for you the following files:
+
+*   MyGrammarLexer.js
+*   MyGrammarParser.js
+*   MyGrammarListener.js (if you have not activated the -no-listener option)
+*   MyGrammarVisitor.js (if you have activated the -visitor option)
+   
+There is no listener or visitor interface generated, instead the generated listener and visitor class methods are implemented using lambdas.
+
+Now a fully functioning script might look like the following:
+
+```typescript
+import { CharStream, CommonTokenStream }  from 'antlr4';
+import MyGrammarLexer from './MyGrammarLexer';
+import MyGrammarParser from './MyGrammarParser';
+
+const input = "your text to parse here"
+const chars = new CharStream(input); // replace this with a FileStream as required
+const lexer = new MyGrammarLexer(chars);
+const tokens = new CommonTokenStream(lexer);
+const parser = new MyGrammarParser(tokens);
+const tree = parser.MyStartRule();
+
+```
+
+Tha above program will work. But it won't be useful unless you do one of the following:
+
+* you visit the parse tree using a custom listener
+* you visit the parse tree using a custom visitor
+* your grammar contains production code (like AntLR3)
+ 
+(please note that production code is target specific, so you can't have multi target grammars that include production code)
+ 
+## How do I create and run a visitor?
+
+You need to create a custom visitor and use it to visit the parse tree, as follows:
+```typescript
+
+import { ParserRuleContext } from 'antlr4';
+import MyGrammarVisitor from './MyGrammarVisitor';
+
+class CustomVisitor extends MyGrammarVisitor {
+
+  visitChildren(ctx: ParserRuleContext) {
+    if (!ctx) {
+      return;
+    }
+    if (ctx.children) {
+      return ctx.children.map(child => {
+        if (child.children && child.children.length != 0) {
+          return child.accept(this);
+        } else {
+          return child.getText();
+        }
+      });
+    }
+  }
+}
+
+tree.accept(new Visitor());
+````
+
+## How do I create and run a custom listener?
+
+You need to create a custom listener and use it to visit the parse tree, as follows:
+
+```typescript
+
+import { ParseTreeWalker } from 'antlr4';
+import MyGrammarListener from './MyGrammarListener';
+
+class MyTreeWalker extends MyGrammarListener {
+
+    exitMyStartRule = (ctx: MyStartRuleContext) => {
+        console.log("In MyStartRule");
+    };
+    
+}
+
+const walker = new MyTreeWalker();
+ParseTreeWalker.DEFAULT.walk(walker, tree);
+
+```
+
+## How do I integrate my parser with ACE editor?
+
+This specific task is described in this [dedicated page](ace-javascript-target.md).
+ 
+## How can I learn more about ANTLR?
+
+Further information can be found from  "The definitive ANTLR 4 reference" book.
+
+The TypeScript implementation of ANTLR is based on the JavaScript implementation, which is as close as possible to the Java one, so you shouldn't find it difficult to adapt the book's examples to TypeScript.
@@ -26,6 +26,7 @@ Cpp
 CSharp
 Go
 JavaScript
+TypeScript
 PHP
 Python2
 Python3
@@ -54,5 +54,6 @@ between X1 and X2 or between X3 and X4
 Python2
 Python3
 JavaScript
+TypeScript
 PHP
 
@@ -39,6 +39,7 @@ CSharp
 Dart
 Go
 JavaScript
+TypeScript
 PHP
 Python2
 Python3
@@ -0,0 +1,63 @@
+import {
+	FileStream,
+	CommonTokenStream,
+	DiagnosticErrorListener,
+	Lexer,
+	ParseTreeListener,
+	ParseTreeWalker,
+	RuleContext,
+	ParserRuleContext,
+	RuleNode
+} from 'antlr4';
+import <lexerName> from './<lexerName>.js';
+<if(parserName)>
+import <parserName> from './<parserName>.js';
+<if(useListener)>
+import <grammarName>Listener from './<grammarName>Listener.js';
+<endif>
+<if(useVisitor)>
+import <grammarName>Visitor from './<grammarName>Visitor.js';
+<endif>
+
+class TreeShapeListener extends ParseTreeListener {
+    enterEveryRule(ctx: ParserRuleContext) {
+        for (let i = 0; i \< ctx.getChildCount(); i++) {
+            const child = ctx.getChild(i) as RuleContext;
+            const parent = child.parentCtx;
+            if (parent!.ruleContext !== ctx || !(parent instanceof RuleNode)) {
+                throw `Invalid parse tree shape detected.`;
+            }
+        }
+    }
+}
+<endif>
+
+function main(argv: string[]): void {
+    const input = new FileStream(argv[2], true);
+    const lexer = new <lexerName>(input);
+    const stream = new CommonTokenStream(lexer);
+<if(parserName)>
+    const parser = new <parserName>(stream);
+<if(showDiagnosticErrors)>
+    parser.addErrorListener(new DiagnosticErrorListener());
+<endif>
+    parser.buildParseTrees = true;
+    parser.printer = {
+        println : function(s: string) { console.log(s); },
+        print : function(s: string) { process.stdout.write(s); }
+    };
+    const tree = parser.<parserStartRuleName>();
+    ParseTreeWalker.DEFAULT.walk(new TreeShapeListener(), tree);
+<else>
+    stream.fill();
+    for(let i=0; i\<stream.tokens.length; i++) {
+        console.log(stream.tokens[i].toString());
+    }
+<if(showDFA)>
+    process.stdout.write(lexer._interp.decisionToDFA[Lexer.DEFAULT_MODE].toLexerString());
+<endif>
+<endif>
+}
+
+main(process.argv);
+
@@ -0,0 +1,9 @@
+{
+  "type": "module",
+   "devDependencies": {
+    "@types/node": "^18.0.5"
+   },
+  "dependencies": {
+    "antlr4": "^4.10.1"
+  }
+}
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "module": "ES2020",
+    "moduleResolution": "node",
+    "target": "ES6",
+    "noImplicitAny": true,
+  },
+  "ts-node": {
+    "esm": true
+  }
+}