occam-languages 0.0.78 → 0.0.80

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.
@@ -74,33 +74,33 @@ var ForwardPass = /*#__PURE__*/ function() {
74
74
  },
75
75
  {
76
76
  key: "descend",
77
- value: function descend(childNodes) {
77
+ value: function descend(index, childNodes) {
78
78
  var _this = this;
79
- for(var _len = arguments.length, remainingArguments = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
80
- remainingArguments[_key - 1] = arguments[_key];
79
+ for(var _len = arguments.length, remainingArguments = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++){
80
+ remainingArguments[_key - 2] = arguments[_key];
81
81
  }
82
- var descended = false;
83
- var lastRemainingArgumentFunction = (0, _pass.isLastRemainingArgumentFunction)(remainingArguments);
84
- if (lastRemainingArgumentFunction) {
85
- var index = 0;
86
- descended = this.descendForward.apply(this, [
87
- index,
88
- childNodes
89
- ].concat(_to_consumable_array(remainingArguments))); ///
82
+ var descendedForward = false;
83
+ var descendForward = remainingArguments.pop(), childNodesLength = childNodes.length;
84
+ if (index === childNodesLength) {
85
+ descendedForward = descendForward();
90
86
  } else {
91
- var visited = childNodes.every(function(childNode) {
92
- var node = childNode, visited = _this.visitNode.apply(_this, [
93
- node
94
- ].concat(_to_consumable_array(remainingArguments)));
95
- if (visited) {
96
- return true;
87
+ var childNode = childNodes[index], node = childNode, visited = this.visitNode.apply(this, [
88
+ node
89
+ ].concat(_to_consumable_array(remainingArguments), [
90
+ function() {
91
+ remainingArguments.push(descendForward);
92
+ var aheadIndex = index + 1, descendedForward = _this.descend.apply(_this, [
93
+ aheadIndex,
94
+ childNodes
95
+ ].concat(_to_consumable_array(remainingArguments)));
96
+ return descendedForward;
97
97
  }
98
- });
98
+ ]));
99
99
  if (visited) {
100
- descended = true;
100
+ descendedForward = true;
101
101
  }
102
102
  }
103
- return descended;
103
+ return descendedForward;
104
104
  }
105
105
  },
106
106
  {
@@ -125,37 +125,6 @@ var ForwardPass = /*#__PURE__*/ function() {
125
125
  return visited;
126
126
  }
127
127
  },
128
- {
129
- key: "descendForward",
130
- value: function descendForward(index, childNodes) {
131
- var _this = this;
132
- for(var _len = arguments.length, remainingArguments = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++){
133
- remainingArguments[_key - 2] = arguments[_key];
134
- }
135
- var descendedForward = false;
136
- var descendForward = remainingArguments.pop(), childNodesLength = childNodes.length;
137
- if (index === childNodesLength) {
138
- descendedForward = descendForward();
139
- } else {
140
- var childNode = childNodes[index], node = childNode, visited = this.visitNode.apply(this, [
141
- node
142
- ].concat(_to_consumable_array(remainingArguments), [
143
- function() {
144
- remainingArguments.push(descendForward);
145
- var aheadIndex = index + 1, descendedForward = _this.descendForward.apply(_this, [
146
- aheadIndex,
147
- childNodes
148
- ].concat(_to_consumable_array(remainingArguments)));
149
- return descendedForward;
150
- }
151
- ]));
152
- if (visited) {
153
- descendedForward = true;
154
- }
155
- }
156
- return descendedForward;
157
- }
158
- },
159
128
  {
160
129
  key: "visitTerminalNode",
161
130
  value: function visitTerminalNode(terminalNode) {
@@ -163,16 +132,11 @@ var ForwardPass = /*#__PURE__*/ function() {
163
132
  remainingArguments[_key - 1] = arguments[_key];
164
133
  }
165
134
  var visited = false;
166
- var lastRemainingArgumentFunction = (0, _pass.isLastRemainingArgumentFunction)(remainingArguments);
167
- if (lastRemainingArgumentFunction) {
168
- var descendForward = remainingArguments.pop(), descendedForward = descendForward();
169
- if (descendedForward) {
170
- visited = true;
171
- }
172
- remainingArguments.push(descendForward);
173
- } else {
135
+ var descendForward = remainingArguments.pop(), descendedForward = descendForward();
136
+ if (descendedForward) {
174
137
  visited = true;
175
138
  }
139
+ remainingArguments.push(descendForward);
176
140
  return visited;
177
141
  }
178
142
  },
@@ -193,7 +157,8 @@ var ForwardPass = /*#__PURE__*/ function() {
193
157
  remainingArguments[_key - 1] = arguments[_key];
194
158
  }
195
159
  var visited = false;
196
- var childNodes = nonTerminalNode.getChildNodes(), descended = _this.descend.apply(_this, [
160
+ var index = 0, childNodes = nonTerminalNode.getChildNodes(), descended = _this.descend.apply(_this, [
161
+ index,
197
162
  childNodes
198
163
  ].concat(_to_consumable_array(remainingArguments)));
199
164
  if (descended) {
@@ -221,4 +186,4 @@ var ForwardPass = /*#__PURE__*/ function() {
221
186
  return ForwardPass;
222
187
  }();
223
188
 
224
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/forward.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery, isLastRemainingArgumentFunction } from \"../utilities/pass\";\n\nexport default class ForwardPass {\n  run(node, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(node, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(childNodes, ...remainingArguments) {\n    let descended = false;\n\n    const lastRemainingArgumentFunction = isLastRemainingArgumentFunction(remainingArguments);\n\n    if (lastRemainingArgumentFunction) {\n      const index = 0;\n\n      descended = this.descendForward(index, childNodes, ...remainingArguments); ///\n    } else {\n      const visited = childNodes.every((childNode) => {\n        const node = childNode, ///\n              visited = this.visitNode(node, ...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(node, ...remainingArguments) {\n    let visited;\n\n    const nodeTerminalNode = node.isTerminalNode();\n\n    if (nodeTerminalNode) {\n      const terminalNode = node;  ///\n\n      visited = this.visitTerminalNode(terminalNode, ...remainingArguments);\n    } else {\n      const nonTerminalNode = node;  ///\n\n      visited = this.visitNonTerminalNode(nonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  descendForward(index, childNodes, ...remainingArguments) {\n    let descendedForward = false;\n\n    const descendForward = remainingArguments.pop(), ///\n          childNodesLength = childNodes.length;\n\n    if (index === childNodesLength) {\n      descendedForward = descendForward();\n    } else {\n      const childNode = childNodes[index],\n            node = childNode, ///\n            visited = this.visitNode(node, ...remainingArguments, () => {\n              remainingArguments.push(descendForward);\n\n              const aheadIndex = index + 1,\n                    descendedForward = this.descendForward(aheadIndex, childNodes, ...remainingArguments);\n\n              return descendedForward;\n            });\n\n      if (visited) {\n        descendedForward = true;\n      }\n    }\n\n    return descendedForward;\n  }\n\n  visitTerminalNode(terminalNode, ...remainingArguments) {\n    let visited = false;\n\n    const lastRemainingArgumentFunction = isLastRemainingArgumentFunction(remainingArguments);\n\n    if (lastRemainingArgumentFunction) {\n      const descendForward = remainingArguments.pop(), ///\n            descendedForward = descendForward();\n\n      if (descendedForward) {\n        visited = true;\n      }\n\n      remainingArguments.push(descendForward);\n    } else {\n      visited = true;\n    }\n\n    return visited;\n  }\n\n  visitNonTerminalNode(nonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        nodeQuery: nonTerminalNodeQuery,\n        run: (node, ...remainingArguments) => {\n          let visited = false;\n\n          const childNodes = nonTerminalNode.getChildNodes(), ///\n                descended = this.descend(childNodes, ...remainingArguments);\n\n          if (descended) {\n            visited = true;\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { nodeQuery, run } = map;\n\n      const node = nodeQuery(nonTerminalNode);\n\n      if (node !== null) {\n        const success = run(node, ...remainingArguments);\n\n        visited = success;\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["ForwardPass","run","node","remainingArguments","success","visited","visitNode","descend","childNodes","descended","lastRemainingArgumentFunction","isLastRemainingArgumentFunction","index","descendForward","every","childNode","nodeTerminalNode","isTerminalNode","terminalNode","visitTerminalNode","nonTerminalNode","visitNonTerminalNode","descendedForward","pop","childNodesLength","length","push","aheadIndex","maps","nodeQuery","nonTerminalNodeQuery","getChildNodes","some","map"],"mappings":"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"}
189
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/pass/forward.js"],"sourcesContent":["\"use strict\";\n\nimport { nonTerminalNodeQuery } from \"../utilities/pass\";\n\nexport default class ForwardPass {\n  run(node, ...remainingArguments) {\n    let success;\n\n    const visited = this.visitNode(node, ...remainingArguments);\n\n    success = visited;  ///\n\n    return success;\n  }\n\n  descend(index, childNodes, ...remainingArguments) {\n    let descendedForward = false;\n\n    const descendForward = remainingArguments.pop(), ///\n          childNodesLength = childNodes.length;\n\n    if (index === childNodesLength) {\n      descendedForward = descendForward();\n    } else {\n      const childNode = childNodes[index],\n            node = childNode, ///\n            visited = this.visitNode(node, ...remainingArguments, () => {\n              remainingArguments.push(descendForward);\n\n              const aheadIndex = index + 1,\n                    descendedForward = this.descend(aheadIndex, childNodes, ...remainingArguments);\n\n              return descendedForward;\n            });\n\n      if (visited) {\n        descendedForward = true;\n      }\n    }\n\n    return descendedForward;\n  }\n\n  visitNode(node, ...remainingArguments) {\n    let visited;\n\n    const nodeTerminalNode = node.isTerminalNode();\n\n    if (nodeTerminalNode) {\n      const terminalNode = node;  ///\n\n      visited = this.visitTerminalNode(terminalNode, ...remainingArguments);\n    } else {\n      const nonTerminalNode = node;  ///\n\n      visited = this.visitNonTerminalNode(nonTerminalNode, ...remainingArguments);\n    }\n\n    return visited;\n  }\n\n  visitTerminalNode(terminalNode, ...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(nonTerminalNode, ...remainingArguments) {\n    let visited = false;\n\n    let { maps } = this.constructor;\n\n    maps = [ ///\n      ...maps,\n      {\n        nodeQuery: nonTerminalNodeQuery,\n        run: (node, ...remainingArguments) => {\n          let visited = false;\n\n          const index = 0,\n                childNodes = nonTerminalNode.getChildNodes(), ///\n                descended = this.descend(index, childNodes, ...remainingArguments);\n\n          if (descended) {\n            visited = true;\n          }\n\n          return visited;\n        }\n      }\n    ]\n\n    maps.some((map) => {\n      const { nodeQuery, run } = map;\n\n      const node = nodeQuery(nonTerminalNode);\n\n      if (node !== null) {\n        const success = run(node, ...remainingArguments);\n\n        visited = success;\n\n        return true;\n      }\n    });\n\n    return visited;\n  }\n}\n"],"names":["ForwardPass","run","node","remainingArguments","success","visited","visitNode","descend","index","childNodes","descendedForward","descendForward","pop","childNodesLength","length","childNode","push","aheadIndex","nodeTerminalNode","isTerminalNode","terminalNode","visitTerminalNode","nonTerminalNode","visitNonTerminalNode","maps","nodeQuery","nonTerminalNodeQuery","getChildNodes","descended","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.78",
4
+ "version": "0.0.80",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-languages",
7
7
  "description": "Occam's common language functionality.",
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import { nonTerminalNodeQuery, isLastRemainingArgumentFunction } from "../utilities/pass";
3
+ import { nonTerminalNodeQuery } from "../utilities/pass";
4
4
 
5
5
  export default class ForwardPass {
6
6
  run(node, ...remainingArguments) {
@@ -13,31 +13,32 @@ export default class ForwardPass {
13
13
  return success;
14
14
  }
15
15
 
16
- descend(childNodes, ...remainingArguments) {
17
- let descended = false;
18
-
19
- const lastRemainingArgumentFunction = isLastRemainingArgumentFunction(remainingArguments);
16
+ descend(index, childNodes, ...remainingArguments) {
17
+ let descendedForward = false;
20
18
 
21
- if (lastRemainingArgumentFunction) {
22
- const index = 0;
19
+ const descendForward = remainingArguments.pop(), ///
20
+ childNodesLength = childNodes.length;
23
21
 
24
- descended = this.descendForward(index, childNodes, ...remainingArguments); ///
22
+ if (index === childNodesLength) {
23
+ descendedForward = descendForward();
25
24
  } else {
26
- const visited = childNodes.every((childNode) => {
27
- const node = childNode, ///
28
- visited = this.visitNode(node, ...remainingArguments);
25
+ const childNode = childNodes[index],
26
+ node = childNode, ///
27
+ visited = this.visitNode(node, ...remainingArguments, () => {
28
+ remainingArguments.push(descendForward);
29
29
 
30
- if (visited) {
31
- return true;
32
- }
33
- });
30
+ const aheadIndex = index + 1,
31
+ descendedForward = this.descend(aheadIndex, childNodes, ...remainingArguments);
32
+
33
+ return descendedForward;
34
+ });
34
35
 
35
36
  if (visited) {
36
- descended = true;
37
+ descendedForward = true;
37
38
  }
38
39
  }
39
40
 
40
- return descended;
41
+ return descendedForward;
41
42
  }
42
43
 
43
44
  visitNode(node, ...remainingArguments) {
@@ -58,52 +59,18 @@ export default class ForwardPass {
58
59
  return visited;
59
60
  }
60
61
 
61
- descendForward(index, childNodes, ...remainingArguments) {
62
- let descendedForward = false;
63
-
64
- const descendForward = remainingArguments.pop(), ///
65
- childNodesLength = childNodes.length;
66
-
67
- if (index === childNodesLength) {
68
- descendedForward = descendForward();
69
- } else {
70
- const childNode = childNodes[index],
71
- node = childNode, ///
72
- visited = this.visitNode(node, ...remainingArguments, () => {
73
- remainingArguments.push(descendForward);
74
-
75
- const aheadIndex = index + 1,
76
- descendedForward = this.descendForward(aheadIndex, childNodes, ...remainingArguments);
77
-
78
- return descendedForward;
79
- });
80
-
81
- if (visited) {
82
- descendedForward = true;
83
- }
84
- }
85
-
86
- return descendedForward;
87
- }
88
-
89
62
  visitTerminalNode(terminalNode, ...remainingArguments) {
90
63
  let visited = false;
91
64
 
92
- const lastRemainingArgumentFunction = isLastRemainingArgumentFunction(remainingArguments);
93
-
94
- if (lastRemainingArgumentFunction) {
95
- const descendForward = remainingArguments.pop(), ///
96
- descendedForward = descendForward();
97
-
98
- if (descendedForward) {
99
- visited = true;
100
- }
65
+ const descendForward = remainingArguments.pop(), ///
66
+ descendedForward = descendForward();
101
67
 
102
- remainingArguments.push(descendForward);
103
- } else {
68
+ if (descendedForward) {
104
69
  visited = true;
105
70
  }
106
71
 
72
+ remainingArguments.push(descendForward);
73
+
107
74
  return visited;
108
75
  }
109
76
 
@@ -119,8 +86,9 @@ export default class ForwardPass {
119
86
  run: (node, ...remainingArguments) => {
120
87
  let visited = false;
121
88
 
122
- const childNodes = nonTerminalNode.getChildNodes(), ///
123
- descended = this.descend(childNodes, ...remainingArguments);
89
+ const index = 0,
90
+ childNodes = nonTerminalNode.getChildNodes(), ///
91
+ descended = this.descend(index, childNodes, ...remainingArguments);
124
92
 
125
93
  if (descended) {
126
94
  visited = true;