occam-languages 0.0.210 → 0.0.212

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,13 +17,19 @@ class EquivalencePass {
17
17
  return success;
18
18
  }
19
19
  descend(leftChildNodes, rightChildNodes, ...remainingArguments) {
20
- let descended;
21
- descended = leftChildNodes.every((leftChildNode, index)=>{
22
- const rightChildNode = rightChildNodes[index], leftNode = leftChildNode, rightNode = rightChildNode, visited = this.visitNode(leftNode, rightNode, ...remainingArguments);
20
+ let descended = false;
21
+ const childNodesCongruent = (0, _pass.areChildNodesCongruent)(leftChildNodes, rightChildNodes);
22
+ if (childNodesCongruent) {
23
+ const visited = leftChildNodes.every((leftChildNode, index)=>{
24
+ const rightChildNode = rightChildNodes[index], leftNode = leftChildNode, rightNode = rightChildNode, visited = this.visitNode(leftNode, rightNode, ...remainingArguments);
25
+ if (visited) {
26
+ return true;
27
+ }
28
+ });
23
29
  if (visited) {
24
- return true;
30
+ descended = true;
25
31
  }
26
- });
32
+ }
27
33
  return descended;
28
34
  }
29
35
  visitNode(leftNode, rightNode, ...remainingArguments) {
@@ -57,12 +63,9 @@ class EquivalencePass {
57
63
  let visited = false;
58
64
  const leftNonTerminalNodeRuleName = leftNonTerminalNode.getRuleName(), rightNonTerminalNodeRuleName = rightNonTerminalNode.getRuleName(); ///
59
65
  if (leftNonTerminalNodeRuleName === rightNonTerminalNodeRuleName) {
60
- const leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(), rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(), leftChildNodes = leftNonTerminalNodeChildNodes, rightChildNodes = rightNonTerminalNodeChildNodes, childNodesCongruent = (0, _pass.areChildNodesCongruent)(leftChildNodes, rightChildNodes);
61
- if (childNodesCongruent) {
62
- const descended = this.descend(leftChildNodes, rightChildNodes, ...remainingArguments);
63
- if (descended) {
64
- visited = true;
65
- }
66
+ const leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(), rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(), leftChildNodes = leftNonTerminalNodeChildNodes, rightChildNodes = rightNonTerminalNodeChildNodes, descended = this.descend(leftChildNodes, rightChildNodes, ...remainingArguments);
67
+ if (descended) {
68
+ visited = true;
66
69
  }
67
70
  }
68
71
  return visited;
@@ -82,4 +85,4 @@ class EquivalencePass {
82
85
  }
83
86
  }
84
87
 
85
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/equivalence.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery, areChildNodesCongruent } from \"../utilities/pass\";\n\nexport default class EquivalencePass {\n  run(leftNode, rightNode, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(leftNode, rightNode, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(leftChildNodes, rightChildNodes, ...remainingArguments) {\n    let descended;\n\n    descended = leftChildNodes.every((leftChildNode, index) => {\n      const rightChildNode = rightChildNodes[index],\n            leftNode = leftChildNode, ///\n            rightNode = rightChildNode, ///\n            visited = this.visitNode(leftNode, rightNode, ...remainingArguments);\n\n      if (visited) {\n        return true;\n      }\n    });\n\n    return descended;\n  }\n\n  visitNode(leftNode, rightNode, ...remainingArguments) {\n    let visited = false;\n\n    const leftNodeTerminalNode = leftNode.isTerminalNode(),\n          rightNodeTerminalNode = rightNode.isTerminalNode(),\n          leftNodeNonTerminalNode = leftNode.isNonTerminalNode(),\n          rightNodeNonTerminalNode = rightNode.isNonTerminalNode();\n\n    if (false) {\n      ///\n    } else if (leftNodeTerminalNode && rightNodeTerminalNode) {\n      const leftTerminalNode = leftNode,  ///\n            rightTerminalNode = rightNode;  ///\n\n      visited = this.visitTerminalNode(leftTerminalNode, rightTerminalNode, ...remainingArguments);\n    } else if (leftNodeNonTerminalNode && rightNodeNonTerminalNode) {\n      const leftNonTerminalNode = leftNode,  ///\n            rightNonTerminalNode = rightNode; ///\n\n      visited = this.visitNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  visitTerminalNode(leftTerminalNode, rightTerminalNode, ...remainingArguments) { ///\n    let visited;\n\n    visited = true;\n\n    return visited;\n  }\n\n  visitNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        leftNodeQuery: nonTerminalNodeQuery,\n        rightNodeQuery: nonTerminalNodeQuery,\n        run: (leftNode, rightNode, ...remainingArguments) => {\n          let visited = false;\n\n          const leftNonTerminalNodeRuleName = leftNonTerminalNode.getRuleName(), ///\n                rightNonTerminalNodeRuleName = rightNonTerminalNode.getRuleName(); ///\n\n          if (leftNonTerminalNodeRuleName === rightNonTerminalNodeRuleName) {\n            const leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(),\n                  rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(),\n                  leftChildNodes = leftNonTerminalNodeChildNodes, ///\n                  rightChildNodes = rightNonTerminalNodeChildNodes, ///\n                  childNodesCongruent = areChildNodesCongruent(leftChildNodes, rightChildNodes);\n\n            if (childNodesCongruent) {\n              const descended = this.descend(leftChildNodes, rightChildNodes, ...remainingArguments);\n\n              if (descended) {\n                visited = true;\n              }\n            }\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { leftNodeQuery, rightNodeQuery, run } = map;\n\n      const leftNode = leftNodeQuery(leftNonTerminalNode),  ///\n            rightNode = rightNodeQuery(rightNonTerminalNode);  ///\n\n      if ((leftNode !== null) && (rightNode !== null)) {\n        const success = run(leftNode, rightNode, ...remainingArguments);\n\n        visited = success;  ///\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["EquivalencePass","run","leftNode","rightNode","remainingArguments","success","visited","visitNode","descend","leftChildNodes","rightChildNodes","descended","every","leftChildNode","index","rightChildNode","leftNodeTerminalNode","isTerminalNode","rightNodeTerminalNode","leftNodeNonTerminalNode","isNonTerminalNode","rightNodeNonTerminalNode","leftTerminalNode","rightTerminalNode","visitTerminalNode","leftNonTerminalNode","rightNonTerminalNode","visitNonTerminalNode","maps","leftNodeQuery","nonTerminalNodeQuery","rightNodeQuery","leftNonTerminalNodeRuleName","getRuleName","rightNonTerminalNodeRuleName","leftNonTerminalNodeChildNodes","getChildNodes","rightNonTerminalNodeChildNodes","childNodesCongruent","areChildNodesCongruent","some","map"],"mappings":"AAAA;;;;+BAIA;;;eAAqBA;;;sBAFwC;AAE9C,MAAMA;IACnBC,IAAIC,QAAQ,EAAEC,SAAS,EAAE,GAAGC,kBAAkB,EAAE;QAC9C,IAAIC;QAEJ,MAAMC,UAAU,IAAI,CAACC,SAAS,CAACL,UAAUC,cAAcC;QAEvDC,UAAUC,SAAU,GAAG;QAEvB,OAAOD;IACT;IAEAG,QAAQC,cAAc,EAAEC,eAAe,EAAE,GAAGN,kBAAkB,EAAE;QAC9D,IAAIO;QAEJA,YAAYF,eAAeG,KAAK,CAAC,CAACC,eAAeC;YAC/C,MAAMC,iBAAiBL,eAAe,CAACI,MAAM,EACvCZ,WAAWW,eACXV,YAAYY,gBACZT,UAAU,IAAI,CAACC,SAAS,CAACL,UAAUC,cAAcC;YAEvD,IAAIE,SAAS;gBACX,OAAO;YACT;QACF;QAEA,OAAOK;IACT;IAEAJ,UAAUL,QAAQ,EAAEC,SAAS,EAAE,GAAGC,kBAAkB,EAAE;QACpD,IAAIE,UAAU;QAEd,MAAMU,uBAAuBd,SAASe,cAAc,IAC9CC,wBAAwBf,UAAUc,cAAc,IAChDE,0BAA0BjB,SAASkB,iBAAiB,IACpDC,2BAA2BlB,UAAUiB,iBAAiB;QAE5D,IAAI,OAAO;QACT,GAAG;QACL,OAAO,IAAIJ,wBAAwBE,uBAAuB;YACxD,MAAMI,mBAAmBpB,UACnBqB,oBAAoBpB,WAAY,GAAG;YAEzCG,UAAU,IAAI,CAACkB,iBAAiB,CAACF,kBAAkBC,sBAAsBnB;QAC3E,OAAO,IAAIe,2BAA2BE,0BAA0B;YAC9D,MAAMI,sBAAsBvB,UACtBwB,uBAAuBvB,WAAW,GAAG;YAE3CG,UAAU,IAAI,CAACqB,oBAAoB,CAACF,qBAAqBC,yBAAyBtB;QACpF;QAEA,OAAOE;IACT;IAEAkB,kBAAkBF,gBAAgB,EAAEC,iBAAiB,EAAE,GAAGnB,kBAAkB,EAAE;QAC5E,IAAIE;QAEJA,UAAU;QAEV,OAAOA;IACT;IAEAqB,qBAAqBF,mBAAmB,EAAEC,oBAAoB,EAAE,GAAGtB,kBAAkB,EAAE;QACrF,IAAIE,UAAU;QAEd,IAAI,EAAEsB,IAAI,EAAE,GAAG,IAAI,CAAC,WAAW;QAE/BA,OAAO;eACFA;YACH;gBACEC,eAAeC,0BAAoB;gBACnCC,gBAAgBD,0BAAoB;gBACpC7B,KAAK,CAACC,UAAUC,WAAW,GAAGC;oBAC5B,IAAIE,UAAU;oBAEd,MAAM0B,8BAA8BP,oBAAoBQ,WAAW,IAC7DC,+BAA+BR,qBAAqBO,WAAW,IAAI,GAAG;oBAE5E,IAAID,gCAAgCE,8BAA8B;wBAChE,MAAMC,gCAAgCV,oBAAoBW,aAAa,IACjEC,iCAAiCX,qBAAqBU,aAAa,IACnE3B,iBAAiB0B,+BACjBzB,kBAAkB2B,gCAClBC,sBAAsBC,IAAAA,4BAAsB,EAAC9B,gBAAgBC;wBAEnE,IAAI4B,qBAAqB;4BACvB,MAAM3B,YAAY,IAAI,CAACH,OAAO,CAACC,gBAAgBC,oBAAoBN;4BAEnE,IAAIO,WAAW;gCACbL,UAAU;4BACZ;wBACF;oBACF;oBAEA,OAAOA;gBACT;YACF;SACD;QAEDsB,KAAKY,IAAI,CAAC,CAACC;YACT,MAAM,EAAEZ,aAAa,EAAEE,cAAc,EAAE9B,GAAG,EAAE,GAAGwC;YAE/C,MAAMvC,WAAW2B,cAAcJ,sBACzBtB,YAAY4B,eAAeL,uBAAwB,GAAG;YAE5D,IAAI,AAACxB,aAAa,QAAUC,cAAc,MAAO;gBAC/C,MAAME,UAAUJ,IAAIC,UAAUC,cAAcC;gBAE5CE,UAAUD,SAAU,GAAG;gBAEvB,OAAO;YACT;QACF;QAEA,OAAOC;IACT;AACF"}
88
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/equivalence.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery, areChildNodesCongruent } from \"../utilities/pass\";\n\nexport default class EquivalencePass {\n  run(leftNode, rightNode, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(leftNode, rightNode, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(leftChildNodes, rightChildNodes, ...remainingArguments) {\n    let descended = false;\n\n    const childNodesCongruent = areChildNodesCongruent(leftChildNodes, rightChildNodes);\n\n    if (childNodesCongruent) {\n      const visited = leftChildNodes.every((leftChildNode, index) => {\n        const rightChildNode = rightChildNodes[index],\n              leftNode = leftChildNode, ///\n              rightNode = rightChildNode, ///\n              visited = this.visitNode(leftNode, rightNode, ...remainingArguments);\n\n        if (visited) {\n          return true;\n        }\n      });\n\n      if (visited) {\n        descended = true;\n      }\n    }\n\n    return descended;\n  }\n\n  visitNode(leftNode, rightNode, ...remainingArguments) {\n    let visited = false;\n\n    const leftNodeTerminalNode = leftNode.isTerminalNode(),\n          rightNodeTerminalNode = rightNode.isTerminalNode(),\n          leftNodeNonTerminalNode = leftNode.isNonTerminalNode(),\n          rightNodeNonTerminalNode = rightNode.isNonTerminalNode();\n\n    if (false) {\n      ///\n    } else if (leftNodeTerminalNode && rightNodeTerminalNode) {\n      const leftTerminalNode = leftNode,  ///\n            rightTerminalNode = rightNode;  ///\n\n      visited = this.visitTerminalNode(leftTerminalNode, rightTerminalNode, ...remainingArguments);\n    } else if (leftNodeNonTerminalNode && rightNodeNonTerminalNode) {\n      const leftNonTerminalNode = leftNode,  ///\n            rightNonTerminalNode = rightNode; ///\n\n      visited = this.visitNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  visitTerminalNode(leftTerminalNode, rightTerminalNode, ...remainingArguments) { ///\n    let visited;\n\n    visited = true;\n\n    return visited;\n  }\n\n  visitNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        leftNodeQuery: nonTerminalNodeQuery,\n        rightNodeQuery: nonTerminalNodeQuery,\n        run: (leftNode, rightNode, ...remainingArguments) => {\n          let visited = false;\n\n          const leftNonTerminalNodeRuleName = leftNonTerminalNode.getRuleName(), ///\n                rightNonTerminalNodeRuleName = rightNonTerminalNode.getRuleName(); ///\n\n          if (leftNonTerminalNodeRuleName === rightNonTerminalNodeRuleName) {\n            const leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(),\n                  rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(),\n                  leftChildNodes = leftNonTerminalNodeChildNodes, ///\n                  rightChildNodes = rightNonTerminalNodeChildNodes, ///\n                  descended = this.descend(leftChildNodes, rightChildNodes, ...remainingArguments);\n\n            if (descended) {\n              visited = true;\n            }\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { leftNodeQuery, rightNodeQuery, run } = map;\n\n      const leftNode = leftNodeQuery(leftNonTerminalNode),  ///\n            rightNode = rightNodeQuery(rightNonTerminalNode);  ///\n\n      if ((leftNode !== null) && (rightNode !== null)) {\n        const success = run(leftNode, rightNode, ...remainingArguments);\n\n        visited = success;  ///\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["EquivalencePass","run","leftNode","rightNode","remainingArguments","success","visited","visitNode","descend","leftChildNodes","rightChildNodes","descended","childNodesCongruent","areChildNodesCongruent","every","leftChildNode","index","rightChildNode","leftNodeTerminalNode","isTerminalNode","rightNodeTerminalNode","leftNodeNonTerminalNode","isNonTerminalNode","rightNodeNonTerminalNode","leftTerminalNode","rightTerminalNode","visitTerminalNode","leftNonTerminalNode","rightNonTerminalNode","visitNonTerminalNode","maps","leftNodeQuery","nonTerminalNodeQuery","rightNodeQuery","leftNonTerminalNodeRuleName","getRuleName","rightNonTerminalNodeRuleName","leftNonTerminalNodeChildNodes","getChildNodes","rightNonTerminalNodeChildNodes","some","map"],"mappings":"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"}
@@ -18,17 +18,20 @@ class ForwardZipPass {
18
18
  }
19
19
  descend(index, generalChildNodes, specificChildNodes, ...remainingArguments) {
20
20
  let descendedForward = false;
21
- const descendForward = remainingArguments.pop(), generalChildNodesLength = generalChildNodes.length;
22
- if (index === generalChildNodesLength) {
23
- descendedForward = descendForward();
24
- } else {
25
- const generalChildNode = generalChildNodes[index], specificChildNode = specificChildNodes[index], generalNode = generalChildNode, specificNode = specificChildNode, visited = this.visitNode(generalNode, specificNode, ...remainingArguments, ()=>{
26
- remainingArguments.push(descendForward);
27
- const aheadIndex = index + 1, descendedForward = this.descend(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);
28
- return descendedForward;
29
- });
30
- if (visited) {
31
- descendedForward = true;
21
+ const childNodesCongruent = (0, _pass.areChildNodesCongruent)(generalChildNodes, specificChildNodes);
22
+ if (childNodesCongruent) {
23
+ const descendForward = remainingArguments.pop(), generalChildNodesLength = generalChildNodes.length;
24
+ if (index === generalChildNodesLength) {
25
+ descendedForward = descendForward();
26
+ } else {
27
+ const generalChildNode = generalChildNodes[index], specificChildNode = specificChildNodes[index], generalNode = generalChildNode, specificNode = specificChildNode, visited = this.visitNode(generalNode, specificNode, ...remainingArguments, ()=>{
28
+ remainingArguments.push(descendForward);
29
+ const aheadIndex = index + 1, descendedForward = this.descend(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);
30
+ return descendedForward;
31
+ });
32
+ if (visited) {
33
+ descendedForward = true;
34
+ }
32
35
  }
33
36
  }
34
37
  return descendedForward;
@@ -68,12 +71,9 @@ class ForwardZipPass {
68
71
  let visited = false;
69
72
  const generalNonTerminalNodeRuleName = generalNonTerminalNode.getRuleName(), specificNonTerminalNodeRuleName = specificNonTerminalNode.getRuleName(); ///
70
73
  if (generalNonTerminalNodeRuleName === specificNonTerminalNodeRuleName) {
71
- const index = 0, generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(), specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(), generalChildNodes = generalNonTerminalNodeChildNodes, specificChildNodes = specificNonTerminalNodeChildNodes, childNodesCongruent = (0, _pass.areChildNodesCongruent)(generalChildNodes, specificChildNodes);
72
- if (childNodesCongruent) {
73
- const descended = this.descend(index, generalChildNodes, specificChildNodes, ...remainingArguments);
74
- if (descended) {
75
- visited = true;
76
- }
74
+ const index = 0, generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(), specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(), generalChildNodes = generalNonTerminalNodeChildNodes, specificChildNodes = specificNonTerminalNodeChildNodes, descended = this.descend(index, generalChildNodes, specificChildNodes, ...remainingArguments);
75
+ if (descended) {
76
+ visited = true;
77
77
  }
78
78
  }
79
79
  return visited;
@@ -93,4 +93,4 @@ class ForwardZipPass {
93
93
  }
94
94
  }
95
95
 
96
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/forwardZip.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery, areChildNodesCongruent } from \"../utilities/pass\";\n\nexport default class ForwardZipPass {\n  run(generalNode, specificNode, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(generalNode, specificNode, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(index, generalChildNodes, specificChildNodes, ...remainingArguments) {\n    let descendedForward = false;\n\n    const descendForward = remainingArguments.pop(),  ///\n          generalChildNodesLength = generalChildNodes.length;\n\n    if (index === generalChildNodesLength) {\n      descendedForward = descendForward();\n    } else {\n      const generalChildNode = generalChildNodes[index],\n            specificChildNode = specificChildNodes[index],\n            generalNode = generalChildNode, ///\n            specificNode = specificChildNode, ///\n            visited = this.visitNode(generalNode, specificNode, ...remainingArguments, () => {\n              remainingArguments.push(descendForward);\n\n              const aheadIndex = index + 1,\n                    descendedForward = this.descend(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);\n\n              return descendedForward;\n            });\n\n      if (visited) {\n        descendedForward = true;\n      }\n    }\n\n    return descendedForward;\n  }\n\n  visitNode(generalNode, specificNode, ...remainingArguments) {\n    let visited = false;\n\n    const generalNodeTerminalNode = generalNode.isTerminalNode(),\n          specificNodeTerminalNode = specificNode.isTerminalNode(),\n          generalNodeNonTerminalNode = generalNode.isNonTerminalNode(),\n          specificNodeNonTerminalNode = specificNode.isNonTerminalNode();\n\n    if (false) {\n      ///\n    } else if (generalNodeTerminalNode && specificNodeTerminalNode) {\n      const generalTerminalNode = generalNode,  ///\n            specificTerminalNode = specificNode;  ///\n\n      visited = this.visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments);\n    } else if (generalNodeNonTerminalNode && specificNodeNonTerminalNode) {\n      const generalNonTerminalNode = generalNode,  ///\n            specificNonTerminalNode = specificNode; ///\n\n      visited = this.visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    const descendForward = remainingArguments.pop(), ///\n          descendedForward = descendForward();\n\n    if (descendedForward) {\n      visited = true;\n    }\n\n    remainingArguments.push(descendForward);\n\n    return visited;\n  }\n\n  visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        generalNodeQuery: nonTerminalNodeQuery,\n        specificNodeQuery: nonTerminalNodeQuery,\n        run: (generalNode, specificNode, ...remainingArguments) => {\n          let visited = false;\n\n          const generalNonTerminalNodeRuleName = generalNonTerminalNode.getRuleName(), ///\n                specificNonTerminalNodeRuleName = specificNonTerminalNode.getRuleName(); ///\n\n          if (generalNonTerminalNodeRuleName === specificNonTerminalNodeRuleName) {\n            const index = 0,\n                  generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(),\n                  specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(),\n                  generalChildNodes = generalNonTerminalNodeChildNodes, ///\n                  specificChildNodes = specificNonTerminalNodeChildNodes, ///\n                  childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);\n\n            if (childNodesCongruent) {\n              const descended = this.descend(index, generalChildNodes, specificChildNodes, ...remainingArguments);\n\n              if (descended) {\n                visited = true;\n              }\n            }\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { generalNodeQuery, specificNodeQuery, run } = map;\n\n      const generalNode = generalNodeQuery(generalNonTerminalNode),  ///\n        specificNode = specificNodeQuery(specificNonTerminalNode);  ///\n\n      if ((generalNode !== null) && (specificNode !== null)) {\n        const success  = run(generalNode, specificNode, ...remainingArguments);\n\n        visited = success;  ///\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["ForwardZipPass","run","generalNode","specificNode","remainingArguments","success","visited","visitNode","descend","index","generalChildNodes","specificChildNodes","descendedForward","descendForward","pop","generalChildNodesLength","length","generalChildNode","specificChildNode","push","aheadIndex","generalNodeTerminalNode","isTerminalNode","specificNodeTerminalNode","generalNodeNonTerminalNode","isNonTerminalNode","specificNodeNonTerminalNode","generalTerminalNode","specificTerminalNode","visitTerminalNode","generalNonTerminalNode","specificNonTerminalNode","visitNonTerminalNode","maps","generalNodeQuery","nonTerminalNodeQuery","specificNodeQuery","generalNonTerminalNodeRuleName","getRuleName","specificNonTerminalNodeRuleName","generalNonTerminalNodeChildNodes","getChildNodes","specificNonTerminalNodeChildNodes","childNodesCongruent","areChildNodesCongruent","descended","some","map"],"mappings":"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"}
96
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/forwardZip.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery, areChildNodesCongruent } from \"../utilities/pass\";\n\nexport default class ForwardZipPass {\n  run(generalNode, specificNode, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(generalNode, specificNode, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(index, generalChildNodes, specificChildNodes, ...remainingArguments) {\n    let descendedForward = false;\n\n    const childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);\n\n    if (childNodesCongruent) {\n      const descendForward = remainingArguments.pop(),  ///\n            generalChildNodesLength = generalChildNodes.length;\n\n      if (index === generalChildNodesLength) {\n        descendedForward = descendForward();\n      } else {\n        const generalChildNode = generalChildNodes[index],\n              specificChildNode = specificChildNodes[index],\n              generalNode = generalChildNode, ///\n              specificNode = specificChildNode, ///\n              visited = this.visitNode(generalNode, specificNode, ...remainingArguments, () => {\n                remainingArguments.push(descendForward);\n\n                const aheadIndex = index + 1,\n                      descendedForward = this.descend(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);\n\n                return descendedForward;\n              });\n\n        if (visited) {\n          descendedForward = true;\n        }\n      }\n    }\n\n    return descendedForward;\n  }\n\n  visitNode(generalNode, specificNode, ...remainingArguments) {\n    let visited = false;\n\n    const generalNodeTerminalNode = generalNode.isTerminalNode(),\n          specificNodeTerminalNode = specificNode.isTerminalNode(),\n          generalNodeNonTerminalNode = generalNode.isNonTerminalNode(),\n          specificNodeNonTerminalNode = specificNode.isNonTerminalNode();\n\n    if (false) {\n      ///\n    } else if (generalNodeTerminalNode && specificNodeTerminalNode) {\n      const generalTerminalNode = generalNode,  ///\n            specificTerminalNode = specificNode;  ///\n\n      visited = this.visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments);\n    } else if (generalNodeNonTerminalNode && specificNodeNonTerminalNode) {\n      const generalNonTerminalNode = generalNode,  ///\n            specificNonTerminalNode = specificNode; ///\n\n      visited = this.visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    const descendForward = remainingArguments.pop(), ///\n          descendedForward = descendForward();\n\n    if (descendedForward) {\n      visited = true;\n    }\n\n    remainingArguments.push(descendForward);\n\n    return visited;\n  }\n\n  visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        generalNodeQuery: nonTerminalNodeQuery,\n        specificNodeQuery: nonTerminalNodeQuery,\n        run: (generalNode, specificNode, ...remainingArguments) => {\n          let visited = false;\n\n          const generalNonTerminalNodeRuleName = generalNonTerminalNode.getRuleName(), ///\n                specificNonTerminalNodeRuleName = specificNonTerminalNode.getRuleName(); ///\n\n          if (generalNonTerminalNodeRuleName === specificNonTerminalNodeRuleName) {\n            const index = 0,\n                  generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(),\n                  specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(),\n                  generalChildNodes = generalNonTerminalNodeChildNodes, ///\n                  specificChildNodes = specificNonTerminalNodeChildNodes, ///\n                  descended = this.descend(index, generalChildNodes, specificChildNodes, ...remainingArguments);\n\n            if (descended) {\n              visited = true;\n            }\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { generalNodeQuery, specificNodeQuery, run } = map;\n\n      const generalNode = generalNodeQuery(generalNonTerminalNode),  ///\n        specificNode = specificNodeQuery(specificNonTerminalNode);  ///\n\n      if ((generalNode !== null) && (specificNode !== null)) {\n        const success  = run(generalNode, specificNode, ...remainingArguments);\n\n        visited = success;  ///\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["ForwardZipPass","run","generalNode","specificNode","remainingArguments","success","visited","visitNode","descend","index","generalChildNodes","specificChildNodes","descendedForward","childNodesCongruent","areChildNodesCongruent","descendForward","pop","generalChildNodesLength","length","generalChildNode","specificChildNode","push","aheadIndex","generalNodeTerminalNode","isTerminalNode","specificNodeTerminalNode","generalNodeNonTerminalNode","isNonTerminalNode","specificNodeNonTerminalNode","generalTerminalNode","specificTerminalNode","visitTerminalNode","generalNonTerminalNode","specificNonTerminalNode","visitNonTerminalNode","maps","generalNodeQuery","nonTerminalNodeQuery","specificNodeQuery","generalNonTerminalNodeRuleName","getRuleName","specificNonTerminalNodeRuleName","generalNonTerminalNodeChildNodes","getChildNodes","specificNonTerminalNodeChildNodes","descended","some","map"],"mappings":"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"}
package/lib/pass/zip.js CHANGED
@@ -18,14 +18,17 @@ class ZipPass {
18
18
  }
19
19
  descend(generalChildNodes, specificChildNodes, ...remainingArguments) {
20
20
  let descended = false;
21
- const visited = generalChildNodes.every((generalChildNode, index)=>{
22
- const specificChildNode = specificChildNodes[index], specificNode = specificChildNode, generalNode = generalChildNode, visited = this.visitNode(generalNode, specificNode, ...remainingArguments);
21
+ const childNodesCongruent = (0, _pass.areChildNodesCongruent)(generalChildNodes, specificChildNodes);
22
+ if (childNodesCongruent) {
23
+ const visited = generalChildNodes.every((generalChildNode, index)=>{
24
+ const specificChildNode = specificChildNodes[index], specificNode = specificChildNode, generalNode = generalChildNode, visited = this.visitNode(generalNode, specificNode, ...remainingArguments);
25
+ if (visited) {
26
+ return true;
27
+ }
28
+ });
23
29
  if (visited) {
24
- return true;
30
+ descended = true;
25
31
  }
26
- });
27
- if (visited) {
28
- descended = true;
29
32
  }
30
33
  return descended;
31
34
  }
@@ -60,12 +63,9 @@ class ZipPass {
60
63
  let visited = false;
61
64
  const generalNonTerminalNodeRuleName = generalNonTerminalNode.getRuleName(), specificNonTerminalNodeRuleName = specificNonTerminalNode.getRuleName(); ///
62
65
  if (generalNonTerminalNodeRuleName === specificNonTerminalNodeRuleName) {
63
- const generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(), specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(), generalChildNodes = generalNonTerminalNodeChildNodes, specificChildNodes = specificNonTerminalNodeChildNodes, childNodesCongruent = (0, _pass.areChildNodesCongruent)(generalChildNodes, specificChildNodes);
64
- if (childNodesCongruent) {
65
- const descended = this.descend(generalChildNodes, specificChildNodes, ...remainingArguments);
66
- if (descended) {
67
- visited = true;
68
- }
66
+ const generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(), specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(), generalChildNodes = generalNonTerminalNodeChildNodes, specificChildNodes = specificNonTerminalNodeChildNodes, descended = this.descend(generalChildNodes, specificChildNodes, ...remainingArguments);
67
+ if (descended) {
68
+ visited = true;
69
69
  }
70
70
  }
71
71
  return visited;
@@ -85,4 +85,4 @@ class ZipPass {
85
85
  }
86
86
  }
87
87
 
88
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/zip.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery, areChildNodesCongruent } from \"../utilities/pass\";\n\nexport default class ZipPass {\n  run(generalNode, specificNode, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(generalNode, specificNode, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(generalChildNodes, specificChildNodes, ...remainingArguments) {\n    let descended = false;\n\n    const visited = generalChildNodes.every((generalChildNode, index) => {\n      const specificChildNode = specificChildNodes[index],\n            specificNode = specificChildNode, ///\n            generalNode = generalChildNode, ///\n            visited = this.visitNode(generalNode, specificNode, ...remainingArguments);\n\n      if (visited) {\n        return true;\n      }\n    });\n\n    if (visited) {\n      descended = true;\n    }\n\n\n    return descended;\n  }\n\n  visitNode(generalNode, specificNode, ...remainingArguments) {\n    let visited = false;\n\n    const generalNodeTerminalNode = generalNode.isTerminalNode(),\n          specificNodeTerminalNode = specificNode.isTerminalNode(),\n          generalNodeNonTerminalNode = generalNode.isNonTerminalNode(),\n          specificNodeNonTerminalNode = specificNode.isNonTerminalNode();\n\n    if (false) {\n      ///\n    } else if (generalNodeTerminalNode && specificNodeTerminalNode) {\n      const generalTerminalNode = generalNode,  ///\n            specificTerminalNode = specificNode;  ///\n\n      visited = this.visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments);\n    } else if (generalNodeNonTerminalNode && specificNodeNonTerminalNode) {\n      const generalNonTerminalNode = generalNode,  ///\n            specificNonTerminalNode = specificNode; ///\n\n      visited = this.visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments) { ///\n    let visited;\n\n    visited = true;\n\n    return visited;\n  }\n\n  visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        generalNodeQuery: nonTerminalNodeQuery,\n        specificNodeQuery: nonTerminalNodeQuery,\n        run: (generalNode, specificNode, ...remainingArguments) => {\n          let visited = false;\n\n          const generalNonTerminalNodeRuleName = generalNonTerminalNode.getRuleName(), ///\n                specificNonTerminalNodeRuleName = specificNonTerminalNode.getRuleName(); ///\n\n          if (generalNonTerminalNodeRuleName === specificNonTerminalNodeRuleName) {\n            const generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(),\n                  specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(),\n                  generalChildNodes = generalNonTerminalNodeChildNodes, ///\n                  specificChildNodes = specificNonTerminalNodeChildNodes, ///\n                  childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);\n\n            if (childNodesCongruent) {\n              const descended = this.descend(generalChildNodes, specificChildNodes, ...remainingArguments);\n\n              if (descended) {\n                visited = true;\n              }\n            }\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { generalNodeQuery, specificNodeQuery, run } = map;\n\n      const generalNode = generalNodeQuery(generalNonTerminalNode),  ///\n            specificNode = specificNodeQuery(specificNonTerminalNode);  ///\n\n      if ((generalNode !== null) && (specificNode !== null)) {\n        const success  = run(generalNode, specificNode, ...remainingArguments);\n\n        visited = success;  ///\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["ZipPass","run","generalNode","specificNode","remainingArguments","success","visited","visitNode","descend","generalChildNodes","specificChildNodes","descended","every","generalChildNode","index","specificChildNode","generalNodeTerminalNode","isTerminalNode","specificNodeTerminalNode","generalNodeNonTerminalNode","isNonTerminalNode","specificNodeNonTerminalNode","generalTerminalNode","specificTerminalNode","visitTerminalNode","generalNonTerminalNode","specificNonTerminalNode","visitNonTerminalNode","maps","generalNodeQuery","nonTerminalNodeQuery","specificNodeQuery","generalNonTerminalNodeRuleName","getRuleName","specificNonTerminalNodeRuleName","generalNonTerminalNodeChildNodes","getChildNodes","specificNonTerminalNodeChildNodes","childNodesCongruent","areChildNodesCongruent","some","map"],"mappings":"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"}
88
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/zip.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery, areChildNodesCongruent } from \"../utilities/pass\";\n\nexport default class ZipPass {\n  run(generalNode, specificNode, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(generalNode, specificNode, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(generalChildNodes, specificChildNodes, ...remainingArguments) {\n    let descended = false;\n\n    const childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);\n\n    if (childNodesCongruent) {\n      const visited = generalChildNodes.every((generalChildNode, index) => {\n        const specificChildNode = specificChildNodes[index],\n              specificNode = specificChildNode, ///\n              generalNode = generalChildNode, ///\n              visited = this.visitNode(generalNode, specificNode, ...remainingArguments);\n\n        if (visited) {\n          return true;\n        }\n      });\n\n      if (visited) {\n        descended = true;\n      }\n    }\n\n    return descended;\n  }\n\n  visitNode(generalNode, specificNode, ...remainingArguments) {\n    let visited = false;\n\n    const generalNodeTerminalNode = generalNode.isTerminalNode(),\n          specificNodeTerminalNode = specificNode.isTerminalNode(),\n          generalNodeNonTerminalNode = generalNode.isNonTerminalNode(),\n          specificNodeNonTerminalNode = specificNode.isNonTerminalNode();\n\n    if (false) {\n      ///\n    } else if (generalNodeTerminalNode && specificNodeTerminalNode) {\n      const generalTerminalNode = generalNode,  ///\n            specificTerminalNode = specificNode;  ///\n\n      visited = this.visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments);\n    } else if (generalNodeNonTerminalNode && specificNodeNonTerminalNode) {\n      const generalNonTerminalNode = generalNode,  ///\n            specificNonTerminalNode = specificNode; ///\n\n      visited = this.visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  visitTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments) { ///\n    let visited;\n\n    visited = true;\n\n    return visited;\n  }\n\n  visitNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        generalNodeQuery: nonTerminalNodeQuery,\n        specificNodeQuery: nonTerminalNodeQuery,\n        run: (generalNode, specificNode, ...remainingArguments) => {\n          let visited = false;\n\n          const generalNonTerminalNodeRuleName = generalNonTerminalNode.getRuleName(), ///\n                specificNonTerminalNodeRuleName = specificNonTerminalNode.getRuleName(); ///\n\n          if (generalNonTerminalNodeRuleName === specificNonTerminalNodeRuleName) {\n            const generalNonTerminalNodeChildNodes = generalNonTerminalNode.getChildNodes(),\n                  specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(),\n                  generalChildNodes = generalNonTerminalNodeChildNodes, ///\n                  specificChildNodes = specificNonTerminalNodeChildNodes, ///\n                  descended = this.descend(generalChildNodes, specificChildNodes, ...remainingArguments);\n\n            if (descended) {\n              visited = true;\n            }\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { generalNodeQuery, specificNodeQuery, run } = map;\n\n      const generalNode = generalNodeQuery(generalNonTerminalNode),  ///\n            specificNode = specificNodeQuery(specificNonTerminalNode);  ///\n\n      if ((generalNode !== null) && (specificNode !== null)) {\n        const success  = run(generalNode, specificNode, ...remainingArguments);\n\n        visited = success;  ///\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["ZipPass","run","generalNode","specificNode","remainingArguments","success","visited","visitNode","descend","generalChildNodes","specificChildNodes","descended","childNodesCongruent","areChildNodesCongruent","every","generalChildNode","index","specificChildNode","generalNodeTerminalNode","isTerminalNode","specificNodeTerminalNode","generalNodeNonTerminalNode","isNonTerminalNode","specificNodeNonTerminalNode","generalTerminalNode","specificTerminalNode","visitTerminalNode","generalNonTerminalNode","specificNonTerminalNode","visitNonTerminalNode","maps","generalNodeQuery","nonTerminalNodeQuery","specificNodeQuery","generalNonTerminalNodeRuleName","getRuleName","specificNonTerminalNodeRuleName","generalNonTerminalNodeChildNodes","getChildNodes","specificNonTerminalNodeChildNodes","some","map"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-languages",
3
3
  "author": "James Smith",
4
- "version": "0.0.210",
4
+ "version": "0.0.212",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-languages",
7
7
  "description": "Occam's common language functionality.",
@@ -14,18 +14,26 @@ export default class EquivalencePass {
14
14
  }
15
15
 
16
16
  descend(leftChildNodes, rightChildNodes, ...remainingArguments) {
17
- let descended;
17
+ let descended = false;
18
18
 
19
- descended = leftChildNodes.every((leftChildNode, index) => {
20
- const rightChildNode = rightChildNodes[index],
21
- leftNode = leftChildNode, ///
22
- rightNode = rightChildNode, ///
23
- visited = this.visitNode(leftNode, rightNode, ...remainingArguments);
19
+ const childNodesCongruent = areChildNodesCongruent(leftChildNodes, rightChildNodes);
20
+
21
+ if (childNodesCongruent) {
22
+ const visited = leftChildNodes.every((leftChildNode, index) => {
23
+ const rightChildNode = rightChildNodes[index],
24
+ leftNode = leftChildNode, ///
25
+ rightNode = rightChildNode, ///
26
+ visited = this.visitNode(leftNode, rightNode, ...remainingArguments);
27
+
28
+ if (visited) {
29
+ return true;
30
+ }
31
+ });
24
32
 
25
33
  if (visited) {
26
- return true;
34
+ descended = true;
27
35
  }
28
- });
36
+ }
29
37
 
30
38
  return descended;
31
39
  }
@@ -84,14 +92,10 @@ export default class EquivalencePass {
84
92
  rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(),
85
93
  leftChildNodes = leftNonTerminalNodeChildNodes, ///
86
94
  rightChildNodes = rightNonTerminalNodeChildNodes, ///
87
- childNodesCongruent = areChildNodesCongruent(leftChildNodes, rightChildNodes);
88
-
89
- if (childNodesCongruent) {
90
- const descended = this.descend(leftChildNodes, rightChildNodes, ...remainingArguments);
95
+ descended = this.descend(leftChildNodes, rightChildNodes, ...remainingArguments);
91
96
 
92
- if (descended) {
93
- visited = true;
94
- }
97
+ if (descended) {
98
+ visited = true;
95
99
  }
96
100
  }
97
101
 
@@ -16,27 +16,31 @@ export default class ForwardZipPass {
16
16
  descend(index, generalChildNodes, specificChildNodes, ...remainingArguments) {
17
17
  let descendedForward = false;
18
18
 
19
- const descendForward = remainingArguments.pop(), ///
20
- generalChildNodesLength = generalChildNodes.length;
21
-
22
- if (index === generalChildNodesLength) {
23
- descendedForward = descendForward();
24
- } else {
25
- const generalChildNode = generalChildNodes[index],
26
- specificChildNode = specificChildNodes[index],
27
- generalNode = generalChildNode, ///
28
- specificNode = specificChildNode, ///
29
- visited = this.visitNode(generalNode, specificNode, ...remainingArguments, () => {
30
- remainingArguments.push(descendForward);
31
-
32
- const aheadIndex = index + 1,
33
- descendedForward = this.descend(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);
34
-
35
- return descendedForward;
36
- });
37
-
38
- if (visited) {
39
- descendedForward = true;
19
+ const childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);
20
+
21
+ if (childNodesCongruent) {
22
+ const descendForward = remainingArguments.pop(), ///
23
+ generalChildNodesLength = generalChildNodes.length;
24
+
25
+ if (index === generalChildNodesLength) {
26
+ descendedForward = descendForward();
27
+ } else {
28
+ const generalChildNode = generalChildNodes[index],
29
+ specificChildNode = specificChildNodes[index],
30
+ generalNode = generalChildNode, ///
31
+ specificNode = specificChildNode, ///
32
+ visited = this.visitNode(generalNode, specificNode, ...remainingArguments, () => {
33
+ remainingArguments.push(descendForward);
34
+
35
+ const aheadIndex = index + 1,
36
+ descendedForward = this.descend(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);
37
+
38
+ return descendedForward;
39
+ });
40
+
41
+ if (visited) {
42
+ descendedForward = true;
43
+ }
40
44
  }
41
45
  }
42
46
 
@@ -105,14 +109,10 @@ export default class ForwardZipPass {
105
109
  specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(),
106
110
  generalChildNodes = generalNonTerminalNodeChildNodes, ///
107
111
  specificChildNodes = specificNonTerminalNodeChildNodes, ///
108
- childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);
109
-
110
- if (childNodesCongruent) {
111
- const descended = this.descend(index, generalChildNodes, specificChildNodes, ...remainingArguments);
112
+ descended = this.descend(index, generalChildNodes, specificChildNodes, ...remainingArguments);
112
113
 
113
- if (descended) {
114
- visited = true;
115
- }
114
+ if (descended) {
115
+ visited = true;
116
116
  }
117
117
  }
118
118
 
package/src/pass/zip.js CHANGED
@@ -16,22 +16,25 @@ export default class ZipPass {
16
16
  descend(generalChildNodes, specificChildNodes, ...remainingArguments) {
17
17
  let descended = false;
18
18
 
19
- const visited = generalChildNodes.every((generalChildNode, index) => {
20
- const specificChildNode = specificChildNodes[index],
21
- specificNode = specificChildNode, ///
22
- generalNode = generalChildNode, ///
23
- visited = this.visitNode(generalNode, specificNode, ...remainingArguments);
19
+ const childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);
20
+
21
+ if (childNodesCongruent) {
22
+ const visited = generalChildNodes.every((generalChildNode, index) => {
23
+ const specificChildNode = specificChildNodes[index],
24
+ specificNode = specificChildNode, ///
25
+ generalNode = generalChildNode, ///
26
+ visited = this.visitNode(generalNode, specificNode, ...remainingArguments);
27
+
28
+ if (visited) {
29
+ return true;
30
+ }
31
+ });
24
32
 
25
33
  if (visited) {
26
- return true;
34
+ descended = true;
27
35
  }
28
- });
29
-
30
- if (visited) {
31
- descended = true;
32
36
  }
33
37
 
34
-
35
38
  return descended;
36
39
  }
37
40
 
@@ -89,14 +92,10 @@ export default class ZipPass {
89
92
  specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(),
90
93
  generalChildNodes = generalNonTerminalNodeChildNodes, ///
91
94
  specificChildNodes = specificNonTerminalNodeChildNodes, ///
92
- childNodesCongruent = areChildNodesCongruent(generalChildNodes, specificChildNodes);
93
-
94
- if (childNodesCongruent) {
95
- const descended = this.descend(generalChildNodes, specificChildNodes, ...remainingArguments);
95
+ descended = this.descend(generalChildNodes, specificChildNodes, ...remainingArguments);
96
96
 
97
- if (descended) {
98
- visited = true;
99
- }
97
+ if (descended) {
98
+ visited = true;
100
99
  }
101
100
  }
102
101