occam-parsers 23.3.79 → 23.3.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.
- package/lib/definition.js +11 -5
- package/package.json +1 -1
- package/src/definition.js +12 -5
package/lib/definition.js
CHANGED
|
@@ -87,13 +87,13 @@ class Definition {
|
|
|
87
87
|
}, back);
|
|
88
88
|
}
|
|
89
89
|
compose(rule, definition, savedFrame, frame, state) {
|
|
90
|
-
const nonTerminalNode = nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame, state)
|
|
91
|
-
if (
|
|
92
|
-
frame = null;
|
|
93
|
-
} else {
|
|
90
|
+
const nonTerminalNode = nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame, state);
|
|
91
|
+
if (nonTerminalNode !== null) {
|
|
94
92
|
const childNode = nonTerminalNode; ///
|
|
95
93
|
frame = _frame.default.fromChildNode(childNode); ///
|
|
96
94
|
frame = savedFrame.merge(frame); ///
|
|
95
|
+
} else {
|
|
96
|
+
frame = null;
|
|
97
97
|
}
|
|
98
98
|
return frame;
|
|
99
99
|
}
|
|
@@ -132,7 +132,13 @@ function nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame,
|
|
|
132
132
|
const opacity = rule.getOpacity(), ruleName = rule.getName(), childNodes = frame.getChildNodes(), precedence = frame.getPrecedence(definition), NonTerminalNode = rule.NonTerminalNodeFromRuleName(ruleName, state);
|
|
133
133
|
nonTerminalNode = NonTerminalNode.fromRuleNameChildNodesPrecedenceAndOpacity(ruleName, childNodes, precedence, opacity);
|
|
134
134
|
nonTerminalNode = nonTerminalNode.rewrite(state);
|
|
135
|
+
if (nonTerminalNode !== null) {
|
|
136
|
+
const invalid = nonTerminalNode.isInvalid();
|
|
137
|
+
if (invalid) {
|
|
138
|
+
nonTerminalNode = null;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
135
141
|
return nonTerminalNode;
|
|
136
142
|
}
|
|
137
143
|
|
|
138
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9kZWZpbml0aW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgRnJhbWUgZnJvbSBcIi4vZnJhbWVcIjtcblxuaW1wb3J0IHsgZW1wdHlGcmFtZSB9IGZyb20gXCIuL2ZyYW1lXCI7XG5pbXBvcnQgeyBFTVBUWV9TVFJJTkcgfSBmcm9tIFwiLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IGV2ZXJ5IGFzIGxpbmVhckV2ZXJ5ICB9IGZyb20gXCIuL3V0aWxpdGllcy9saW5lYXJcIjtcbmltcG9ydCB7IGV2ZXJ5IGFzIGJyYW5jaGluZ0V2ZXJ5ICB9IGZyb20gXCIuL3V0aWxpdGllcy9icmFuY2hpbmdcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgRGVmaW5pdGlvbiB7XG4gIGNvbnN0cnVjdG9yKHBhcnRzLCBwcmVjZWRlbmNlKSB7XG4gICAgdGhpcy5wYXJ0cyA9IHBhcnRzO1xuICAgIHRoaXMucHJlY2VkZW5jZSA9IHByZWNlZGVuY2U7XG4gIH1cblxuICBnZXRQYXJ0cygpIHtcbiAgICByZXR1cm4gdGhpcy5wYXJ0cztcbiAgfVxuXG4gIGdldFByZWNlZGVuY2UoKSB7XG4gICAgcmV0dXJuIHRoaXMucHJlY2VkZW5jZTtcbiAgfVxuXG4gIGlzQ29uc3VtaW5nKHJ1bGVNYXAsIHZpc2l0ZWRSdWxlcyA9IFtdLCBjaGVja0ZvckN1dFBhcnRzID0gZmFsc2UpIHtcbiAgICBjb25zdCBjb25zdW1pbmcgPSB0aGlzLnBhcnRzLnNvbWUoKHBhcnQpID0+
|
|
144
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/definition.js"],"sourcesContent":["\"use strict\";\n\nimport Frame from \"./frame\";\n\nimport { emptyFrame } from \"./frame\";\nimport { EMPTY_STRING } from \"./constants\";\nimport { every as linearEvery  } from \"./utilities/linear\";\nimport { every as branchingEvery  } from \"./utilities/branching\";\n\nexport default class Definition {\n  constructor(parts, precedence) {\n    this.parts = parts;\n    this.precedence = precedence;\n  }\n\n  getParts() {\n    return this.parts;\n  }\n\n  getPrecedence() {\n    return this.precedence;\n  }\n\n  isConsuming(ruleMap, visitedRules = [], checkForCutParts = false) {\n    const consuming = this.parts.some((part) => {\n      const consuming = part.isConsuming(ruleMap, visitedRules, checkForCutParts);\n\n      if (consuming) {\n        return true;\n      }\n    });\n\n    return consuming;\n  }\n\n  parse(rule, frame, state, forward, back) {\n    const savedFrame = frame, ///\n          branching = state.isBranching(),\n          every = branching ?\n                    branchingEvery :\n                      linearEvery;\n\n    return every(this.parts, (part, frame, state, forward, back) => {\n      return part.parse(frame, state, forward, back);\n    }, emptyFrame, state, (frame, state, back) => {\n      const definition = this;  ///\n\n      frame = this.compose(rule, definition, savedFrame, frame, state);  ///\n\n      if (frame === null) {\n        return back();\n      }\n\n      return forward(frame, state, back);\n    }, back);\n  }\n\n  compose(rule, definition, savedFrame, frame, state) {\n    const nonTerminalNode = nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame, state);\n\n    if (nonTerminalNode !== null) {\n      const childNode = nonTerminalNode;  ///\n\n      frame = Frame.fromChildNode(childNode); ///\n\n      frame = savedFrame.merge(frame); ///\n    } else {\n      frame = null;\n    }\n\n    return frame;\n  }\n\n  asString() {\n    const partsString = partsStringFromParts(this.parts),\n          precedenceString = (this.precedence !== null) ?\n                               this.precedence.asString() :\n                                 EMPTY_STRING,\n          string = `${partsString}${precedenceString}`;\n\n    return string;\n  }\n\n  static fromParts(Class, parts) {\n    if (parts === undefined) {\n      parts = Class;  ///\n\n      Class = Definition; ///\n    }\n\n    const precedence = null,\n          definition = new Class(parts, precedence);\n\n    return definition;\n  }\n\n  static fromPartsAndPrecedence(Class, parts, precedence) {\n    if (precedence === undefined) {\n      precedence = parts; ///\n\n      parts = Class;  ///\n\n      Class = Definition; ///\n    }\n\n    const definition = new Class(parts, precedence);\n\n    return definition;\n  }\n}\n\nfunction partsStringFromParts(parts) {\n  const partsString = parts.reduce((partsString, part) => {\n    const partString = part.asString();\n\n    partsString = (partsString !== null) ?\n                    `${partsString} ${partString}` :\n                      partString; ///\n\n    return partsString;\n  }, null);\n\n  return partsString;\n}\n\nfunction nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame, state) {\n  let nonTerminalNode;\n\n  const opacity = rule.getOpacity(),\n        ruleName = rule.getName(),\n        childNodes = frame.getChildNodes(),\n        precedence = frame.getPrecedence(definition),\n        NonTerminalNode = rule.NonTerminalNodeFromRuleName(ruleName, state);\n\n  nonTerminalNode = NonTerminalNode.fromRuleNameChildNodesPrecedenceAndOpacity(ruleName, childNodes, precedence, opacity);\n\n  nonTerminalNode = nonTerminalNode.rewrite(state);\n\n  if (nonTerminalNode !== null) {\n    const invalid = nonTerminalNode.isInvalid();\n\n    if (invalid) {\n      nonTerminalNode = null;\n    }\n  }\n\n  return nonTerminalNode;\n}\n"],"names":["Definition","parts","precedence","getParts","getPrecedence","isConsuming","ruleMap","visitedRules","checkForCutParts","consuming","some","part","parse","rule","frame","state","forward","back","savedFrame","branching","isBranching","every","branchingEvery","linearEvery","emptyFrame","definition","compose","nonTerminalNode","nonTerminalNodeFromRuleDefinitionFrameAndState","childNode","Frame","fromChildNode","merge","asString","partsString","partsStringFromParts","precedenceString","EMPTY_STRING","string","fromParts","Class","undefined","fromPartsAndPrecedence","reduce","partString","opacity","getOpacity","ruleName","getName","childNodes","getChildNodes","NonTerminalNode","NonTerminalNodeFromRuleName","fromRuleNameChildNodesPrecedenceAndOpacity","rewrite","invalid","isInvalid"],"mappings":"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"}
|
package/package.json
CHANGED
package/src/definition.js
CHANGED
|
@@ -56,17 +56,16 @@ export default class Definition {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
compose(rule, definition, savedFrame, frame, state) {
|
|
59
|
-
const nonTerminalNode = nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame, state)
|
|
60
|
-
invalid = nonTerminalNode.isInvalid();
|
|
59
|
+
const nonTerminalNode = nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame, state);
|
|
61
60
|
|
|
62
|
-
if (
|
|
63
|
-
frame = null;
|
|
64
|
-
} else {
|
|
61
|
+
if (nonTerminalNode !== null) {
|
|
65
62
|
const childNode = nonTerminalNode; ///
|
|
66
63
|
|
|
67
64
|
frame = Frame.fromChildNode(childNode); ///
|
|
68
65
|
|
|
69
66
|
frame = savedFrame.merge(frame); ///
|
|
67
|
+
} else {
|
|
68
|
+
frame = null;
|
|
70
69
|
}
|
|
71
70
|
|
|
72
71
|
return frame;
|
|
@@ -137,5 +136,13 @@ function nonTerminalNodeFromRuleDefinitionFrameAndState(rule, definition, frame,
|
|
|
137
136
|
|
|
138
137
|
nonTerminalNode = nonTerminalNode.rewrite(state);
|
|
139
138
|
|
|
139
|
+
if (nonTerminalNode !== null) {
|
|
140
|
+
const invalid = nonTerminalNode.isInvalid();
|
|
141
|
+
|
|
142
|
+
if (invalid) {
|
|
143
|
+
nonTerminalNode = null;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
140
147
|
return nonTerminalNode;
|
|
141
148
|
}
|