occam-parsers 23.0.136 → 23.0.138

package/src/mixins/node.js

@@ -2,7 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
-const { first, forwardsSome, backwardsSome } = arrayUtilities;
+const { push, first, forwardsSome, backwardsSome } = arrayUtilities;
 
 function getMultiplicity() {
   const childNodesLength = this.childNodes.length,
@@ -232,12 +232,33 @@ function findAncestorNode(callback) {
 
     index++;
   }
+
+  ancestorNode = undefined;
+
+  return ancestorNode;
 }
 
 function everyAncestorNode(callback) {
-  const ancestorNodes = this.getAncestorNodes();
+  let result = true;
+
+  let index = 0,
+      ancestorNode = this.parentNode; ///
+
+  while (ancestorNode !== null) {
+    result = callback(ancestorNode, index);
+
+    if (!result) {
+      break;
+    }
+
+    const parentNode = ancestorNode.getParentNode();
 
-  return ancestorNodes.every(callback);
+    ancestorNode = parentNode;  ///
+
+    index++;
+  }
+
+  return result;
 }
 
 function filterAncestorNode(callback) {
@@ -258,6 +279,118 @@ function forEachAncestorNode(callback) {
   ancestorNodes.forEach(callback);
 }
 
+function getDescendantNodes(descendantNodes = []) {
+  push(descendantNodes, this.childNodes);
+
+  this.forEachChildNode((childNode) => {
+    childNode.getDescendantNodes(descendantNodes);
+  });
+
+  return descendantNodes;
+}
+
+function mapDescendantNode(callback) {
+  const descendantNodes = this.getDescendantNodes();
+
+  return descendantNodes.map(callback);
+}
+
+function someDescendantNode(callback) {
+  let result = false;
+
+  const childNodesLength = this.childNodes.length;
+
+  for (let index = 0; index < childNodesLength; index++) {
+    const childNode = this.childNodes[index],
+          descendantNode = childNode; ///
+
+    result = callback(descendantNode);
+
+    if (result) {
+      break;
+    }
+
+    result = childNode.someDescendantNode(callback);
+
+    if (result) {
+      break;
+    }
+  }
+
+  return result;
+}
+
+function findDescendantNode(callback) {
+  let descendantNode = undefined;
+
+  const childNodesLength = this.childNodes.length;
+
+  for (let index = 0; index < childNodesLength; index++) {
+    let result;
+
+    const childNode = this.childNodes[index];
+
+    descendantNode = childNode; ///
+
+    result = callback(descendantNode);
+
+    if (result) {
+      break;
+    }
+
+    descendantNode = childNode.findDescendantNode(callback);
+
+    if (descendantNode !== undefined) {
+      break;
+    }
+  }
+
+  return descendantNode;
+}
+
+function everyDescendantNode(callback) {
+  let result = true;
+
+  const childNodesLength = this.childNodes.length;
+
+  for (let index = 0; index < childNodesLength; index++) {
+    const childNode = this.childNodes[index],
+          descendantNode = childNode; ///
+
+    result = callback(descendantNode);
+
+    if (!result) {
+      break;
+    }
+
+    result = childNode.everyDescendantNode(callback);
+
+    if (!result) {
+      break;
+    }
+  }
+
+  return result;
+}
+
+function filterDescendantNode(callback) {
+  const descendantNodes = this.getDescendantNodes();
+
+  return descendantNodes.filter(callback);
+}
+
+function reduceDescendantNode(callback, initialValue) {
+  const descendantNodes = this.getDescendantNodes();
+
+  return descendantNodes.reduce(callback, initialValue);
+}
+
+function forEachDescendantNode(callback) {
+  const descendantNodes = this.getDescendantNodes();
+
+  descendantNodes.forEach(callback);
+}
+
 const nodeMixins = {
   getMultiplicity,
   mapChildNode,
@@ -291,7 +424,15 @@ const nodeMixins = {
   everyAncestorNode,
   filterAncestorNode,
   reduceAncestorNode,
-  forEachAncestorNode
+  forEachAncestorNode,
+  getDescendantNodes,
+  mapDescendantNode,
+  someDescendantNode,
+  findDescendantNode,
+  everyDescendantNode,
+  filterDescendantNode,
+  reduceDescendantNode,
+  forEachDescendantNode
 };
 
 export default nodeMixins;

package/src/node/nonTerminal.js

@@ -92,6 +92,10 @@ export default class NonTerminalNode {
     return nonTerminalNode;
   }
 
+  getDescendantNodes(descendantNodes) {
+    return descendantNodes;
+  }
+
   getFirstSignificantTokenIndex(tokens) {
     let firstSignificantTokenIndex;
 
@@ -132,24 +136,6 @@ export default class NonTerminalNode {
     return significantTokens;
   }
 
-  getDescendantNodes(descendantNodes = []) {
-    const descendantNode = this; ///
-
-    descendantNodes.push(descendantNode);
-
-    this.childNodes.forEach((childNode) => {
-      const childNodeNonTerminalNode = childNode.isNonTerminalNode();
-
-      if (childNodeNonTerminalNode) {
-        const nonTerminalNode = childNode;  ///
-
-        nonTerminalNode.getDescendantNodes(descendantNodes);
-      }
-    });
-
-    return descendantNodes;
-  }
-
   getMultiplicity() {
     const childNodesLength = this.childNodes.length,
           multiplicity = childNodesLength;  ///

package/src/node/terminal.js

@@ -164,12 +164,33 @@ export default class TerminalNode {
 
       index++;
     }
+
+    ancestorNode = undefined;
+
+    return ancestorNode;
   }
 
   everyAncestorNode(callback) {
-    const ancestorNodes = this.getAncestorNodes();
+    let result = true;
+
+    let index = 0,
+        ancestorNode = this.parentNode; ///
+
+    while (ancestorNode !== null) {
+      result = callback(ancestorNode, index);
 
-    return ancestorNodes.every(callback);
+      if (!result) {
+        break;
+      }
+
+      const parentNode = ancestorNode.getParentNode();
+
+      ancestorNode = parentNode;  ///
+
+      index++;
+    }
+
+    return result;
   }
 
   filterAncestorNode(callback) {
@@ -190,6 +211,28 @@ export default class TerminalNode {
     ancestorNodes.forEach(callback);
   }
 
+  getDescendantNodes(descendantNodes = []) {
+    return descendantNodes;
+  }
+
+  someDescendantNode(callback) {
+    const result = false;
+
+    return result;
+  }
+
+  findDescendantNode(callback) {
+    let descendantNode = undefined;
+
+    return descendantNode;
+  }
+
+  everyDescendantNode(callback) {
+    let result = true;
+
+    return result;
+  }
+
   asParseTree(tokens) {
     const terminalNode = this,  ///
           terminalNodeParseTree = TerminalNodeParseTree.fromTerminalNodeAndTokens(terminalNode, tokens),