occam-parsers 23.3.29 → 23.3.30
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/context/definition.js +2 -6
- package/lib/context/part/committedPart.js +9 -1
- package/lib/part/nonTerminal/choiceOfParts.js +4 -2
- package/lib/part/nonTerminal/optionalPart.js +7 -3
- package/lib/rule.js +5 -4
- package/lib/utilities/part.js +8 -3
- package/package.json +1 -1
- package/src/context/definition.js +3 -5
- package/src/context/part/committedPart.js +12 -0
- package/src/part/nonTerminal/choiceOfParts.js +3 -1
- package/src/part/nonTerminal/optionalPart.js +8 -3
- package/src/rule.js +5 -4
- package/src/utilities/part.js +9 -2
|
@@ -96,11 +96,7 @@ class DefinitionContext extends _context.default {
|
|
|
96
96
|
frame = _frame.default.fromChildNode(childNode);
|
|
97
97
|
} else {
|
|
98
98
|
const committed = nonTerminalNode.isCommitted();
|
|
99
|
-
|
|
100
|
-
frame = _frame.abortedFrame;
|
|
101
|
-
} else {
|
|
102
|
-
frame = _frame.nullifiedFrame;
|
|
103
|
-
}
|
|
99
|
+
frame = committed ? _frame.abortedFrame : _frame.nullifiedFrame;
|
|
104
100
|
}
|
|
105
101
|
return frame;
|
|
106
102
|
}
|
|
@@ -117,4 +113,4 @@ function nonTerminalNodeFromFrame(frame, context) {
|
|
|
117
113
|
return nonTerminalNode;
|
|
118
114
|
}
|
|
119
115
|
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250ZXh0L2RlZmluaXRpb24uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBGcmFtZSBmcm9tIFwiLi4vZnJhbWVcIjtcbmltcG9ydCBDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0XCI7XG5cbmltcG9ydCB7IGFib3J0ZWRGcmFtZSwgbnVsbGlmaWVkRnJhbWUgfSBmcm9tIFwiLi4vZnJhbWVcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgRGVmaW5pdGlvbkNvbnRleHQgZXh0ZW5kcyBDb250ZXh0IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RhdGUsIGNvbnRpbnVhdGlvbnMsIHByZWNlZGVuY2UpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdGF0ZSwgY29udGludWF0aW9ucyk7XG5cbiAgICB0aGlzLnByZWNlZGVuY2UgPSBwcmVjZWRlbmNlO1xuICB9XG5cbiAgZ2V0UHJlY2VkZW5jZShmcmFtZSkge1xuICAgIGxldCBwcmVjZWRlbmNlO1xuXG4gICAgcHJlY2VkZW5jZSA9IGZyYW1lLmdldFByZWNlZGVuY2UoKTtcblxuICAgIHByZWNlZGVuY2UgPSBwcmVjZWRlbmNlIHx8IHRoaXMucHJlY2VkZW5jZTsgLy8vXG5cbiAgICByZXR1cm4gcHJlY2VkZW5jZTtcbiAgfVxuXG4gIGdldFJ1bGUoKSB7XG4gICAgY29uc3QgY29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpLFxuICAgICAgICAgIHJ1bGVDb250ZXh0ID0gY29udGV4dCwgIC8vL1xuICAgICAgICAgIHJ1bGUgPSBydWxlQ29udGV4dC5nZXRSdWxlKCk7XG5cbiAgICByZXR1cm4gcnVsZTtcbiAgfVxuXG4gIGlzSXNvbGF0ZWQoKSB7XG4gICAgY29uc3QgaXNvbGF0ZWQgPSBmYWxzZTtcblxuICAgIHJldHVybiBpc29sYXRlZDtcbiAgfVxuXG4gIGlzQ29tbWl0dGVkKCkge1xuICAgIGNvbnN0IGNvbW1pdHRlZCA9IGZhbHNlO1xuXG4gICAgcmV0dXJuIGNvbW1pdHRlZDtcbiAgfVxuXG4gIGNvbXBvc2UoZnJhbWUpIHtcbiAgICBsZXQgY29udGV4dDtcblxuICAgIGNvbnN0IGNoaWxkTm9kZXMgPSBmcmFtZS5nZXRDaGlsZE5vZGVzKCksXG4gICAgICAgICAgcHJlY2VkZW5jZSA9IHRoaXMuZ2V0UHJlY2VkZW5jZShmcmFtZSk7XG5cbiAgICBmcmFtZSA9IEZyYW1lLmZyb21DaGlsZE5vZGVzQW5kUHJlY2VkZW5jZShjaGlsZE5vZGVzLCBwcmVjZWRlbmNlKTtcblxuICAgIGNvbnRleHQgPSB0aGlzOyAvLy9cblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IG5vblRlcm1pbmFsTm9kZUZyb21GcmFtZShmcmFtZSwgY29udGV4dCk7XG5cbiAgICBjb250ZXh0ID0gdGhpcy5nZXRDb250ZXh0KCk7XG5cbiAgICBjb25zdCBpc29sYXRlZCA9IGNvbnRleHQuaXNJc29sYXRlZCgpO1xuXG4gICAgaWYgKGlzb2xhdGVkKSB7XG4gICAgICBub25UZXJtaW5hbE5vZGUubnVsbGlmeVByZWNlZGVuY2UoKTtcbiAgICB9XG5cbiAgICBjb25zdCBwYWxhdGFibGUgPSBub25UZXJtaW5hbE5vZGUuaXNQYWxhdGFibGUoKTtcblxuICAgIGlmIChwYWxhdGFibGUpIHtcbiAgICAgIGNvbnN0IGNoaWxkTm9kZSA9IG5vblRlcm1pbmFsTm9kZTsgIC8vL1xuXG4gICAgICBmcmFtZSA9IEZyYW1lLmZyb21DaGlsZE5vZGUoY2hpbGROb2RlKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgY29tbWl0dGVkID0gbm9uVGVybWluYWxOb2RlLmlzQ29tbWl0dGVkKCk7XG5cbiAgICAgIGZyYW1lID0gY29tbWl0dGVkID9cbiAgICAgICAgICAgICAgICBhYm9ydGVkRnJhbWUgOlxuICAgICAgICAgICAgICAgICAgbnVsbGlmaWVkRnJhbWU7XG4gICAgfVxuXG4gICAgcmV0dXJuIGZyYW1lO1xuICB9XG5cbiAgc3RhdGljIGZyb21EZWZpbml0aW9uKGRlZmluaXRpb24sIGNvbnRleHQpIHtcbiAgICBjb25zdCBwcmVjZWRlbmNlID0gZGVmaW5pdGlvbi5nZXRQcmVjZWRlbmNlKCksXG4gICAgICAgICAgZGVmaW5pdGlvbkNvbnRleHQgPSBDb250ZXh0LmZyb21Ob3RoaW5nKERlZmluaXRpb25Db250ZXh0LCBwcmVjZWRlbmNlLCBjb250ZXh0KTtcblxuICAgIHJldHVybiBkZWZpbml0aW9uQ29udGV4dDtcbiAgfVxufVxuXG5mdW5jdGlvbiBub25UZXJtaW5hbE5vZGVGcm9tRnJhbWUoZnJhbWUsIGNvbnRleHQpIHtcbiAgbGV0IG5vblRlcm1pbmFsTm9kZTtcblxuICBjb25zdCBydWxlID0gY29udGV4dC5nZXRSdWxlKCksXG4gICAgICAgIG9wYWNpdHkgPSBydWxlLmdldE9wYWNpdHkoKSxcbiAgICAgICAgcnVsZU5hbWUgPSBydWxlLmdldE5hbWUoKSxcbiAgICAgICAgY2hpbGROb2RlcyA9IGZyYW1lLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgcHJlY2VkZW5jZSA9IGZyYW1lLmdldFByZWNlZGVuY2UoKSxcbiAgICAgICAgTm9uVGVybWluYWxOb2RlID0gcnVsZS5Ob25UZXJtaW5hbE5vZGVGcm9tUnVsZU5hbWUocnVsZU5hbWUsIGNvbnRleHQpO1xuXG4gIG5vblRlcm1pbmFsTm9kZSA9IE5vblRlcm1pbmFsTm9kZS5mcm9tUnVsZU5hbWVDaGlsZE5vZGVzT3BhY2l0eUFuZFByZWNlZGVuY2UocnVsZU5hbWUsIGNoaWxkTm9kZXMsIG9wYWNpdHksIHByZWNlZGVuY2UpO1xuXG4gIG5vblRlcm1pbmFsTm9kZSA9IG5vblRlcm1pbmFsTm9kZS5yZXdyaXRlKGNvbnRleHQpOyAgLy8vXG5cbiAgcmV0dXJuIG5vblRlcm1pbmFsTm9kZTtcbn1cbiJdLCJuYW1lcyI6WyJEZWZpbml0aW9uQ29udGV4dCIsIkNvbnRleHQiLCJjb250ZXh0Iiwic3RhdGUiLCJjb250aW51YXRpb25zIiwicHJlY2VkZW5jZSIsImdldFByZWNlZGVuY2UiLCJmcmFtZSIsImdldFJ1bGUiLCJnZXRDb250ZXh0IiwicnVsZUNvbnRleHQiLCJydWxlIiwiaXNJc29sYXRlZCIsImlzb2xhdGVkIiwiaXNDb21taXR0ZWQiLCJjb21taXR0ZWQiLCJjb21wb3NlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJGcmFtZSIsImZyb21DaGlsZE5vZGVzQW5kUHJlY2VkZW5jZSIsIm5vblRlcm1pbmFsTm9kZSIsIm5vblRlcm1pbmFsTm9kZUZyb21GcmFtZSIsIm51bGxpZnlQcmVjZWRlbmNlIiwicGFsYXRhYmxlIiwiaXNQYWxhdGFibGUiLCJjaGlsZE5vZGUiLCJmcm9tQ2hpbGROb2RlIiwiYWJvcnRlZEZyYW1lIiwibnVsbGlmaWVkRnJhbWUiLCJmcm9tRGVmaW5pdGlvbiIsImRlZmluaXRpb24iLCJkZWZpbml0aW9uQ29udGV4dCIsImZyb21Ob3RoaW5nIiwib3BhY2l0eSIsImdldE9wYWNpdHkiLCJydWxlTmFtZSIsImdldE5hbWUiLCJOb25UZXJtaW5hbE5vZGUiLCJOb25UZXJtaW5hbE5vZGVGcm9tUnVsZU5hbWUiLCJmcm9tUnVsZU5hbWVDaGlsZE5vZGVzT3BhY2l0eUFuZFByZWNlZGVuY2UiLCJyZXdyaXRlIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXFCQTs7OytEQUxIO2dFQUNFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUlMLE1BQU1BLDBCQUEwQkMsZ0JBQU87SUFDcEQsWUFBWUMsT0FBTyxFQUFFQyxLQUFLLEVBQUVDLGFBQWEsRUFBRUMsVUFBVSxDQUFFO1FBQ3JELEtBQUssQ0FBQ0gsU0FBU0MsT0FBT0M7UUFFdEIsSUFBSSxDQUFDQyxVQUFVLEdBQUdBO0lBQ3BCO0lBRUFDLGNBQWNDLEtBQUssRUFBRTtRQUNuQixJQUFJRjtRQUVKQSxhQUFhRSxNQUFNRCxhQUFhO1FBRWhDRCxhQUFhQSxjQUFjLElBQUksQ0FBQ0EsVUFBVSxFQUFFLEdBQUc7UUFFL0MsT0FBT0E7SUFDVDtJQUVBRyxVQUFVO1FBQ1IsTUFBTU4sVUFBVSxJQUFJLENBQUNPLFVBQVUsSUFDekJDLGNBQWNSLFNBQ2RTLE9BQU9ELFlBQVlGLE9BQU87UUFFaEMsT0FBT0c7SUFDVDtJQUVBQyxhQUFhO1FBQ1gsTUFBTUMsV0FBVztRQUVqQixPQUFPQTtJQUNUO0lBRUFDLGNBQWM7UUFDWixNQUFNQyxZQUFZO1FBRWxCLE9BQU9BO0lBQ1Q7SUFFQUMsUUFBUVQsS0FBSyxFQUFFO1FBQ2IsSUFBSUw7UUFFSixNQUFNZSxhQUFhVixNQUFNVyxhQUFhLElBQ2hDYixhQUFhLElBQUksQ0FBQ0MsYUFBYSxDQUFDQztRQUV0Q0EsUUFBUVksY0FBSyxDQUFDQywyQkFBMkIsQ0FBQ0gsWUFBWVo7UUFFdERILFVBQVUsSUFBSSxFQUFFLEdBQUc7UUFFbkIsTUFBTW1CLGtCQUFrQkMseUJBQXlCZixPQUFPTDtRQUV4REEsVUFBVSxJQUFJLENBQUNPLFVBQVU7UUFFekIsTUFBTUksV0FBV1gsUUFBUVUsVUFBVTtRQUVuQyxJQUFJQyxVQUFVO1lBQ1pRLGdCQUFnQkUsaUJBQWlCO1FBQ25DO1FBRUEsTUFBTUMsWUFBWUgsZ0JBQWdCSSxXQUFXO1FBRTdDLElBQUlELFdBQVc7WUFDYixNQUFNRSxZQUFZTCxpQkFBa0IsR0FBRztZQUV2Q2QsUUFBUVksY0FBSyxDQUFDUSxhQUFhLENBQUNEO1FBQzlCLE9BQU87WUFDTCxNQUFNWCxZQUFZTSxnQkFBZ0JQLFdBQVc7WUFFN0NQLFFBQVFRLFlBQ0VhLG1CQUFZLEdBQ1ZDLHFCQUFjO1FBQzVCO1FBRUEsT0FBT3RCO0lBQ1Q7SUFFQSxPQUFPdUIsZUFBZUMsVUFBVSxFQUFFN0IsT0FBTyxFQUFFO1FBQ3pDLE1BQU1HLGFBQWEwQixXQUFXekIsYUFBYSxJQUNyQzBCLG9CQUFvQi9CLGdCQUFPLENBQUNnQyxXQUFXLENBQUNqQyxtQkFBbUJLLFlBQVlIO1FBRTdFLE9BQU84QjtJQUNUO0FBQ0Y7QUFFQSxTQUFTVix5QkFBeUJmLEtBQUssRUFBRUwsT0FBTztJQUM5QyxJQUFJbUI7SUFFSixNQUFNVixPQUFPVCxRQUFRTSxPQUFPLElBQ3RCMEIsVUFBVXZCLEtBQUt3QixVQUFVLElBQ3pCQyxXQUFXekIsS0FBSzBCLE9BQU8sSUFDdkJwQixhQUFhVixNQUFNVyxhQUFhLElBQ2hDYixhQUFhRSxNQUFNRCxhQUFhLElBQ2hDZ0Msa0JBQWtCM0IsS0FBSzRCLDJCQUEyQixDQUFDSCxVQUFVbEM7SUFFbkVtQixrQkFBa0JpQixnQkFBZ0JFLDBDQUEwQyxDQUFDSixVQUFVbkIsWUFBWWlCLFNBQVM3QjtJQUU1R2dCLGtCQUFrQkEsZ0JBQWdCb0IsT0FBTyxDQUFDdkMsVUFBVyxHQUFHO0lBRXhELE9BQU9tQjtBQUNUIn0=
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _context = /*#__PURE__*/ _interop_require_default(require("../../context"));
|
|
12
|
+
const _frame = require("../../frame");
|
|
12
13
|
function _interop_require_default(obj) {
|
|
13
14
|
return obj && obj.__esModule ? obj : {
|
|
14
15
|
default: obj
|
|
@@ -19,6 +20,13 @@ class CommittedPartPartContext extends _context.default {
|
|
|
19
20
|
const committed = true;
|
|
20
21
|
return committed;
|
|
21
22
|
}
|
|
23
|
+
compose(frame, partFrame = _frame.nullifiedFrame) {
|
|
24
|
+
const partFrameValid = partFrame.isValid();
|
|
25
|
+
if (partFrameValid) {
|
|
26
|
+
frame = frame.merge(partFrame);
|
|
27
|
+
}
|
|
28
|
+
return frame;
|
|
29
|
+
}
|
|
22
30
|
continued(frame, context) {
|
|
23
31
|
frame = this.compose(frame);
|
|
24
32
|
const frameValid = frame.isValid();
|
|
@@ -32,4 +40,4 @@ class CommittedPartPartContext extends _context.default {
|
|
|
32
40
|
}
|
|
33
41
|
}
|
|
34
42
|
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250ZXh0L3BhcnQvY29tbWl0dGVkUGFydC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IENvbnRleHQgZnJvbSBcIi4uLy4uL2NvbnRleHRcIjtcblxuaW1wb3J0IHsgbnVsbGlmaWVkRnJhbWUgfSBmcm9tIFwiLi4vLi4vZnJhbWVcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQ29tbWl0dGVkUGFydFBhcnRDb250ZXh0IGV4dGVuZHMgQ29udGV4dCB7XG4gIGlzQ29tbWl0dGVkKCkge1xuICAgIGNvbnN0IGNvbW1pdHRlZCA9IHRydWU7XG5cbiAgICByZXR1cm4gY29tbWl0dGVkO1xuICB9XG5cbiAgY29tcG9zZShmcmFtZSwgcGFydEZyYW1lID0gbnVsbGlmaWVkRnJhbWUpIHtcbiAgICBjb25zdCBwYXJ0RnJhbWVWYWxpZCA9IHBhcnRGcmFtZS5pc1ZhbGlkKCk7XG5cbiAgICBpZiAocGFydEZyYW1lVmFsaWQpIHtcbiAgICAgIGZyYW1lID0gZnJhbWUubWVyZ2UocGFydEZyYW1lKTtcbiAgICB9XG5cbiAgICByZXR1cm4gZnJhbWU7XG4gIH1cblxuICBjb250aW51ZWQoZnJhbWUsIGNvbnRleHQpIHtcbiAgICBmcmFtZSA9IHRoaXMuY29tcG9zZShmcmFtZSk7XG5cbiAgICBjb25zdCBmcmFtZVZhbGlkID0gZnJhbWUuaXNWYWxpZCgpO1xuXG4gICAgaWYgKGZyYW1lVmFsaWQpIHtcbiAgICAgIGNvbnRleHQuY29tbWl0KHRoaXMpO1xuICAgIH1cblxuICAgIHJldHVybiBmcmFtZTtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tTm90aGluZyhjb250ZXh0KSB7XG4gICAgcmV0dXJuIENvbnRleHQuZnJvbU5vdGhpbmcoQ29tbWl0dGVkUGFydFBhcnRDb250ZXh0LCBjb250ZXh0KTtcbiAgfVxufSJdLCJuYW1lcyI6WyJDb21taXR0ZWRQYXJ0UGFydENvbnRleHQiLCJDb250ZXh0IiwiaXNDb21taXR0ZWQiLCJjb21taXR0ZWQiLCJjb21wb3NlIiwiZnJhbWUiLCJwYXJ0RnJhbWUiLCJudWxsaWZpZWRGcmFtZSIsInBhcnRGcmFtZVZhbGlkIiwiaXNWYWxpZCIsIm1lcmdlIiwiY29udGludWVkIiwiY29udGV4dCIsImZyYW1lVmFsaWQiLCJjb21taXQiLCJmcm9tTm90aGluZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBTUE7OztlQUFxQkE7OztnRUFKRDt1QkFFVzs7Ozs7O0FBRWhCLE1BQU1BLGlDQUFpQ0MsZ0JBQU87SUFDM0RDLGNBQWM7UUFDWixNQUFNQyxZQUFZO1FBRWxCLE9BQU9BO0lBQ1Q7SUFFQUMsUUFBUUMsS0FBSyxFQUFFQyxZQUFZQyxxQkFBYyxFQUFFO1FBQ3pDLE1BQU1DLGlCQUFpQkYsVUFBVUcsT0FBTztRQUV4QyxJQUFJRCxnQkFBZ0I7WUFDbEJILFFBQVFBLE1BQU1LLEtBQUssQ0FBQ0o7UUFDdEI7UUFFQSxPQUFPRDtJQUNUO0lBRUFNLFVBQVVOLEtBQUssRUFBRU8sT0FBTyxFQUFFO1FBQ3hCUCxRQUFRLElBQUksQ0FBQ0QsT0FBTyxDQUFDQztRQUVyQixNQUFNUSxhQUFhUixNQUFNSSxPQUFPO1FBRWhDLElBQUlJLFlBQVk7WUFDZEQsUUFBUUUsTUFBTSxDQUFDLElBQUk7UUFDckI7UUFFQSxPQUFPVDtJQUNUO0lBRUEsT0FBT1UsWUFBWUgsT0FBTyxFQUFFO1FBQzFCLE9BQU9YLGdCQUFPLENBQUNjLFdBQVcsQ0FBQ2YsMEJBQTBCWTtJQUN2RDtBQUNGIn0=
|
|
@@ -42,7 +42,9 @@ class ChoiceOfPartsPart extends _nonTerminal.default {
|
|
|
42
42
|
frame = partChoice.parse(frame, context);
|
|
43
43
|
} else {
|
|
44
44
|
const partFrame = partChoice.parse(_frame.emptyFrame, context), partFrameValid = partFrame.isValid(), partFrameAborted = partFrame.isAborted();
|
|
45
|
-
if (
|
|
45
|
+
if (false) {
|
|
46
|
+
///
|
|
47
|
+
} else if (partFrameValid) {
|
|
46
48
|
frame = context.compose(frame, partFrame);
|
|
47
49
|
} else if (partFrameAborted) {
|
|
48
50
|
frame = partFrame; ///
|
|
@@ -80,4 +82,4 @@ class ChoiceOfPartsPart extends _nonTerminal.default {
|
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
84
|
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wYXJ0L25vblRlcm1pbmFsL2Nob2ljZU9mUGFydHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBOb25UZXJtaW5hbFBhcnQgZnJvbSBcIi4uLy4uL3BhcnQvbm9uVGVybWluYWxcIjtcblxuaW1wb3J0IHsgcGFydENvbnRleHQgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL2NvbnRleHRcIjtcbmltcG9ydCB7IENob2ljZU9mUGFydHNQYXJ0VHlwZSB9IGZyb20gXCIuLi8uLi9wYXJ0VHlwZXNcIjtcbmltcG9ydCB7IGVtcHR5RnJhbWUsIG51bGxpZmllZEZyYW1lIH0gZnJvbSBcIi4uLy4uL2ZyYW1lXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENob2ljZU9mUGFydHNQYXJ0IGV4dGVuZHMgTm9uVGVybWluYWxQYXJ0IHtcbiAgY29uc3RydWN0b3IodHlwZSwgY29udGludWF0aW9uLCBwYXJ0Q2hvaWNlcykge1xuICAgIHN1cGVyKHR5cGUsIGNvbnRpbnVhdGlvbik7XG4gICAgXG4gICAgdGhpcy5wYXJ0Q2hvaWNlcyA9IHBhcnRDaG9pY2VzO1xuICB9XG4gIFxuICBnZXRQYXJ0Q2hvaWNlcygpIHtcbiAgICByZXR1cm4gdGhpcy5wYXJ0Q2hvaWNlcztcbiAgfVxuXG4gIGdldFBhcnRzKCkge1xuICAgIGNvbnN0IHBhcnRzID0gdGhpcy5wYXJ0Q2hvaWNlcy5tYXAoKHBhcnRDaG9pY2UpID0+IHtcbiAgICAgIGNvbnN0IHBhcnQgPSBwYXJ0Q2hvaWNlLmdldFBhcnQoKTtcblxuICAgICAgcmV0dXJuIHBhcnQ7XG4gICAgfSk7XG5cbiAgICByZXR1cm4gcGFydHM7XG4gIH1cblxuICBwYXJzZShmcmFtZSwgY29udGV4dCkge1xuICAgIGNvbnN0IHBhcnQgPSB0aGlzOyAgLy8vXG5cbiAgICBwYXJ0Q29udGV4dCgoY29udGV4dCkgPT4ge1xuICAgICAgY29uc3QgY29udGludWluZyA9IGNvbnRleHQuaXNDb250aW51aW5nKCksXG4gICAgICAgICAgICBzYXZlZEZyYW1lID0gZnJhbWU7IC8vL1xuXG4gICAgICB0aGlzLnBhcnRDaG9pY2VzLnNvbWUoKHBhcnRDaG9pY2UpID0+
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wYXJ0L25vblRlcm1pbmFsL2Nob2ljZU9mUGFydHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBOb25UZXJtaW5hbFBhcnQgZnJvbSBcIi4uLy4uL3BhcnQvbm9uVGVybWluYWxcIjtcblxuaW1wb3J0IHsgcGFydENvbnRleHQgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL2NvbnRleHRcIjtcbmltcG9ydCB7IENob2ljZU9mUGFydHNQYXJ0VHlwZSB9IGZyb20gXCIuLi8uLi9wYXJ0VHlwZXNcIjtcbmltcG9ydCB7IGVtcHR5RnJhbWUsIG51bGxpZmllZEZyYW1lIH0gZnJvbSBcIi4uLy4uL2ZyYW1lXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENob2ljZU9mUGFydHNQYXJ0IGV4dGVuZHMgTm9uVGVybWluYWxQYXJ0IHtcbiAgY29uc3RydWN0b3IodHlwZSwgY29udGludWF0aW9uLCBwYXJ0Q2hvaWNlcykge1xuICAgIHN1cGVyKHR5cGUsIGNvbnRpbnVhdGlvbik7XG4gICAgXG4gICAgdGhpcy5wYXJ0Q2hvaWNlcyA9IHBhcnRDaG9pY2VzO1xuICB9XG4gIFxuICBnZXRQYXJ0Q2hvaWNlcygpIHtcbiAgICByZXR1cm4gdGhpcy5wYXJ0Q2hvaWNlcztcbiAgfVxuXG4gIGdldFBhcnRzKCkge1xuICAgIGNvbnN0IHBhcnRzID0gdGhpcy5wYXJ0Q2hvaWNlcy5tYXAoKHBhcnRDaG9pY2UpID0+IHtcbiAgICAgIGNvbnN0IHBhcnQgPSBwYXJ0Q2hvaWNlLmdldFBhcnQoKTtcblxuICAgICAgcmV0dXJuIHBhcnQ7XG4gICAgfSk7XG5cbiAgICByZXR1cm4gcGFydHM7XG4gIH1cblxuICBwYXJzZShmcmFtZSwgY29udGV4dCkge1xuICAgIGNvbnN0IHBhcnQgPSB0aGlzOyAgLy8vXG5cbiAgICBwYXJ0Q29udGV4dCgoY29udGV4dCkgPT4ge1xuICAgICAgY29uc3QgY29udGludWluZyA9IGNvbnRleHQuaXNDb250aW51aW5nKCksXG4gICAgICAgICAgICBzYXZlZEZyYW1lID0gZnJhbWU7IC8vL1xuXG4gICAgICB0aGlzLnBhcnRDaG9pY2VzLnNvbWUoKHBhcnRDaG9pY2UpID0+IHtcbiAgICAgICAgZnJhbWUgPSBzYXZlZEZyYW1lOyAvLy9cblxuICAgICAgICBpZiAoY29udGludWluZykge1xuICAgICAgICAgIGZyYW1lID0gcGFydENob2ljZS5wYXJzZShmcmFtZSwgY29udGV4dCk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgY29uc3QgcGFydEZyYW1lID0gcGFydENob2ljZS5wYXJzZShlbXB0eUZyYW1lLCBjb250ZXh0KSxcbiAgICAgICAgICAgICAgICBwYXJ0RnJhbWVWYWxpZCA9IHBhcnRGcmFtZS5pc1ZhbGlkKCksXG4gICAgICAgICAgICAgICAgcGFydEZyYW1lQWJvcnRlZCA9IHBhcnRGcmFtZS5pc0Fib3J0ZWQoKTtcblxuICAgICAgICAgIGlmIChmYWxzZSkge1xuICAgICAgICAgICAgLy8vXG4gICAgICAgICAgfSBlbHNlIGlmIChwYXJ0RnJhbWVWYWxpZCkge1xuICAgICAgICAgICAgZnJhbWUgPSBjb250ZXh0LmNvbXBvc2UoZnJhbWUsIHBhcnRGcmFtZSk7XG4gICAgICAgICAgfSBlbHNlIGlmIChwYXJ0RnJhbWVBYm9ydGVkKSB7XG4gICAgICAgICAgICBmcmFtZSA9IHBhcnRGcmFtZTsgLy8vXG4gICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgIGZyYW1lID0gbnVsbGlmaWVkRnJhbWU7XG4gICAgICAgICAgfVxuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgZnJhbWVWYWxpZCA9IGZyYW1lLmlzVmFsaWQoKSxcbiAgICAgICAgICAgICAgZnJhbWVBYm9ydGVkID0gZnJhbWUuaXNBYm9ydGVkKCk7XG5cbiAgICAgICAgaWYgKGZyYW1lVmFsaWQgfHwgZnJhbWVBYm9ydGVkKSB7XG4gICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuXG4gICAgICBjb25zdCBmcmFtZVZhbGlkID0gZnJhbWUuaXNWYWxpZCgpO1xuXG4gICAgICBpZiAoZnJhbWVWYWxpZCkge1xuICAgICAgICBjb250ZXh0LmNvbW1pdCgpO1xuICAgICAgfVxuICAgIH0sIHBhcnQsIGNvbnRleHQpO1xuXG4gICAgcmV0dXJuIGZyYW1lO1xuICB9XG5cbiAgYXNTdHJpbmcoKSB7XG4gICAgY29uc3QgcGFydENob2ljZXNTdHJpbmcgPSB0aGlzLnBhcnRDaG9pY2VzLnJlZHVjZSgocGFydENob2ljZXNTdHJpbmcsIHBhcnRDaG9pY2UpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHBhcnRDaG9pY2VTdHJpbmcgPSBwYXJ0Q2hvaWNlLmFzU3RyaW5nKCk7XG4gICAgXG4gICAgICAgICAgICBpZiAocGFydENob2ljZXNTdHJpbmcgPT09IG51bGwpIHtcbiAgICAgICAgICAgICAgcGFydENob2ljZXNTdHJpbmcgPSBwYXJ0Q2hvaWNlU3RyaW5nO1xuICAgICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgICAgcGFydENob2ljZXNTdHJpbmcgPSBgJHtwYXJ0Q2hvaWNlc1N0cmluZ30gfCAke3BhcnRDaG9pY2VTdHJpbmd9YDtcbiAgICAgICAgICAgIH1cbiAgICBcbiAgICAgICAgICAgIHJldHVybiBwYXJ0Q2hvaWNlc1N0cmluZztcbiAgICAgICAgICB9LCBudWxsKSxcbiAgICAgICAgICBzdHJpbmcgPSBgKCAke3BhcnRDaG9pY2VzU3RyaW5nfSApYDtcbiAgICBcbiAgICByZXR1cm4gc3RyaW5nO1xuICB9XG5cbiAgc3RhdGljIGZyb21QYXJ0Q2hvaWNlcyhwYXJ0Q2hvaWNlcykge1xuICAgIGNvbnN0IHR5cGUgPSBDaG9pY2VPZlBhcnRzUGFydFR5cGUsXG4gICAgICAgICAgY29udGludWF0aW9uID0gZmFsc2UsXG4gICAgICAgICAgY2hvaWNlT2ZQYXJ0c1BhcnQgPSBuZXcgQ2hvaWNlT2ZQYXJ0c1BhcnQodHlwZSwgY29udGludWF0aW9uLCBwYXJ0Q2hvaWNlcyk7XG5cbiAgICByZXR1cm4gY2hvaWNlT2ZQYXJ0c1BhcnQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJDaG9pY2VPZlBhcnRzUGFydCIsIk5vblRlcm1pbmFsUGFydCIsInR5cGUiLCJjb250aW51YXRpb24iLCJwYXJ0Q2hvaWNlcyIsImdldFBhcnRDaG9pY2VzIiwiZ2V0UGFydHMiLCJwYXJ0cyIsIm1hcCIsInBhcnRDaG9pY2UiLCJwYXJ0IiwiZ2V0UGFydCIsInBhcnNlIiwiZnJhbWUiLCJjb250ZXh0IiwicGFydENvbnRleHQiLCJjb250aW51aW5nIiwiaXNDb250aW51aW5nIiwic2F2ZWRGcmFtZSIsInNvbWUiLCJwYXJ0RnJhbWUiLCJlbXB0eUZyYW1lIiwicGFydEZyYW1lVmFsaWQiLCJpc1ZhbGlkIiwicGFydEZyYW1lQWJvcnRlZCIsImlzQWJvcnRlZCIsImNvbXBvc2UiLCJudWxsaWZpZWRGcmFtZSIsImZyYW1lVmFsaWQiLCJmcmFtZUFib3J0ZWQiLCJjb21taXQiLCJhc1N0cmluZyIsInBhcnRDaG9pY2VzU3RyaW5nIiwicmVkdWNlIiwicGFydENob2ljZVN0cmluZyIsInN0cmluZyIsImZyb21QYXJ0Q2hvaWNlcyIsIkNob2ljZU9mUGFydHNQYXJ0VHlwZSIsImNob2ljZU9mUGFydHNQYXJ0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFRQTs7O2VBQXFCQTs7O29FQU5PO3lCQUVBOzJCQUNVO3VCQUNLOzs7Ozs7QUFFNUIsTUFBTUEsMEJBQTBCQyxvQkFBZTtJQUM1RCxZQUFZQyxJQUFJLEVBQUVDLFlBQVksRUFBRUMsV0FBVyxDQUFFO1FBQzNDLEtBQUssQ0FBQ0YsTUFBTUM7UUFFWixJQUFJLENBQUNDLFdBQVcsR0FBR0E7SUFDckI7SUFFQUMsaUJBQWlCO1FBQ2YsT0FBTyxJQUFJLENBQUNELFdBQVc7SUFDekI7SUFFQUUsV0FBVztRQUNULE1BQU1DLFFBQVEsSUFBSSxDQUFDSCxXQUFXLENBQUNJLEdBQUcsQ0FBQyxDQUFDQztZQUNsQyxNQUFNQyxPQUFPRCxXQUFXRSxPQUFPO1lBRS9CLE9BQU9EO1FBQ1Q7UUFFQSxPQUFPSDtJQUNUO0lBRUFLLE1BQU1DLEtBQUssRUFBRUMsT0FBTyxFQUFFO1FBQ3BCLE1BQU1KLE9BQU8sSUFBSSxFQUFHLEdBQUc7UUFFdkJLLElBQUFBLG9CQUFXLEVBQUMsQ0FBQ0Q7WUFDWCxNQUFNRSxhQUFhRixRQUFRRyxZQUFZLElBQ2pDQyxhQUFhTCxPQUFPLEdBQUc7WUFFN0IsSUFBSSxDQUFDVCxXQUFXLENBQUNlLElBQUksQ0FBQyxDQUFDVjtnQkFDckJJLFFBQVFLLFlBQVksR0FBRztnQkFFdkIsSUFBSUYsWUFBWTtvQkFDZEgsUUFBUUosV0FBV0csS0FBSyxDQUFDQyxPQUFPQztnQkFDbEMsT0FBTztvQkFDTCxNQUFNTSxZQUFZWCxXQUFXRyxLQUFLLENBQUNTLGlCQUFVLEVBQUVQLFVBQ3pDUSxpQkFBaUJGLFVBQVVHLE9BQU8sSUFDbENDLG1CQUFtQkosVUFBVUssU0FBUztvQkFFNUMsSUFBSSxPQUFPO29CQUNULEdBQUc7b0JBQ0wsT0FBTyxJQUFJSCxnQkFBZ0I7d0JBQ3pCVCxRQUFRQyxRQUFRWSxPQUFPLENBQUNiLE9BQU9PO29CQUNqQyxPQUFPLElBQUlJLGtCQUFrQjt3QkFDM0JYLFFBQVFPLFdBQVcsR0FBRztvQkFDeEIsT0FBTzt3QkFDTFAsUUFBUWMscUJBQWM7b0JBQ3hCO2dCQUNGO2dCQUVBLE1BQU1DLGFBQWFmLE1BQU1VLE9BQU8sSUFDMUJNLGVBQWVoQixNQUFNWSxTQUFTO2dCQUVwQyxJQUFJRyxjQUFjQyxjQUFjO29CQUM5QixPQUFPO2dCQUNUO1lBQ0Y7WUFFQSxNQUFNRCxhQUFhZixNQUFNVSxPQUFPO1lBRWhDLElBQUlLLFlBQVk7Z0JBQ2RkLFFBQVFnQixNQUFNO1lBQ2hCO1FBQ0YsR0FBR3BCLE1BQU1JO1FBRVQsT0FBT0Q7SUFDVDtJQUVBa0IsV0FBVztRQUNULE1BQU1DLG9CQUFvQixJQUFJLENBQUM1QixXQUFXLENBQUM2QixNQUFNLENBQUMsQ0FBQ0QsbUJBQW1CdkI7WUFDOUQsTUFBTXlCLG1CQUFtQnpCLFdBQVdzQixRQUFRO1lBRTVDLElBQUlDLHNCQUFzQixNQUFNO2dCQUM5QkEsb0JBQW9CRTtZQUN0QixPQUFPO2dCQUNMRixvQkFBb0IsR0FBR0Esa0JBQWtCLEdBQUcsRUFBRUUsa0JBQWtCO1lBQ2xFO1lBRUEsT0FBT0Y7UUFDVCxHQUFHLE9BQ0hHLFNBQVMsQ0FBQyxFQUFFLEVBQUVILGtCQUFrQixFQUFFLENBQUM7UUFFekMsT0FBT0c7SUFDVDtJQUVBLE9BQU9DLGdCQUFnQmhDLFdBQVcsRUFBRTtRQUNsQyxNQUFNRixPQUFPbUMsZ0NBQXFCLEVBQzVCbEMsZUFBZSxPQUNmbUMsb0JBQW9CLElBQUl0QyxrQkFBa0JFLE1BQU1DLGNBQWNDO1FBRXBFLE9BQU9rQztJQUNUO0FBQ0YifQ==
|
|
@@ -34,8 +34,12 @@ class OptionalPartPart extends _nonTerminal.default {
|
|
|
34
34
|
if (continuing) {
|
|
35
35
|
const savedFrame = frame; ///
|
|
36
36
|
frame = this.part.parse(frame, context);
|
|
37
|
-
const
|
|
38
|
-
if (
|
|
37
|
+
const frameAborted = frame.isAborted(), frameNullified = frame.isNullified();
|
|
38
|
+
if (false) {
|
|
39
|
+
///
|
|
40
|
+
} else if (frameAborted) {
|
|
41
|
+
frame = _frame.nullifiedFrame;
|
|
42
|
+
} else if (frameNullified) {
|
|
39
43
|
frame = savedFrame; ///
|
|
40
44
|
frame = context.continue(frame);
|
|
41
45
|
}
|
|
@@ -67,4 +71,4 @@ class OptionalPartPart extends _nonTerminal.default {
|
|
|
67
71
|
}
|
|
68
72
|
}
|
|
69
73
|
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wYXJ0L25vblRlcm1pbmFsL29wdGlvbmFsUGFydC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgc3BlY2lhbFN5bWJvbHMgfSBmcm9tIFwib2NjYW0tbGV4ZXJzXCI7XG5cbmltcG9ydCBOb25UZXJtaW5hbFBhcnQgZnJvbSBcIi4uLy4uL3BhcnQvbm9uVGVybWluYWxcIjtcblxuaW1wb3J0IHsgcGFydENvbnRleHQgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL2NvbnRleHRcIjtcbmltcG9ydCB7IE9wdGlvbmFsUGFydFBhcnRUeXBlIH0gZnJvbSBcIi4uLy4uL3BhcnRUeXBlc1wiO1xuaW1wb3J0IHsgZW1wdHlGcmFtZSwgbnVsbGlmaWVkRnJhbWUgfSBmcm9tIFwiLi4vLi4vZnJhbWVcIjtcblxuY29uc3QgeyBxdWVzdGlvbk1hcmsgfSA9IHNwZWNpYWxTeW1ib2xzO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBPcHRpb25hbFBhcnRQYXJ0IGV4dGVuZHMgTm9uVGVybWluYWxQYXJ0IHtcbiAgY29uc3RydWN0b3IodHlwZSwgY29udGludWF0aW9uLCBwYXJ0KSB7XG4gICAgc3VwZXIodHlwZSwgY29udGludWF0aW9uKTtcblxuICAgIHRoaXMucGFydCA9IHBhcnQ7XG4gIH1cblxuICBnZXRQYXJ0KCkge1xuICAgIHJldHVybiB0aGlzLnBhcnQ7XG4gIH1cblxuICBwYXJzZShmcmFtZSwgY29udGV4dCkge1xuICAgIGNvbnN0IHBhcnQgPSB0aGlzOyAgLy8vXG5cbiAgICBwYXJ0Q29udGV4dCgoY29udGV4dCkgPT4ge1xuICAgICAgY29uc3QgY29udGludWluZyA9IGNvbnRleHQuaXNDb250aW51aW5nKCk7XG5cbiAgICAgIGlmIChjb250aW51aW5nKSB7XG4gICAgICAgIGNvbnN0IHNhdmVkRnJhbWUgPSBmcmFtZTsgLy8vXG5cbiAgICAgICAgZnJhbWUgPSB0aGlzLnBhcnQucGFyc2UoZnJhbWUsIGNvbnRleHQpO1xuXG4gICAgICAgIGNvbnN0IGZyYW1lQWJvcnRlZCA9IGZyYW1lLmlzQWJvcnRlZCgpLFxuICAgICAgICAgICAgICBmcmFtZU51bGxpZmllZCA9IGZyYW1lLmlzTnVsbGlmaWVkKCk7XG5cbiAgICAgICAgaWYgKGZhbHNlKSB7XG4gICAgICAgICAgLy8vXG4gICAgICAgIH0gZWxzZSBpZiAoZnJhbWVBYm9ydGVkKSB7XG4gICAgICAgICAgZnJhbWUgPSBudWxsaWZpZWRGcmFtZTtcbiAgICAgICAgfSBlbHNlIGlmIChmcmFtZU51bGxpZmllZCkge1xuICAgICAgICAgIGZyYW1lID0gc2F2ZWRGcmFtZTsgLy8vXG5cbiAgICAgICAgICBmcmFtZSA9IGNvbnRleHQuY29udGludWUoZnJhbWUpO1xuICAgICAgICB9XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBsZXQgcGFydEZyYW1lO1xuXG4gICAgICAgIHBhcnRGcmFtZSA9IGVtcHR5RnJhbWU7IC8vL1xuXG4gICAgICAgIHBhcnRGcmFtZSA9IHRoaXMucGFydC5wYXJzZShwYXJ0RnJhbWUsIGNvbnRleHQpO1xuXG4gICAgICAgIGNvbnN0IHBhcnRGcmFtZUludmFsaWQgPSBwYXJ0RnJhbWUuaXNJbnZhbGlkKCk7XG5cbiAgICAgICAgaWYgKHBhcnRGcmFtZUludmFsaWQpIHtcbiAgICAgICAgICBwYXJ0RnJhbWUgPSBlbXB0eUZyYW1lOyAvLy9cbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IHBhcnRGcmFtZVZhbGlkID0gcGFydEZyYW1lLmlzVmFsaWQoKTtcblxuICAgICAgICBmcmFtZSA9IHBhcnRGcmFtZVZhbGlkID9cbiAgICAgICAgICAgICAgICAgIGNvbnRleHQuY29tcG9zZShmcmFtZSwgcGFydEZyYW1lKSA6XG4gICAgICAgICAgICAgICAgICAgIG51bGxpZmllZEZyYW1lO1xuICAgICAgfVxuXG4gICAgICBjb25zdCBmcmFtZVZhbGlkID0gZnJhbWUuaXNWYWxpZCgpO1xuXG4gICAgICBpZiAoZnJhbWVWYWxpZCkge1xuICAgICAgICBjb250ZXh0LmNvbW1pdCgpO1xuICAgICAgfVxuICAgIH0sIHBhcnQsIGNvbnRleHQpO1xuXG4gICAgcmV0dXJuIGZyYW1lO1xuICB9XG5cbiAgYXNTdHJpbmcoKSB7XG4gICAgY29uc3QgcGFydFN0cmluZyA9IHRoaXMucGFydC5hc1N0cmluZygpLFxuICAgICAgICAgIHN0cmluZyA9IGAke3BhcnRTdHJpbmd9JHtxdWVzdGlvbk1hcmt9YDtcblxuICAgIHJldHVybiBzdHJpbmc7XG4gIH1cblxuICBzdGF0aWMgZnJvbVBhcnQocGFydCkge1xuICAgIGNvbnN0IHR5cGUgPSBPcHRpb25hbFBhcnRQYXJ0VHlwZSxcbiAgICAgICAgICBjb250aW51YXRpb24gPSBmYWxzZSxcbiAgICAgICAgICBvcHRpb25hbFBhcnRQYXJ0ID0gbmV3IE9wdGlvbmFsUGFydFBhcnQodHlwZSwgY29udGludWF0aW9uLCBwYXJ0KTtcblxuICAgIHJldHVybiBvcHRpb25hbFBhcnRQYXJ0O1xuICB9XG59Il0sIm5hbWVzIjpbIk9wdGlvbmFsUGFydFBhcnQiLCJxdWVzdGlvbk1hcmsiLCJzcGVjaWFsU3ltYm9scyIsIk5vblRlcm1pbmFsUGFydCIsInR5cGUiLCJjb250aW51YXRpb24iLCJwYXJ0IiwiZ2V0UGFydCIsInBhcnNlIiwiZnJhbWUiLCJjb250ZXh0IiwicGFydENvbnRleHQiLCJjb250aW51aW5nIiwiaXNDb250aW51aW5nIiwic2F2ZWRGcmFtZSIsImZyYW1lQWJvcnRlZCIsImlzQWJvcnRlZCIsImZyYW1lTnVsbGlmaWVkIiwiaXNOdWxsaWZpZWQiLCJudWxsaWZpZWRGcmFtZSIsImNvbnRpbnVlIiwicGFydEZyYW1lIiwiZW1wdHlGcmFtZSIsInBhcnRGcmFtZUludmFsaWQiLCJpc0ludmFsaWQiLCJwYXJ0RnJhbWVWYWxpZCIsImlzVmFsaWQiLCJjb21wb3NlIiwiZnJhbWVWYWxpZCIsImNvbW1pdCIsImFzU3RyaW5nIiwicGFydFN0cmluZyIsInN0cmluZyIsImZyb21QYXJ0IiwiT3B0aW9uYWxQYXJ0UGFydFR5cGUiLCJvcHRpb25hbFBhcnRQYXJ0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFZQTs7O2VBQXFCQTs7OzZCQVZVO29FQUVIO3lCQUVBOzJCQUNTO3VCQUNNOzs7Ozs7QUFFM0MsTUFBTSxFQUFFQyxZQUFZLEVBQUUsR0FBR0MsMkJBQWM7QUFFeEIsTUFBTUYseUJBQXlCRyxvQkFBZTtJQUMzRCxZQUFZQyxJQUFJLEVBQUVDLFlBQVksRUFBRUMsSUFBSSxDQUFFO1FBQ3BDLEtBQUssQ0FBQ0YsTUFBTUM7UUFFWixJQUFJLENBQUNDLElBQUksR0FBR0E7SUFDZDtJQUVBQyxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUNELElBQUk7SUFDbEI7SUFFQUUsTUFBTUMsS0FBSyxFQUFFQyxPQUFPLEVBQUU7UUFDcEIsTUFBTUosT0FBTyxJQUFJLEVBQUcsR0FBRztRQUV2QkssSUFBQUEsb0JBQVcsRUFBQyxDQUFDRDtZQUNYLE1BQU1FLGFBQWFGLFFBQVFHLFlBQVk7WUFFdkMsSUFBSUQsWUFBWTtnQkFDZCxNQUFNRSxhQUFhTCxPQUFPLEdBQUc7Z0JBRTdCQSxRQUFRLElBQUksQ0FBQ0gsSUFBSSxDQUFDRSxLQUFLLENBQUNDLE9BQU9DO2dCQUUvQixNQUFNSyxlQUFlTixNQUFNTyxTQUFTLElBQzlCQyxpQkFBaUJSLE1BQU1TLFdBQVc7Z0JBRXhDLElBQUksT0FBTztnQkFDVCxHQUFHO2dCQUNMLE9BQU8sSUFBSUgsY0FBYztvQkFDdkJOLFFBQVFVLHFCQUFjO2dCQUN4QixPQUFPLElBQUlGLGdCQUFnQjtvQkFDekJSLFFBQVFLLFlBQVksR0FBRztvQkFFdkJMLFFBQVFDLFFBQVFVLFFBQVEsQ0FBQ1g7Z0JBQzNCO1lBQ0YsT0FBTztnQkFDTCxJQUFJWTtnQkFFSkEsWUFBWUMsaUJBQVUsRUFBRSxHQUFHO2dCQUUzQkQsWUFBWSxJQUFJLENBQUNmLElBQUksQ0FBQ0UsS0FBSyxDQUFDYSxXQUFXWDtnQkFFdkMsTUFBTWEsbUJBQW1CRixVQUFVRyxTQUFTO2dCQUU1QyxJQUFJRCxrQkFBa0I7b0JBQ3BCRixZQUFZQyxpQkFBVSxFQUFFLEdBQUc7Z0JBQzdCO2dCQUVBLE1BQU1HLGlCQUFpQkosVUFBVUssT0FBTztnQkFFeENqQixRQUFRZ0IsaUJBQ0VmLFFBQVFpQixPQUFPLENBQUNsQixPQUFPWSxhQUNyQkYscUJBQWM7WUFDNUI7WUFFQSxNQUFNUyxhQUFhbkIsTUFBTWlCLE9BQU87WUFFaEMsSUFBSUUsWUFBWTtnQkFDZGxCLFFBQVFtQixNQUFNO1lBQ2hCO1FBQ0YsR0FBR3ZCLE1BQU1JO1FBRVQsT0FBT0Q7SUFDVDtJQUVBcUIsV0FBVztRQUNULE1BQU1DLGFBQWEsSUFBSSxDQUFDekIsSUFBSSxDQUFDd0IsUUFBUSxJQUMvQkUsU0FBUyxHQUFHRCxhQUFhOUIsY0FBYztRQUU3QyxPQUFPK0I7SUFDVDtJQUVBLE9BQU9DLFNBQVMzQixJQUFJLEVBQUU7UUFDcEIsTUFBTUYsT0FBTzhCLCtCQUFvQixFQUMzQjdCLGVBQWUsT0FDZjhCLG1CQUFtQixJQUFJbkMsaUJBQWlCSSxNQUFNQyxjQUFjQztRQUVsRSxPQUFPNkI7SUFDVDtBQUNGIn0=
|
package/lib/rule.js
CHANGED
|
@@ -8,9 +8,10 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Rule;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
const _occamlexers = require("occam-lexers");
|
|
11
12
|
const _context = require("./utilities/context");
|
|
12
13
|
const _constants = require("./constants");
|
|
13
|
-
const
|
|
14
|
+
const _frame = require("./frame");
|
|
14
15
|
const _string = require("./utilities/string");
|
|
15
16
|
const { opaque: opaqueSpecialSymbol, semiOpaque: semiOpaqueSpecialSymbol } = _occamlexers.specialSymbols;
|
|
16
17
|
class Rule {
|
|
@@ -55,8 +56,8 @@ class Rule {
|
|
|
55
56
|
(0, _context.ruleContext)((context)=>{
|
|
56
57
|
this.definitions.some((definition)=>{
|
|
57
58
|
frame = definition.parse(context);
|
|
58
|
-
const
|
|
59
|
-
if (
|
|
59
|
+
const frameNullified = frame.isNullified();
|
|
60
|
+
if (!frameNullified) {
|
|
60
61
|
return true;
|
|
61
62
|
}
|
|
62
63
|
});
|
|
@@ -114,4 +115,4 @@ ${marginString} | ${definitionString}` : `${definitionsString} | ${definitionS
|
|
|
114
115
|
return definitionsString;
|
|
115
116
|
}
|
|
116
117
|
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/rule.js"],"sourcesContent":["\"use strict\";\n\nimport { ruleContext } from \"./utilities/context\";\nimport { EMPTY_STRING } from \"./constants\";\nimport { specialSymbols } from \"occam-lexers\";\nimport { marginStringFromMarginWidth } from \"./utilities/string\";\n\nconst { opaque: opaqueSpecialSymbol, semiOpaque: semiOpaqueSpecialSymbol } = specialSymbols;\n\nexport default class Rule {\n  constructor(name, opacity, definitions) {\n    this.name = name;\n    this.opacity = opacity;\n    this.definitions = definitions;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getOpacity() {\n    return this.opacity;\n  }\n\n  getDefinitions() {\n    return this.definitions;\n  }\n\n  setName(name) {\n    this.name = name;\n  }\n\n  setOpacity(opacity) {\n    this.opacity = opacity;\n  }\n\n  setDefinitions(definitions) {\n    this.definitions = definitions;\n  }\n\n  isOpaque() {\n    const opaque = (this.opacity === opaqueSpecialSymbol);\n\n    return opaque;\n  }\n\n  isSemiOpaque() {\n    const semiOpaque = (this.opacity === semiOpaqueSpecialSymbol);\n\n    return semiOpaque;\n  }\n\n  isTransparent() {\n    const semiOpaque = (this.opacity === null);\n\n    return semiOpaque;\n  }\n\n  parse(context) {\n    let frame;\n\n    const rule = this;  ///\n\n    ruleContext((context) => {\n      this.definitions.some((definition) => {\n        frame = definition.parse(context);\n\n        const frameValid = frame.isValid(),\n              frameAborted = frame.isAborted();\n\n        if (frameValid || frameAborted) {\n          return true;\n        }\n      });\n\n      const frameValid = frame.isValid();\n\n      if (frameValid) {\n        context.commit();\n      }\n    }, rule, context);\n\n    return frame;\n  }\n\n  NonTerminalNodeFromRuleName(ruleName, context) { return context.NonTerminalNodeFromRuleName(ruleName); }\n\n  asString(maximumRuleNameLength, multiLine = true) {\n    const definitionsLength = this.definitions.length;\n\n    multiLine = multiLine && (definitionsLength > 1);  ///\n\n    const opacityString = opacityStringFromOpacity(this.opacity),\n          semicolonString = semicolonStringFromMultilineAndMaximumRuleNameLength(multiLine, maximumRuleNameLength),\n          definitionsString = definitionsStringFromMultilineDefinitionsAndMaximumRuleNameLength(multiLine, this.definitions, maximumRuleNameLength),\n          ruleName = this.name, ///\n          ruleNameLength = ruleName.length,\n          opacityStringLength = opacityString.length,\n          marginWidth = maximumRuleNameLength - ruleNameLength - opacityStringLength,\n          marginString = marginStringFromMarginWidth(marginWidth),\n          string = `\n\n${this.name}${opacityString}${marginString} ::= ${definitionsString}${semicolonString}`;\n\n    return string;\n  }\n\n  static fromNameOpacityAndDefinitions(Class, name, opacity, definitions) {\n    if (definitions === undefined) {\n      definitions = opacity;  ///\n\n      opacity = name; ///\n\n      name = Class; ///\n\n      Class = Rule; ///\n    }\n\n    const rule = new Class(name, opacity, definitions);\n\n    return rule;\n  }\n}\n\nfunction opacityStringFromOpacity(opacity) {\n  const opacityString = (opacity !== null)?\n          opacity: ///\n            EMPTY_STRING;\n\n  return opacityString;\n}\n\nfunction semicolonStringFromMultilineAndMaximumRuleNameLength(multiLine, maximumRuleNameLength) {\n  const marginWidth = maximumRuleNameLength,  ///\n        marginString = marginStringFromMarginWidth(marginWidth),\n        semicolonString = multiLine ?\n      `\n\n${marginString}   ;` :\n      \" ;\";\n\n  return semicolonString;\n}\n\nfunction definitionsStringFromMultilineDefinitionsAndMaximumRuleNameLength(multiLine, definitions, maximumRuleNameLength) {\n  const marginWidth = maximumRuleNameLength,  ///\n        marginString = marginStringFromMarginWidth(marginWidth),\n        definitionsString = definitions.reduce((definitionsString, definition) => {\n          const definitionString = definition.asString();\n\n          if (definitionsString === EMPTY_STRING) {\n            definitionsString = definitionString; ///\n          } else {\n            definitionsString = multiLine ?\n                                 `${definitionsString}\n    \n${marginString}   | ${definitionString}` :\n                                   `${definitionsString} | ${definitionString}`;\n          }\n\n          return definitionsString;\n        }, EMPTY_STRING);\n\n  return definitionsString;\n}\n"],"names":["Rule","opaque","opaqueSpecialSymbol","semiOpaque","semiOpaqueSpecialSymbol","specialSymbols","name","opacity","definitions","getName","getOpacity","getDefinitions","setName","setOpacity","setDefinitions","isOpaque","isSemiOpaque","isTransparent","parse","context","frame","rule","ruleContext","some","definition","frameValid","isValid","frameAborted","isAborted","commit","NonTerminalNodeFromRuleName","ruleName","asString","maximumRuleNameLength","multiLine","definitionsLength","length","opacityString","opacityStringFromOpacity","semicolonString","semicolonStringFromMultilineAndMaximumRuleNameLength","definitionsString","definitionsStringFromMultilineDefinitionsAndMaximumRuleNameLength","ruleNameLength","opacityStringLength","marginWidth","marginString","marginStringFromMarginWidth","string","fromNameOpacityAndDefinitions","Class","undefined","EMPTY_STRING","reduce","definitionString"],"mappings":"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"}
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/rule.js"],"sourcesContent":["\"use strict\";\n\nimport { specialSymbols } from \"occam-lexers\";\n\nimport { ruleContext } from \"./utilities/context\";\nimport { EMPTY_STRING } from \"./constants\";\nimport { nullifiedFrame } from \"./frame\";\nimport { marginStringFromMarginWidth } from \"./utilities/string\";\n\nconst { opaque: opaqueSpecialSymbol, semiOpaque: semiOpaqueSpecialSymbol } = specialSymbols;\n\nexport default class Rule {\n  constructor(name, opacity, definitions) {\n    this.name = name;\n    this.opacity = opacity;\n    this.definitions = definitions;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getOpacity() {\n    return this.opacity;\n  }\n\n  getDefinitions() {\n    return this.definitions;\n  }\n\n  setName(name) {\n    this.name = name;\n  }\n\n  setOpacity(opacity) {\n    this.opacity = opacity;\n  }\n\n  setDefinitions(definitions) {\n    this.definitions = definitions;\n  }\n\n  isOpaque() {\n    const opaque = (this.opacity === opaqueSpecialSymbol);\n\n    return opaque;\n  }\n\n  isSemiOpaque() {\n    const semiOpaque = (this.opacity === semiOpaqueSpecialSymbol);\n\n    return semiOpaque;\n  }\n\n  isTransparent() {\n    const semiOpaque = (this.opacity === null);\n\n    return semiOpaque;\n  }\n\n  parse(context) {\n    let frame;\n\n    const rule = this;  ///\n\n    ruleContext((context) => {\n      this.definitions.some((definition) => {\n        frame = definition.parse(context);\n\n        const frameNullified = frame.isNullified();\n\n        if (!frameNullified) {\n          return true;\n        }\n      });\n\n      const frameValid = frame.isValid();\n\n      if (frameValid) {\n        context.commit();\n      }\n    }, rule, context);\n\n    return frame;\n  }\n\n  NonTerminalNodeFromRuleName(ruleName, context) { return context.NonTerminalNodeFromRuleName(ruleName); }\n\n  asString(maximumRuleNameLength, multiLine = true) {\n    const definitionsLength = this.definitions.length;\n\n    multiLine = multiLine && (definitionsLength > 1);  ///\n\n    const opacityString = opacityStringFromOpacity(this.opacity),\n          semicolonString = semicolonStringFromMultilineAndMaximumRuleNameLength(multiLine, maximumRuleNameLength),\n          definitionsString = definitionsStringFromMultilineDefinitionsAndMaximumRuleNameLength(multiLine, this.definitions, maximumRuleNameLength),\n          ruleName = this.name, ///\n          ruleNameLength = ruleName.length,\n          opacityStringLength = opacityString.length,\n          marginWidth = maximumRuleNameLength - ruleNameLength - opacityStringLength,\n          marginString = marginStringFromMarginWidth(marginWidth),\n          string = `\n\n${this.name}${opacityString}${marginString} ::= ${definitionsString}${semicolonString}`;\n\n    return string;\n  }\n\n  static fromNameOpacityAndDefinitions(Class, name, opacity, definitions) {\n    if (definitions === undefined) {\n      definitions = opacity;  ///\n\n      opacity = name; ///\n\n      name = Class; ///\n\n      Class = Rule; ///\n    }\n\n    const rule = new Class(name, opacity, definitions);\n\n    return rule;\n  }\n}\n\nfunction opacityStringFromOpacity(opacity) {\n  const opacityString = (opacity !== null)?\n          opacity: ///\n            EMPTY_STRING;\n\n  return opacityString;\n}\n\nfunction semicolonStringFromMultilineAndMaximumRuleNameLength(multiLine, maximumRuleNameLength) {\n  const marginWidth = maximumRuleNameLength,  ///\n        marginString = marginStringFromMarginWidth(marginWidth),\n        semicolonString = multiLine ?\n      `\n\n${marginString}   ;` :\n      \" ;\";\n\n  return semicolonString;\n}\n\nfunction definitionsStringFromMultilineDefinitionsAndMaximumRuleNameLength(multiLine, definitions, maximumRuleNameLength) {\n  const marginWidth = maximumRuleNameLength,  ///\n        marginString = marginStringFromMarginWidth(marginWidth),\n        definitionsString = definitions.reduce((definitionsString, definition) => {\n          const definitionString = definition.asString();\n\n          if (definitionsString === EMPTY_STRING) {\n            definitionsString = definitionString; ///\n          } else {\n            definitionsString = multiLine ?\n                                 `${definitionsString}\n    \n${marginString}   | ${definitionString}` :\n                                   `${definitionsString} | ${definitionString}`;\n          }\n\n          return definitionsString;\n        }, EMPTY_STRING);\n\n  return definitionsString;\n}\n"],"names":["Rule","opaque","opaqueSpecialSymbol","semiOpaque","semiOpaqueSpecialSymbol","specialSymbols","name","opacity","definitions","getName","getOpacity","getDefinitions","setName","setOpacity","setDefinitions","isOpaque","isSemiOpaque","isTransparent","parse","context","frame","rule","ruleContext","some","definition","frameNullified","isNullified","frameValid","isValid","commit","NonTerminalNodeFromRuleName","ruleName","asString","maximumRuleNameLength","multiLine","definitionsLength","length","opacityString","opacityStringFromOpacity","semicolonString","semicolonStringFromMultilineAndMaximumRuleNameLength","definitionsString","definitionsStringFromMultilineDefinitionsAndMaximumRuleNameLength","ruleNameLength","opacityStringLength","marginWidth","marginString","marginStringFromMarginWidth","string","fromNameOpacityAndDefinitions","Class","undefined","EMPTY_STRING","reduce","definitionString"],"mappings":"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"}
|
package/lib/utilities/part.js
CHANGED
|
@@ -13,8 +13,13 @@ function parsePartContinually(part, count, strict, frame, context) {
|
|
|
13
13
|
(0, _context.continuationPartContext)((context)=>{
|
|
14
14
|
const savedFrame = frame; ///
|
|
15
15
|
frame = part.parse(frame, context);
|
|
16
|
-
const
|
|
17
|
-
if (
|
|
16
|
+
const frameAborted = frame.isAborted(), frameNullified = frame.isNullified();
|
|
17
|
+
if (false) {
|
|
18
|
+
///
|
|
19
|
+
} else if (frameAborted) {
|
|
20
|
+
frame = savedFrame; ///
|
|
21
|
+
frame = context.continue(frame);
|
|
22
|
+
} else if (frameNullified) {
|
|
18
23
|
const initial = count === 0;
|
|
19
24
|
if (strict && initial) {
|
|
20
25
|
///
|
|
@@ -31,4 +36,4 @@ function parsePartContinually(part, count, strict, frame, context) {
|
|
|
31
36
|
return frame;
|
|
32
37
|
}
|
|
33
38
|
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGFydC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgY29udGludWF0aW9uUGFydENvbnRleHQgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2NvbnRleHRcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIHBhcnNlUGFydENvbnRpbnVhbGx5KHBhcnQsIGNvdW50LCBzdHJpY3QsIGZyYW1lLCBjb250ZXh0KSB7XG4gIGNvbnRpbnVhdGlvblBhcnRDb250ZXh0KChjb250ZXh0KSA9PiB7XG4gICAgY29uc3Qgc2F2ZWRGcmFtZSA9IGZyYW1lOyAvLy9cblxuICAgIGZyYW1lID0gcGFydC5wYXJzZShmcmFtZSwgY29udGV4dCk7XG5cbiAgICBjb25zdCBmcmFtZUFib3J0ZWQgPSBmcmFtZS5pc0Fib3J0ZWQoKSxcbiAgICAgICAgICBmcmFtZU51bGxpZmllZCA9IGZyYW1lLmlzTnVsbGlmaWVkKCk7XG5cbiAgICBpZiAoZmFsc2UpIHtcbiAgICAgIC8vL1xuICAgIH0gZWxzZSBpZiAoZnJhbWVBYm9ydGVkKSB7XG4gICAgICBmcmFtZSA9IHNhdmVkRnJhbWU7IC8vL1xuXG4gICAgICBmcmFtZSA9IGNvbnRleHQuY29udGludWUoZnJhbWUpO1xuICAgIH0gZWxzZSBpZiAoZnJhbWVOdWxsaWZpZWQpIHtcbiAgICAgIGNvbnN0IGluaXRpYWwgPSAoY291bnQgPT09IDApO1xuXG4gICAgICBpZiAoc3RyaWN0ICYmIGluaXRpYWwpIHtcbiAgICAgICAgLy8vXG4gICAgICB9IGVsc2Uge1xuICAgICAgICBmcmFtZSA9IHNhdmVkRnJhbWU7IC8vL1xuXG4gICAgICAgIGZyYW1lID0gY29udGV4dC5jb250aW51ZShmcmFtZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgY29uc3QgZnJhbWVWYWxpZCA9IGZyYW1lLmlzVmFsaWQoKTtcblxuICAgIGlmIChmcmFtZVZhbGlkKSB7XG4gICAgICBjb250ZXh0LmNvbW1pdCgpO1xuICAgIH1cbiAgfSwgcGFydCwgY291bnQsIHBhcnNlUGFydENvbnRpbnVhbGx5LCBjb250ZXh0KTtcblxuICByZXR1cm4gZnJhbWU7XG59XG4iXSwibmFtZXMiOlsicGFyc2VQYXJ0Q29udGludWFsbHkiLCJwYXJ0IiwiY291bnQiLCJzdHJpY3QiLCJmcmFtZSIsImNvbnRleHQiLCJjb250aW51YXRpb25QYXJ0Q29udGV4dCIsInNhdmVkRnJhbWUiLCJwYXJzZSIsImZyYW1lQWJvcnRlZCIsImlzQWJvcnRlZCIsImZyYW1lTnVsbGlmaWVkIiwiaXNOdWxsaWZpZWQiLCJjb250aW51ZSIsImluaXRpYWwiLCJmcmFtZVZhbGlkIiwiaXNWYWxpZCIsImNvbW1pdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBSWdCQTs7O2VBQUFBOzs7eUJBRndCO0FBRWpDLFNBQVNBLHFCQUFxQkMsSUFBSSxFQUFFQyxLQUFLLEVBQUVDLE1BQU0sRUFBRUMsS0FBSyxFQUFFQyxPQUFPO0lBQ3RFQyxJQUFBQSxnQ0FBdUIsRUFBQyxDQUFDRDtRQUN2QixNQUFNRSxhQUFhSCxPQUFPLEdBQUc7UUFFN0JBLFFBQVFILEtBQUtPLEtBQUssQ0FBQ0osT0FBT0M7UUFFMUIsTUFBTUksZUFBZUwsTUFBTU0sU0FBUyxJQUM5QkMsaUJBQWlCUCxNQUFNUSxXQUFXO1FBRXhDLElBQUksT0FBTztRQUNULEdBQUc7UUFDTCxPQUFPLElBQUlILGNBQWM7WUFDdkJMLFFBQVFHLFlBQVksR0FBRztZQUV2QkgsUUFBUUMsUUFBUVEsUUFBUSxDQUFDVDtRQUMzQixPQUFPLElBQUlPLGdCQUFnQjtZQUN6QixNQUFNRyxVQUFXWixVQUFVO1lBRTNCLElBQUlDLFVBQVVXLFNBQVM7WUFDckIsR0FBRztZQUNMLE9BQU87Z0JBQ0xWLFFBQVFHLFlBQVksR0FBRztnQkFFdkJILFFBQVFDLFFBQVFRLFFBQVEsQ0FBQ1Q7WUFDM0I7UUFDRjtRQUVBLE1BQU1XLGFBQWFYLE1BQU1ZLE9BQU87UUFFaEMsSUFBSUQsWUFBWTtZQUNkVixRQUFRWSxNQUFNO1FBQ2hCO0lBQ0YsR0FBR2hCLE1BQU1DLE9BQU9GLHNCQUFzQks7SUFFdEMsT0FBT0Q7QUFDVCJ9
|
package/package.json
CHANGED
|
@@ -71,11 +71,9 @@ export default class DefinitionContext extends Context {
|
|
|
71
71
|
} else {
|
|
72
72
|
const committed = nonTerminalNode.isCommitted();
|
|
73
73
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
frame = nullifiedFrame;
|
|
78
|
-
}
|
|
74
|
+
frame = committed ?
|
|
75
|
+
abortedFrame :
|
|
76
|
+
nullifiedFrame;
|
|
79
77
|
}
|
|
80
78
|
|
|
81
79
|
return frame;
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import Context from "../../context";
|
|
4
4
|
|
|
5
|
+
import { nullifiedFrame } from "../../frame";
|
|
6
|
+
|
|
5
7
|
export default class CommittedPartPartContext extends Context {
|
|
6
8
|
isCommitted() {
|
|
7
9
|
const committed = true;
|
|
@@ -9,6 +11,16 @@ export default class CommittedPartPartContext extends Context {
|
|
|
9
11
|
return committed;
|
|
10
12
|
}
|
|
11
13
|
|
|
14
|
+
compose(frame, partFrame = nullifiedFrame) {
|
|
15
|
+
const partFrameValid = partFrame.isValid();
|
|
16
|
+
|
|
17
|
+
if (partFrameValid) {
|
|
18
|
+
frame = frame.merge(partFrame);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
return frame;
|
|
22
|
+
}
|
|
23
|
+
|
|
12
24
|
continued(frame, context) {
|
|
13
25
|
frame = this.compose(frame);
|
|
14
26
|
|
|
@@ -44,7 +44,9 @@ export default class ChoiceOfPartsPart extends NonTerminalPart {
|
|
|
44
44
|
partFrameValid = partFrame.isValid(),
|
|
45
45
|
partFrameAborted = partFrame.isAborted();
|
|
46
46
|
|
|
47
|
-
if (
|
|
47
|
+
if (false) {
|
|
48
|
+
///
|
|
49
|
+
} else if (partFrameValid) {
|
|
48
50
|
frame = context.compose(frame, partFrame);
|
|
49
51
|
} else if (partFrameAborted) {
|
|
50
52
|
frame = partFrame; ///
|
|
@@ -32,9 +32,14 @@ export default class OptionalPartPart extends NonTerminalPart {
|
|
|
32
32
|
|
|
33
33
|
frame = this.part.parse(frame, context);
|
|
34
34
|
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
const frameAborted = frame.isAborted(),
|
|
36
|
+
frameNullified = frame.isNullified();
|
|
37
|
+
|
|
38
|
+
if (false) {
|
|
39
|
+
///
|
|
40
|
+
} else if (frameAborted) {
|
|
41
|
+
frame = nullifiedFrame;
|
|
42
|
+
} else if (frameNullified) {
|
|
38
43
|
frame = savedFrame; ///
|
|
39
44
|
|
|
40
45
|
frame = context.continue(frame);
|
package/src/rule.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { specialSymbols } from "occam-lexers";
|
|
4
|
+
|
|
3
5
|
import { ruleContext } from "./utilities/context";
|
|
4
6
|
import { EMPTY_STRING } from "./constants";
|
|
5
|
-
import {
|
|
7
|
+
import { nullifiedFrame } from "./frame";
|
|
6
8
|
import { marginStringFromMarginWidth } from "./utilities/string";
|
|
7
9
|
|
|
8
10
|
const { opaque: opaqueSpecialSymbol, semiOpaque: semiOpaqueSpecialSymbol } = specialSymbols;
|
|
@@ -65,10 +67,9 @@ export default class Rule {
|
|
|
65
67
|
this.definitions.some((definition) => {
|
|
66
68
|
frame = definition.parse(context);
|
|
67
69
|
|
|
68
|
-
const
|
|
69
|
-
frameAborted = frame.isAborted();
|
|
70
|
+
const frameNullified = frame.isNullified();
|
|
70
71
|
|
|
71
|
-
if (
|
|
72
|
+
if (!frameNullified) {
|
|
72
73
|
return true;
|
|
73
74
|
}
|
|
74
75
|
});
|
package/src/utilities/part.js
CHANGED
|
@@ -8,9 +8,16 @@ export function parsePartContinually(part, count, strict, frame, context) {
|
|
|
8
8
|
|
|
9
9
|
frame = part.parse(frame, context);
|
|
10
10
|
|
|
11
|
-
const
|
|
11
|
+
const frameAborted = frame.isAborted(),
|
|
12
|
+
frameNullified = frame.isNullified();
|
|
12
13
|
|
|
13
|
-
if (
|
|
14
|
+
if (false) {
|
|
15
|
+
///
|
|
16
|
+
} else if (frameAborted) {
|
|
17
|
+
frame = savedFrame; ///
|
|
18
|
+
|
|
19
|
+
frame = context.continue(frame);
|
|
20
|
+
} else if (frameNullified) {
|
|
14
21
|
const initial = (count === 0);
|
|
15
22
|
|
|
16
23
|
if (strict && initial) {
|