occam-parsers 23.0.62 → 23.0.64

package/src/node/nonTerminal.js

@@ -42,21 +42,11 @@ export default class NonTerminalNode {
   }
 
   setChildNodes(childNodes) {
-    let parentNode;
-
-    parentNode = null;
-
-    this.childNodes.forEach((childNode) => {
-      childNode.setParentNode(parentNode);
-    });
+    this.resetChildNodesParentNode();
 
     this.childNodes = childNodes;
 
-    parentNode = this;
-
-    this.childNodes.forEach((childNode) => {
-      childNode.setParentNode(parentNode);
-    });
+    this.setChildNodesParentNode();
   }
 
   setParentNode(parentNode) {
@@ -263,6 +253,17 @@ export default class NonTerminalNode {
     return rewrittenNonTerminalNode;
   }
 
+  cloneChildNodes() {
+    const parentNode = this,  ///
+          childNodes = this.childNodes.map((childNode) => {
+            childNode = childNode.clone(parentNode);  ///
+
+            return childNode;
+          });
+
+    return childNodes;
+  }
+
   replaceChildNodes(replacedChildNodes, replacementChildNodes) {
     const replacedChildNodesLength = replacedChildNodes.length,
           firstReplacedChildNode = first(replacedChildNodes),
@@ -272,18 +273,32 @@ export default class NonTerminalNode {
 
     this.childNodes.splice(start, deleteCount, ...replacementChildNodes);
 
-    let parentNode;
+    this.resetChildNodesParentNode(replacedChildNodes);
 
-    parentNode = null;
+    this.setChildNodesParentNode(replacementChildNodes);
+  }
+
+  setChildNodesParentNode(childNodes) {
+    if (childNodes === undefined) {
+      childNodes = this.childNodes;
+    }
 
-    replacedChildNodes.forEach((replacedChildNode) => {
-      replacedChildNode.setParentNode(parentNode);
+    const parentNode = this;
+
+    childNodes.forEach((childNode) => {
+      childNode.setParentNode(parentNode);
     });
+  }
+
+  resetChildNodesParentNode(childNodes) {
+    if (childNodes === undefined) {
+      childNodes = this.childNodes;
+    }
 
-    parentNode = this;
+    const parentNode = null;
 
-    replacementChildNodes.forEach((replacementChildNode) => {
-      replacementChildNode.setParentNode(parentNode);
+    childNodes.forEach((childNode) => {
+      childNode.setParentNode(parentNode);
     });
   }
 
@@ -295,17 +310,6 @@ export default class NonTerminalNode {
     return parseTree;
   }
 
-  cloneChildNodes() {
-    const parentNode = this,  ///
-          childNodes = this.childNodes.map((childNode) => {
-            childNode = childNode.clone(parentNode);  ///
-
-            return childNode;
-          });
-
-    return childNodes;
-  }
-
   clone(parentNode = null) {
     const Class = this.constructor,
           ruleName = this.ruleName,

package/src/rule.js

@@ -86,12 +86,16 @@ export default class Rule {
       callback = () => {  ///
         let parsed;
 
-        parsed = true;
-
         const precedence = state.getPrecedence();
 
         nonTerminalNode.setPrecedence(precedence);
 
+        parsed = true;
+
+        if (parsed) {
+          node.setChildNodesParentNode();
+        }
+
         const rewrittenNonTerminalNode = nonTerminalNode.rewrite();
 
         if (rewrittenNonTerminalNode !== null) {
@@ -138,6 +142,10 @@ export default class Rule {
           }
         }
 
+        if (!parsed) {
+          node.resetChildNodesParentNode();
+        }
+
         return parsed;
       };
 
@@ -150,13 +158,7 @@ export default class Rule {
       return parsed;
     });
 
-    if (parsed) {
-      const parentNode = node;  ///
-
-      childNodes.forEach((childNode) => {
-        childNode.setParentNode(parentNode);
-      });
-    } else {
+    if (!parsed) {
       nodes.pop();
     }