Fixed left recursive rule invocation problem

The initial invocation of a left recursive rule requires a precedence value of 0, which was not set before.

src/analysis/LeftRecursiveRuleAnalyzer.ts

@@ -229,8 +229,7 @@ export class LeftRecursiveRuleAnalyzer extends LeftRecursiveRuleWalker {
             opPrecRuleAlts.set(key, value);
         });
 
-        for (const alt of opPrecRuleAlts.keys()) {
-            const altInfo = opPrecRuleAlts.get(alt);
+        for (const [alt, altInfo] of opPrecRuleAlts) {
             const altST = LeftRecursiveRuleAnalyzer.#recRuleTemplates.getInstanceOf("recRuleAlt")!;
             const predST = this.codegenTemplates.getInstanceOf("recRuleAltPredicate")!;
             predST.add("opPrec", this.precedence(alt));

src/analysis/LeftRecursiveRuleTransformer.ts

@@ -79,8 +79,9 @@ export class LeftRecursiveRuleTransformer {
         }
 
         // update all refs to recursive rules to have [0] argument
-        for (const r of this.ast.getNodesWithType(ANTLRv4Parser.RULE_REF)) {
-            if (r.getParent()!.getType() !== ANTLRv4Parser.RULE) { // must be rule def
+        const ruleRefs = this.ast.getNodesWithType(ANTLRv4Parser.RULE_REF);
+        for (const r of ruleRefs) {
+            if (r.getParent()!.getType() === ANTLRv4Parser.RULE) { // must be rule def
                 continue;
             }
 

src/support/ParseTreeToASTConverter.ts

@@ -99,7 +99,7 @@ export class ParseTreeToASTConverter {
             const ruleAST = this.createVirtualASTNode(RuleAST, ANTLRv4Lexer.RULE, rule, "RULE");
             ast.addChild(ruleAST);
 
-            ruleAST.addChild(this.createVirtualASTNode(RuleRefAST, ANTLRv4Parser.RULE_REF, parserRule.RULE_REF()));
+            ruleAST.addChild(new TerminalAST(this.createToken(ANTLRv4Parser.RULE_REF, parserRule.RULE_REF())));
             if (parserRule.argActionBlock()) {
                 this.convertArgActionBlockToAST(ANTLRv4Lexer.ARG_ACTION, parserRule.argActionBlock()!, ruleAST);
             }

src/tool/ast/GrammarASTWithOptions.ts

@@ -12,10 +12,10 @@ import { GrammarAST } from "./GrammarAST.js";
 export abstract class GrammarASTWithOptions extends GrammarAST {
     public override readonly astType: string = "GrammarASTWithOptions";
 
-    #options = new Map<string, GrammarAST | null>();
+    private options = new Map<string, GrammarAST | null>();
 
     public setOption(key: string, node: GrammarAST | null): void {
-        this.#options.set(key, node);
+        this.options.set(key, node);
     }
 
     public getOptionString(key: string): string | undefined {
@@ -44,15 +44,15 @@ export abstract class GrammarASTWithOptions extends GrammarAST {
      * and command-line forced options.
      */
     public getOptionAST(key: string): GrammarAST | undefined {
-        return this.#options.get(key) ?? undefined;
+        return this.options.get(key) ?? undefined;
     }
 
     public getNumberOfOptions(): number {
-        return this.#options.size;
+        return this.options.size;
     }
 
     public getOptions(): Map<string, GrammarAST | null> {
-        return this.#options;
+        return this.options;
     }
 
     public abstract override dupNode(): GrammarASTWithOptions;

src/tree-walkers/SourceGenTriggers.ts

@@ -1342,7 +1342,7 @@ export class SourceGenTriggers extends TreeParser {
     public ruleref(label: GrammarAST | null): SrcOp[] | null {
         let omos = null;
 
-        let RULE_REF27 = null;
+        let RULE_REF27: GrammarAST | null = null;
         let ARG_ACTION28 = null;
 
         try {