occam-parsers 23.0.54 → 23.0.55

package/src/node/terminal.js

@@ -3,14 +3,27 @@
 import TerminalNodeParseTree from "../parseTree/terminalNode";
 
 export default class TerminalNode {
-  constructor(significantToken) {
+  constructor(parentNode, significantToken) {
+    this.parentNode = parentNode;
     this.significantToken = significantToken;
   }
 
+  getParentNode() {
+    return this.parentNode;
+  }
+
   getSignificantToken() {
     return this.significantToken;
   }
 
+  setParentNode(parentNode) {
+    this.parentNode = parentNode;
+  }
+
+  setSignificantToken(significantToken) {
+    this.significantToken = significantToken;
+  }
+
   isStartOfContentNode() {
     const startOfContentNode = false;
 
@@ -89,6 +102,22 @@ export default class TerminalNode {
     return significantTokens;
   }
 
+  getAncestorNodes() {
+    const ancestorNodes = [];
+
+    let parentNode = this.parentNode;
+
+    while (parentNode !== null) {
+      const ancestorNode = parentNode;  ///
+
+      ancestorNodes.push(ancestorNode);
+
+      parentNode = parentNode.getParentNode();
+    }
+
+    return ancestorNodes;
+  }
+
   isIncludedIn(node) {
     let includedIn = false;
 
@@ -131,10 +160,6 @@ export default class TerminalNode {
     return matches;
   }
 
-  setSignificantToken(significantToken) {
-    this.significantToken = significantToken;
-  }
-
   asParseTree(tokens) {
     const terminalNode = this,  ///
           terminalNodeParseTree = TerminalNodeParseTree.fromTerminalNodeAndTokens(terminalNode, tokens),
@@ -145,8 +170,9 @@ export default class TerminalNode {
 
   clone(...remainingArguments) {
     const Class = this.constructor,
+          parentNode = null,
           significantToken = this.significantToken,
-          terminalNode = new Class(significantToken, ...remainingArguments);
+          terminalNode = new Class(parentNode, significantToken, ...remainingArguments);
 
     return terminalNode;
   }
@@ -156,8 +182,9 @@ export default class TerminalNode {
       Class = TerminalNode; ///
     }
 
-    const significantToken = null,
-          terminalNode = new Class(significantToken, ...remainingArguments);
+    const parentNode = null,
+          significantToken = null,
+          terminalNode = new Class(parentNode, significantToken, ...remainingArguments);
 
     return terminalNode;
   }
@@ -169,7 +196,8 @@ export default class TerminalNode {
       Class = TerminalNode; ///
     }
 
-    const terminalNode = new Class(significantToken, ...remainingArguments);
+    const parentNode = null,
+          terminalNode = new Class(parentNode, significantToken, ...remainingArguments);
     
     return terminalNode;
   }

package/src/rule.js

@@ -1,10 +1,13 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import { EMPTY_STRING } from "./constants";
 import { specialSymbols } from "occam-lexers";
 import { paddingFromPaddingLength } from "./utilities/string";
 
-const { opaque: opaqueSpecialSymbol, semiOpaque: semiOpaqueSpecialSymbol } = specialSymbols;
+const { clear } = arrayUtilities,
+      { opaque: opaqueSpecialSymbol, semiOpaque: semiOpaqueSpecialSymbol } = specialSymbols;
 
 export default class Rule {
   constructor(name, opacity, definitions, NonTerminalNode) {
@@ -46,15 +49,6 @@ export default class Rule {
     this.NonTerminalNode = NonTerminalNode;
   }
 
-  createNonTerminalNode() {
-    const opacity = this.opacity,
-          ruleName = this.name, ///
-          childNodes = [],
-          nonTerminalNode = this.NonTerminalNode.fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity);
-
-    return nonTerminalNode;
-  }
-
   isOpaque() {
     const opaque = (this.opacity === opaqueSpecialSymbol);
 
@@ -70,18 +64,22 @@ export default class Rule {
   parse(nodes, state, callback, callAhead) {
     let parsed;
 
-    const savedPrecedence = state.getSavedPrecedence();
+    const opacity = this.opacity,
+          ruleName = this.name, ///
+          childNodes = [],
+          nonTerminalNode = this.NonTerminalNode.fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity),
+          savedPrecedence = state.getSavedPrecedence();
+
+    let node = nonTerminalNode; ///
+
+    nodes.push(node);
 
     parsed = this.definitions.some((definition) => {
       let parsed;
 
-      let nonTerminalNode = this.createNonTerminalNode(),
-          node = nonTerminalNode; ///
-
-      const precedence = definition.getPrecedence(),
-            childNodes = nonTerminalNode.getChildNodes();
+      clear(childNodes);
 
-      nodes.push(node);
+      const precedence = definition.getPrecedence();
 
       state.setPrecedence(precedence);
 
@@ -134,7 +132,7 @@ export default class Rule {
           if (!parsed) {
             nodes.pop();
 
-            const node = nonTerminalNode; ///
+            node = nonTerminalNode; ///
 
             nodes.push(node);
           }
@@ -147,13 +145,21 @@ export default class Rule {
 
       if (!parsed) {
         state.resetPrecedence(savedPrecedence);
-
-        nodes.pop();
       }
 
       return parsed;
     });
 
+    if (parsed) {
+      const parentNode = node;  ///
+
+      childNodes.forEach((childNode) => {
+        childNode.setParentNode(parentNode);
+      });
+    } else {
+      nodes.pop();
+    }
+
     if (callAhead === null) {
       state.resetPrecedence(savedPrecedence);
     }