fix: cyclic dependency between RuleContext.js, Trees.js and ParserRul…

…eContext.js check for RuleNode instead of RuleContext since that it the only implementation (RuleNode -> RuleContext -> ParserRuleContext)
antlr · Mar 8, 2020 · 2956f07 · 2956f07
1 parent 225249f
commit 2956f07
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/runtime/JavaScript/src/antlr4/RuleContext.js b/runtime/JavaScript/src/antlr4/RuleContext.js
@@ -28,6 +28,7 @@
 var RuleNode = require('./tree/Tree').RuleNode;
 var INVALID_INTERVAL = require('./tree/Tree').INVALID_INTERVAL;
 var INVALID_ALT_NUMBER = require('./atn/ATN').INVALID_ALT_NUMBER || 0; // TODO: solve cyclic dependency to avoid || 0
+const Trees = require('./tree/Trees');
 
 function RuleContext(parent, invokingState) {
 	// What context invoked this rule?
@@ -116,10 +117,6 @@ RuleContext.prototype.accept = function(visitor) {
 	return visitor.visitChildren(this);
 };
 
-//need to manage circular dependencies, so export now
-module.exports = RuleContext;
-var Trees = require('./tree/Trees');
-
 
 // Print out a whole tree, not just a node, in LISP format
 // (root child1 .. childN). Print just a node if this is a leaf.
@@ -154,3 +151,4 @@ RuleContext.prototype.toString = function(ruleNames, stop) {
 	return s;
 };
 
+module.exports = RuleContext;
diff --git a/runtime/JavaScript/src/antlr4/tree/Tree.js b/runtime/JavaScript/src/antlr4/tree/Tree.js
@@ -29,6 +29,10 @@ class RuleNode extends ParseTree {
 	constructor() {
 		super();
 	}
+
+	getRuleContext(){
+		throw new Error("missing interface implementation")
+	}
 }
 
 class TerminalNode extends ParseTree {

diff --git a/runtime/JavaScript/src/antlr4/tree/Trees.js b/runtime/JavaScript/src/antlr4/tree/Trees.js
@@ -5,9 +5,7 @@
 
 const Utils = require('./../Utils');
 const {Token} = require('./../Token');
-const {ErrorNode, TerminalNode} = require('./Tree');
-const {ParserRuleContext} = require('./../ParserRuleContext');
-const RuleContext = require('./../RuleContext');
+const {ErrorNode, TerminalNode, RuleNode} = require('./Tree');
 const ATN = require('./../atn/ATN');
 
 /** A set of utility routines useful for all kinds of ANTLR trees. */
@@ -49,8 +47,9 @@ const Trees = {
             ruleNames = recog.ruleNames;
         }
         if(ruleNames!==null) {
-            if (t instanceof RuleContext) {
-                const altNumber = t.getAltNumber();
+            if (t instanceof RuleNode) {
+                const context = t.getRuleContext()
+                const altNumber = context.getAltNumber();
                 if ( altNumber != (ATN.INVALID_ALT_NUMBER || 0) ) { // TODO: solve cyclic dependency to avoid || 0
                     return ruleNames[t.ruleIndex]+":"+altNumber;
                 }
@@ -116,7 +115,7 @@ const Trees = {
             if(t.symbol.type===index) {
                 nodes.push(t);
             }
-        } else if(!findTokens && (t instanceof ParserRuleContext)) {
+        } else if(!findTokens && (t instanceof RuleNode)) {
             if(t.ruleIndex===index) {
                 nodes.push(t);
             }