occam-furtle 3.0.509 → 3.0.513
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/element/anonymousProcedure.js +2 -2
- package/lib/element/error.js +4 -3
- package/lib/element/every.js +4 -4
- package/lib/element/label.js +2 -8
- package/lib/element/parameters.js +3 -8
- package/lib/element/procedure.js +5 -5
- package/lib/element/procedureCall.js +4 -5
- package/lib/element/reduce.js +4 -4
- package/lib/element/some.js +4 -4
- package/lib/element/term/logical.js +2 -2
- package/lib/element/term/negated.js +2 -2
- package/package.json +2 -2
- package/src/element/anonymousProcedure.js +1 -1
- package/src/element/error.js +5 -3
- package/src/element/every.js +3 -3
- package/src/element/label.js +2 -13
- package/src/element/parameters.js +3 -13
- package/src/element/procedure.js +4 -4
- package/src/element/procedureCall.js +4 -6
- package/src/element/reduce.js +3 -3
- package/src/element/some.js +3 -3
- package/src/element/term/logical.js +1 -1
- package/src/element/term/negated.js +1 -1
|
@@ -34,7 +34,7 @@ const _default = (0, _elements.define)(class AnonymousProcedure extends _occamla
|
|
|
34
34
|
getReturnBlock() {
|
|
35
35
|
return this.returnBlock;
|
|
36
36
|
}
|
|
37
|
-
|
|
37
|
+
evaluate(values, context, forward, back) {
|
|
38
38
|
forward = cut(forward, back); ///
|
|
39
39
|
const anonymousProcedureString = this.getString(); ///
|
|
40
40
|
context.trace(`Calling the '${anonymousProcedureString}' anonymous function...`);
|
|
@@ -54,4 +54,4 @@ const _default = (0, _elements.define)(class AnonymousProcedure extends _occamla
|
|
|
54
54
|
static name = "AnonymousProcedure";
|
|
55
55
|
});
|
|
56
56
|
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L2Fub255bW91c1Byb2NlZHVyZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCwgY29udGludWF0aW9uVXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuXG5pbXBvcnQgRXhjZXB0aW9uIGZyb20gXCIuLi9leGNlcHRpb25cIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgeyB2YXJpYWJsZXNGcm9tVmFsdWVzQW5kUGFyYW1ldGVycyB9IGZyb20gXCIuLi91dGlsaXRpZXMvcGFyYW1ldGVyc1wiO1xuXG5jb25zdCB7IGN1dCB9ID0gY29udGludWF0aW9uVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgQW5vbnltb3VzUHJvY2VkdXJlIGV4dGVuZHMgRWxlbWVudCB7XG4gIGNvbnN0cnVjdG9yKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgdHlwZSwgcGFyYW1ldGVycywgcmV0dXJuQmxvY2spIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy50eXBlID0gdHlwZTtcbiAgICB0aGlzLnBhcmFtZXRlcnMgPSBwYXJhbWV0ZXJzO1xuICAgIHRoaXMucmV0dXJuQmxvY2sgPSByZXR1cm5CbG9jaztcbiAgfVxuXG4gIGdldFR5cGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudHlwZTtcbiAgfVxuXG4gIGdldFBhcmFtZXRlcnMoKSB7XG4gICAgcmV0dXJuIHRoaXMucGFyYW1ldGVycztcbiAgfVxuXG4gIGdldFJldHVybkJsb2NrKCkge1xuICAgIHJldHVybiB0aGlzLnJldHVybkJsb2NrO1xuICB9XG5cbiAgZXZhbHVhdGUodmFsdWVzLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKSB7XG4gICAgZm9yd2FyZCA9IGN1dChmb3J3YXJkLCBiYWNrKTsgLy8vXG5cbiAgICBjb25zdCBhbm9ueW1vdXNQcm9jZWR1cmVTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpOyAvLy9cblxuICAgIGNvbnRleHQudHJhY2UoYENhbGxpbmcgdGhlICcke2Fub255bW91c1Byb2NlZHVyZVN0cmluZ30nIGFub255bW91cyBmdW5jdGlvbi4uLmApO1xuXG4gICAgcmV0dXJuIHRoaXMucGFyYW1ldGVycy5jb21wYXJlVmFsdWVzKHZhbHVlcywgY29udGV4dCwgKGJhY2spID0+IHtcbiAgICAgIGNvbnN0IHZhcmlhYmxlcyA9IHZhcmlhYmxlc0Zyb21WYWx1ZXNBbmRQYXJhbWV0ZXJzKHZhbHVlcywgdGhpcy5wYXJhbWV0ZXJzLCBjb250ZXh0KTtcblxuICAgICAgcmV0dXJuIHRoaXMucmV0dXJuQmxvY2suZXZhbHVhdGUodmFyaWFibGVzLCBjb250ZXh0LCAodmFsdWUsIGJhY2spID0+IHtcbiAgICAgICAgY29uc3QgdmFsdWVUeXBlID0gdmFsdWUuZ2V0VHlwZSgpLFxuICAgICAgICAgICAgICB0eXBlRXF1YWxUb1ZhbHVlVHlwZSA9IHRoaXMudHlwZS5pc0VxdWFsVG8odmFsdWVUeXBlKTtcblxuICAgICAgICBpZiAoIXR5cGVFcXVhbFRvVmFsdWVUeXBlKSB7XG4gICAgICAgICAgY29uc3QgdHlwZVN0cmluZyA9IHRoaXMudHlwZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICAgICAgICB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpLFxuICAgICAgICAgICAgICAgIHZhbHVlVHlwZVN0cmluZyA9IHZhbHVlVHlwZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICAgICAgICBtZXNzYWdlID0gYFRoZSAnJHt2YWx1ZVN0cmluZ30nIHZhbHVlJ3MgJyR7dmFsdWVUeXBlU3RyaW5nfScgdHlwZSBpcyBub3QgZXF1YWwgdG8gdGhlICcke2Fub255bW91c1Byb2NlZHVyZVN0cmluZ30nIGFub255bW91cyBmdW5jdGlvbidzICcke3R5cGVTdHJpbmd9JyB0eXBlLmAsXG4gICAgICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICAgICAgcmV0dXJuIGJhY2soZXhjZXB0aW9uKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnRleHQuZGVidWcoYC4uLmNhbGxlZCB0aGUgJyR7YW5vbnltb3VzUHJvY2VkdXJlU3RyaW5nfScgYW5vbnltb3VzIGZ1bmN0aW9uLmApO1xuXG4gICAgICAgIHJldHVybiBmb3J3YXJkKHZhbHVlLCBiYWNrKTtcbiAgICAgIH0sIGJhY2spO1xuICAgIH0sIGJhY2spO1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIkFub255bW91c1Byb2NlZHVyZVwiO1xufSk7XG4iXSwibmFtZXMiOlsiY3V0IiwiY29udGludWF0aW9uVXRpbGl0aWVzIiwiZGVmaW5lIiwiQW5vbnltb3VzUHJvY2VkdXJlIiwiRWxlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsInR5cGUiLCJwYXJhbWV0ZXJzIiwicmV0dXJuQmxvY2siLCJnZXRUeXBlIiwiZ2V0UGFyYW1ldGVycyIsImdldFJldHVybkJsb2NrIiwiZXZhbHVhdGUiLCJ2YWx1ZXMiLCJmb3J3YXJkIiwiYmFjayIsImFub255bW91c1Byb2NlZHVyZVN0cmluZyIsImdldFN0cmluZyIsInRyYWNlIiwiY29tcGFyZVZhbHVlcyIsInZhcmlhYmxlcyIsInZhcmlhYmxlc0Zyb21WYWx1ZXNBbmRQYXJhbWV0ZXJzIiwidmFsdWUiLCJ2YWx1ZVR5cGUiLCJ0eXBlRXF1YWxUb1ZhbHVlVHlwZSIsImlzRXF1YWxUbyIsInR5cGVTdHJpbmciLCJ2YWx1ZVN0cmluZyIsInZhbHVlVHlwZVN0cmluZyIsIm1lc3NhZ2UiLCJleGNlcHRpb24iLCJFeGNlcHRpb24iLCJmcm9tTWVzc2FnZSIsImRlYnVnIiwibmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBV0E7OztlQUFBOzs7Z0NBVCtDO2tFQUV6QjswQkFFQzs0QkFDMEI7Ozs7OztBQUVqRCxNQUFNLEVBQUVBLEdBQUcsRUFBRSxHQUFHQyxxQ0FBcUI7TUFFckMsV0FBZUMsSUFBQUEsZ0JBQU0sRUFBQyxNQUFNQywyQkFBMkJDLHVCQUFPO0lBQzVELFlBQVlDLE9BQU8sRUFBRUMsTUFBTSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsSUFBSSxFQUFFQyxVQUFVLEVBQUVDLFdBQVcsQ0FBRTtRQUM1RSxLQUFLLENBQUNOLFNBQVNDLFFBQVFDLE1BQU1DO1FBRTdCLElBQUksQ0FBQ0MsSUFBSSxHQUFHQTtRQUNaLElBQUksQ0FBQ0MsVUFBVSxHQUFHQTtRQUNsQixJQUFJLENBQUNDLFdBQVcsR0FBR0E7SUFDckI7SUFFQUMsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDSCxJQUFJO0lBQ2xCO0lBRUFJLGdCQUFnQjtRQUNkLE9BQU8sSUFBSSxDQUFDSCxVQUFVO0lBQ3hCO0lBRUFJLGlCQUFpQjtRQUNmLE9BQU8sSUFBSSxDQUFDSCxXQUFXO0lBQ3pCO0lBRUFJLFNBQVNDLE1BQU0sRUFBRVgsT0FBTyxFQUFFWSxPQUFPLEVBQUVDLElBQUksRUFBRTtRQUN2Q0QsVUFBVWpCLElBQUlpQixTQUFTQyxPQUFPLEdBQUc7UUFFakMsTUFBTUMsMkJBQTJCLElBQUksQ0FBQ0MsU0FBUyxJQUFJLEdBQUc7UUFFdERmLFFBQVFnQixLQUFLLENBQUMsQ0FBQyxhQUFhLEVBQUVGLHlCQUF5Qix1QkFBdUIsQ0FBQztRQUUvRSxPQUFPLElBQUksQ0FBQ1QsVUFBVSxDQUFDWSxhQUFhLENBQUNOLFFBQVFYLFNBQVMsQ0FBQ2E7WUFDckQsTUFBTUssWUFBWUMsSUFBQUEsNENBQWdDLEVBQUNSLFFBQVEsSUFBSSxDQUFDTixVQUFVLEVBQUVMO1lBRTVFLE9BQU8sSUFBSSxDQUFDTSxXQUFXLENBQUNJLFFBQVEsQ0FBQ1EsV0FBV2xCLFNBQVMsQ0FBQ29CLE9BQU9QO2dCQUMzRCxNQUFNUSxZQUFZRCxNQUFNYixPQUFPLElBQ3pCZSx1QkFBdUIsSUFBSSxDQUFDbEIsSUFBSSxDQUFDbUIsU0FBUyxDQUFDRjtnQkFFakQsSUFBSSxDQUFDQyxzQkFBc0I7b0JBQ3pCLE1BQU1FLGFBQWEsSUFBSSxDQUFDcEIsSUFBSSxDQUFDVyxTQUFTLElBQ2hDVSxjQUFjTCxNQUFNTCxTQUFTLElBQzdCVyxrQkFBa0JMLFVBQVVOLFNBQVMsSUFDckNZLFVBQVUsQ0FBQyxLQUFLLEVBQUVGLFlBQVksV0FBVyxFQUFFQyxnQkFBZ0IsNEJBQTRCLEVBQUVaLHlCQUF5Qix3QkFBd0IsRUFBRVUsV0FBVyxPQUFPLENBQUMsRUFDL0pJLFlBQVlDLGtCQUFTLENBQUNDLFdBQVcsQ0FBQ0g7b0JBRXhDLE9BQU9kLEtBQUtlO2dCQUNkO2dCQUVBNUIsUUFBUStCLEtBQUssQ0FBQyxDQUFDLGVBQWUsRUFBRWpCLHlCQUF5QixxQkFBcUIsQ0FBQztnQkFFL0UsT0FBT0YsUUFBUVEsT0FBT1A7WUFDeEIsR0FBR0E7UUFDTCxHQUFHQTtJQUNMO0lBRUEsT0FBT21CLE9BQU8scUJBQXFCO0FBQ3JDIn0=
|
package/lib/element/error.js
CHANGED
|
@@ -10,16 +10,17 @@ Object.defineProperty(exports, "default", {
|
|
|
10
10
|
});
|
|
11
11
|
const _occamlanguages = require("occam-languages");
|
|
12
12
|
const _elements = require("../elements");
|
|
13
|
+
const { breakable } = _occamlanguages.breakPointUtilities;
|
|
13
14
|
const _default = (0, _elements.define)(class Error extends _occamlanguages.Element {
|
|
14
15
|
constructor(context, string, node, breakPoint){
|
|
15
16
|
super(context, string, node, breakPoint);
|
|
16
17
|
}
|
|
17
|
-
verify(context, forward, back) {
|
|
18
|
+
verify = breakable(function(context, forward, back) {
|
|
18
19
|
const errorString = this.getString(); ///
|
|
19
20
|
context.warning(`The '${errorString}' error cannot be verified.`);
|
|
20
21
|
return back();
|
|
21
|
-
}
|
|
22
|
+
});
|
|
22
23
|
static name = "Error";
|
|
23
24
|
});
|
|
24
25
|
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L2Vycm9yLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQge0VsZW1lbnQsIGJyZWFrUG9pbnRVdGlsaXRpZXN9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5cbmNvbnN0IHsgYnJlYWthYmxlIH0gPSBicmVha1BvaW50VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgRXJyb3IgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcbiAgfVxuXG4gIHZlcmlmeSA9IGJyZWFrYWJsZShmdW5jdGlvbiAoY29udGV4dCwgZm9yd2FyZCwgYmFjaykge1xuICAgIGNvbnN0IGVycm9yU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgIC8vL1xuXG4gICAgY29udGV4dC53YXJuaW5nKGBUaGUgJyR7ZXJyb3JTdHJpbmd9JyBlcnJvciBjYW5ub3QgYmUgdmVyaWZpZWQuYCk7XG5cbiAgICByZXR1cm4gYmFjaygpO1xuICB9KTtcblxuICBzdGF0aWMgbmFtZSA9IFwiRXJyb3JcIjtcbn0pO1xuIl0sIm5hbWVzIjpbImJyZWFrYWJsZSIsImJyZWFrUG9pbnRVdGlsaXRpZXMiLCJkZWZpbmUiLCJFcnJvciIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJ2ZXJpZnkiLCJmb3J3YXJkIiwiYmFjayIsImVycm9yU3RyaW5nIiwiZ2V0U3RyaW5nIiwid2FybmluZyIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFBOzs7ZUFBQTs7O2dDQU4yQzswQkFFcEI7QUFFdkIsTUFBTSxFQUFFQSxTQUFTLEVBQUUsR0FBR0MsbUNBQW1CO01BRXpDLFdBQWVDLElBQUFBLGdCQUFNLEVBQUMsTUFBTUMsY0FBY0MsdUJBQU87SUFDL0MsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksRUFBRUMsVUFBVSxDQUFFO1FBQzdDLEtBQUssQ0FBQ0gsU0FBU0MsUUFBUUMsTUFBTUM7SUFDL0I7SUFFQUMsU0FBU1QsVUFBVSxTQUFVSyxPQUFPLEVBQUVLLE9BQU8sRUFBRUMsSUFBSTtRQUNqRCxNQUFNQyxjQUFjLElBQUksQ0FBQ0MsU0FBUyxJQUFLLEdBQUc7UUFFMUNSLFFBQVFTLE9BQU8sQ0FBQyxDQUFDLEtBQUssRUFBRUYsWUFBWSwyQkFBMkIsQ0FBQztRQUVoRSxPQUFPRDtJQUNULEdBQUc7SUFFSCxPQUFPSSxPQUFPLFFBQVE7QUFDeEIifQ==
|
package/lib/element/every.js
CHANGED
|
@@ -84,7 +84,7 @@ const _default = (0, _elements.define)(class Every extends _occamlanguages.Eleme
|
|
|
84
84
|
}
|
|
85
85
|
const nodes = value.getNodes();
|
|
86
86
|
return every(nodes, (node, forward, back)=>{
|
|
87
|
-
return this.
|
|
87
|
+
return this.evaluateAnonymousProcedure(node, context, forward, back);
|
|
88
88
|
}, (boolean, back)=>{
|
|
89
89
|
const value = (0, _value.valueFromBoolean)(boolean, context), valueString = value.getString();
|
|
90
90
|
context.trace(`...evaluated the '${everyString}' every as '${valueString}'.`);
|
|
@@ -92,9 +92,9 @@ const _default = (0, _elements.define)(class Every extends _occamlanguages.Eleme
|
|
|
92
92
|
}, back);
|
|
93
93
|
}, back);
|
|
94
94
|
});
|
|
95
|
-
|
|
95
|
+
evaluateAnonymousProcedure(node, context, forward, back) {
|
|
96
96
|
const { Values } = _elements.default, value = (0, _value.valueFromNode)(node, context), values = Values.fromValue(value, context);
|
|
97
|
-
return this.anonymousProcedure.
|
|
97
|
+
return this.anonymousProcedure.evaluate(values, context, (value, back)=>{
|
|
98
98
|
const valueType = value.getType(), valueTypeBooleanType = valueType.isBooleanType();
|
|
99
99
|
if (!valueTypeBooleanType) {
|
|
100
100
|
const valueString = value.getString(), message = `The '${valueString}' value's type is '${valueType}' when it should be of type '${_typeNames.BOOLEAN_TYPE_NAME}'.`, exception = _exception.default.fromMessage(message);
|
|
@@ -107,4 +107,4 @@ const _default = (0, _elements.define)(class Every extends _occamlanguages.Eleme
|
|
|
107
107
|
static name = "Every";
|
|
108
108
|
});
|
|
109
109
|
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L2V2ZXJ5LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50LCBicmVha1BvaW50VXRpbGl0aWVzLCBjb250aW51YXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBlbGVtZW50cyBmcm9tIFwiLi4vZWxlbWVudHNcIjtcbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcbmltcG9ydCB7IHZhbHVlRnJvbU5vZGUsIHZhbHVlRnJvbUJvb2xlYW4gfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3ZhbHVlXCI7XG5pbXBvcnQgeyBMSVNUX1RZUEVfTkFNRSwgQk9PTEVBTl9UWVBFX05BTUUgfSBmcm9tIFwiLi4vdHlwZU5hbWVzXCI7XG5cbmNvbnN0IHsgZXZlcnkgfSA9IGNvbnRpbnVhdGlvblV0aWxpdGllcyxcbiAgICAgIHsgYnJlYWthYmxlIH0gPSBicmVha1BvaW50VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgRXZlcnkgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB2YXJpYWJsZSwgYW5vbnltb3VzUHJvY2VkdXJlKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcblxuICAgIHRoaXMuc3RyaW5nID0gc3RyaW5nO1xuICAgIHRoaXMudmFyaWFibGUgPSB2YXJpYWJsZTtcbiAgICB0aGlzLmFub255bW91c1Byb2NlZHVyZSA9IGFub255bW91c1Byb2NlZHVyZTtcbiAgfVxuXG4gIGdldFZhcmlhYmxlKCkge1xuICAgIHJldHVybiB0aGlzLnZhcmlhYmxlO1xuICB9XG5cbiAgZ2V0QW5vbnltb3VzUHJvY2VkdXJlKCkge1xuICAgIHJldHVybiB0aGlzLmFub255bW91c1Byb2NlZHVyZTtcbiAgfVxuXG4gIGV2YWx1YXRlID0gYnJlYWthYmxlKGZ1bmN0aW9uIChjb250ZXh0LCBmb3J3YXJkLCBiYWNrKSB7XG4gICAgY29uc3QgZXZlcnlTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpO1xuXG4gICAgY29udGV4dC50cmFjZShgRXZhbHVhdGluZyB0aGUgJyR7ZXZlcnlTdHJpbmd9JyBldmVyeS4uLmApO1xuXG4gICAgcmV0dXJuIHRoaXMudmFyaWFibGUuZXZhbHVhdGUoY29udGV4dCwgKHZhbHVlLCBiYWNrKSA9PiB7XG4gICAgICBjb25zdCB2YWx1ZVR5cGUgPSB2YWx1ZS5nZXRUeXBlKCksXG4gICAgICAgICAgICB2YWx1ZVR5cGVMaXN0VHlwZSA9IHZhbHVlVHlwZS5pc0xpc3RUeXBlKCk7XG5cbiAgICAgIGlmICghdmFsdWVUeXBlTGlzdFR5cGUpIHtcbiAgICAgICAgY29uc3QgdmFsdWVTdHJpbmcgPSB2YWx1ZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICAgICAgbWVzc2FnZSA9IGBUaGUgJyR7dmFsdWVTdHJpbmd9JyB2YWx1ZSdzICcke3ZhbHVlVHlwZX0nIHR5cGUgc2hvdWxkIGJlICcke0xJU1RfVFlQRV9OQU1FfScuYCxcbiAgICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICAgIHJldHVybiBiYWNrKGV4Y2VwdGlvbik7XG4gICAgICB9XG5cbiAgICAgIGNvbnN0IG5vZGVzID0gdmFsdWUuZ2V0Tm9kZXMoKTtcblxuICAgICAgcmV0dXJuIGV2ZXJ5KG5vZGVzLCAobm9kZSwgZm9yd2FyZCwgYmFjaykgPT4ge1xuICAgICAgICByZXR1cm4gdGhpcy5ldmFsdWF0ZUFub255bW91c1Byb2NlZHVyZShub2RlLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKTtcbiAgICAgIH0sIChib29sZWFuLCBiYWNrKSA9PiB7XG4gICAgICAgIGNvbnN0IHZhbHVlID0gdmFsdWVGcm9tQm9vbGVhbihib29sZWFuLCBjb250ZXh0KSxcbiAgICAgICAgICAgICAgdmFsdWVTdHJpbmcgPSB2YWx1ZS5nZXRTdHJpbmcoKTtcblxuICAgICAgICBjb250ZXh0LnRyYWNlKGAuLi5ldmFsdWF0ZWQgdGhlICcke2V2ZXJ5U3RyaW5nfScgZXZlcnkgYXMgJyR7dmFsdWVTdHJpbmd9Jy5gKTtcblxuICAgICAgICByZXR1cm4gZm9yd2FyZCh2YWx1ZSwgYmFjayk7XG4gICAgICB9LCBiYWNrKTtcbiAgICB9LCBiYWNrKTtcbiAgfSk7XG5cbiAgZXZhbHVhdGVBbm9ueW1vdXNQcm9jZWR1cmUobm9kZSwgY29udGV4dCwgZm9yd2FyZCwgYmFjaykge1xuICAgIGNvbnN0IHsgVmFsdWVzIH0gPSBlbGVtZW50cyxcbiAgICAgICAgICB2YWx1ZSA9IHZhbHVlRnJvbU5vZGUobm9kZSwgY29udGV4dCksXG4gICAgICAgICAgdmFsdWVzID0gVmFsdWVzLmZyb21WYWx1ZSh2YWx1ZSwgY29udGV4dCk7XG5cbiAgICByZXR1cm4gdGhpcy5hbm9ueW1vdXNQcm9jZWR1cmUuZXZhbHVhdGUodmFsdWVzLCBjb250ZXh0LCAodmFsdWUsIGJhY2spID0+IHtcbiAgICAgIGNvbnN0IHZhbHVlVHlwZSA9IHZhbHVlLmdldFR5cGUoKSxcbiAgICAgICAgICAgIHZhbHVlVHlwZUJvb2xlYW5UeXBlID0gdmFsdWVUeXBlLmlzQm9vbGVhblR5cGUoKTtcblxuICAgICAgaWYgKCF2YWx1ZVR5cGVCb29sZWFuVHlwZSkge1xuICAgICAgICBjb25zdCB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpLFxuICAgICAgICAgICAgICBtZXNzYWdlID0gYFRoZSAnJHt2YWx1ZVN0cmluZ30nIHZhbHVlJ3MgdHlwZSBpcyAnJHt2YWx1ZVR5cGV9JyB3aGVuIGl0IHNob3VsZCBiZSBvZiB0eXBlICcke0JPT0xFQU5fVFlQRV9OQU1FfScuYCxcbiAgICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICAgIHJldHVybiBiYWNrKGV4Y2VwdGlvbik7XG4gICAgICB9XG5cbiAgICAgIGNvbnN0IGJvb2xlYW4gPSB2YWx1ZS5nZXRCb29sZWFuKCk7XG5cbiAgICAgIHJldHVybiBmb3J3YXJkKGJvb2xlYW4sIGJhY2spO1xuICAgIH0sIGJhY2spO1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIkV2ZXJ5XCI7XG59KTtcbiJdLCJuYW1lcyI6WyJldmVyeSIsImNvbnRpbnVhdGlvblV0aWxpdGllcyIsImJyZWFrYWJsZSIsImJyZWFrUG9pbnRVdGlsaXRpZXMiLCJkZWZpbmUiLCJFdmVyeSIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJ2YXJpYWJsZSIsImFub255bW91c1Byb2NlZHVyZSIsImdldFZhcmlhYmxlIiwiZ2V0QW5vbnltb3VzUHJvY2VkdXJlIiwiZXZhbHVhdGUiLCJmb3J3YXJkIiwiYmFjayIsImV2ZXJ5U3RyaW5nIiwiZ2V0U3RyaW5nIiwidHJhY2UiLCJ2YWx1ZSIsInZhbHVlVHlwZSIsImdldFR5cGUiLCJ2YWx1ZVR5cGVMaXN0VHlwZSIsImlzTGlzdFR5cGUiLCJ2YWx1ZVN0cmluZyIsIm1lc3NhZ2UiLCJMSVNUX1RZUEVfTkFNRSIsImV4Y2VwdGlvbiIsIkV4Y2VwdGlvbiIsImZyb21NZXNzYWdlIiwibm9kZXMiLCJnZXROb2RlcyIsImV2YWx1YXRlQW5vbnltb3VzUHJvY2VkdXJlIiwiYm9vbGVhbiIsInZhbHVlRnJvbUJvb2xlYW4iLCJWYWx1ZXMiLCJlbGVtZW50cyIsInZhbHVlRnJvbU5vZGUiLCJ2YWx1ZXMiLCJmcm9tVmFsdWUiLCJ2YWx1ZVR5cGVCb29sZWFuVHlwZSIsImlzQm9vbGVhblR5cGUiLCJCT09MRUFOX1RZUEVfTkFNRSIsImdldEJvb2xlYW4iLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFjQTs7O2VBQUE7OztnQ0Fab0U7a0VB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
|
package/lib/element/label.js
CHANGED
|
@@ -13,7 +13,6 @@ const _elements = require("../elements");
|
|
|
13
13
|
const _context = require("../utilities/context");
|
|
14
14
|
const _instantiate = require("../process/instantiate");
|
|
15
15
|
const _element = require("../utilities/element");
|
|
16
|
-
const { breakPointToBreakPointJSON } = _occamlanguages.breakPointUtilities;
|
|
17
16
|
const _default = (0, _elements.define)(class Label extends _occamlanguages.Element {
|
|
18
17
|
constructor(context, string, node, breakPoint, name){
|
|
19
18
|
super(context, string, node, breakPoint);
|
|
@@ -28,13 +27,8 @@ const _default = (0, _elements.define)(class Label extends _occamlanguages.Eleme
|
|
|
28
27
|
}
|
|
29
28
|
toJSON() {
|
|
30
29
|
const string = this.getString();
|
|
31
|
-
let breakPoint;
|
|
32
|
-
breakPoint = this.getBreakPoint();
|
|
33
|
-
const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
|
|
34
|
-
breakPoint = breakPointJSON; ///
|
|
35
30
|
const json = {
|
|
36
|
-
string
|
|
37
|
-
breakPoint
|
|
31
|
+
string
|
|
38
32
|
};
|
|
39
33
|
return json;
|
|
40
34
|
}
|
|
@@ -49,4 +43,4 @@ const _default = (0, _elements.define)(class Label extends _occamlanguages.Eleme
|
|
|
49
43
|
}
|
|
50
44
|
});
|
|
51
45
|
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L2xhYmVsLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50IH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcbmltcG9ydCB7IGluc3RhbnRpYXRlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9jb250ZXh0XCI7XG5pbXBvcnQgeyBpbnN0YW50aWF0ZUxhYmVsIH0gZnJvbSBcIi4uL3Byb2Nlc3MvaW5zdGFudGlhdGVcIjtcbmltcG9ydCB7IG5hbWVGcm9tTGFiZWxOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9lbGVtZW50XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZShjbGFzcyBMYWJlbCBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIG5hbWUpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy5uYW1lID0gbmFtZTtcbiAgfVxuXG4gIGdldE5hbWUoKSB7XG4gICAgcmV0dXJuIHRoaXMubmFtZTtcbiAgfVxuXG4gIGNvbXBhcmVQcm9jZWR1cmVOYW1lKHByb2NlZHVyZU5hbWUpIHtcbiAgICBjb25zdCBwcm9jZWR1cmVOYW1lQ29tcGFyZXMgPSAodGhpcy5uYW1lID09PSBwcm9jZWR1cmVOYW1lKTtcblxuICAgIHJldHVybiBwcm9jZWR1cmVOYW1lQ29tcGFyZXM7XG4gIH1cblxuICB0b0pTT04oKSB7XG4gICAgY29uc3Qgc3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTtcblxuICAgIGNvbnN0IGpzb24gPSB7XG4gICAgICBzdHJpbmdcbiAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiTGFiZWxcIjtcblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgY29udGV4dCkge1xuICAgIHJldHVybiBpbnN0YW50aWF0ZSgoY29udGV4dCkgPT4ge1xuICAgICAgY29uc3QgeyBzdHJpbmcgfSA9IGpzb24sXG4gICAgICAgICAgICBsYWJlbE5vZGUgPSBpbnN0YW50aWF0ZUxhYmVsKHN0cmluZywgY29udGV4dCksXG4gICAgICAgICAgICBub2RlID0gbGFiZWxOb2RlLCAgLy8vXG4gICAgICAgICAgICBicmVha1BvaW50ID0gbnVsbCxcbiAgICAgICAgICAgIG5hbWUgPSBuYW1lRnJvbUxhYmVsTm9kZShsYWJlbE5vZGUsIGNvbnRleHQpO1xuXG4gICAgICBjb250ZXh0ID0gbnVsbDtcblxuICAgICAgY29uc3QgbGFiZWwgPSBuZXcgTGFiZWwoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBuYW1lKTtcblxuICAgICAgcmV0dXJuIGxhYmVsO1xuICAgIH0sIGNvbnRleHQpO1xuICB9XG59KTtcbiJdLCJuYW1lcyI6WyJkZWZpbmUiLCJMYWJlbCIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJuYW1lIiwiZ2V0TmFtZSIsImNvbXBhcmVQcm9jZWR1cmVOYW1lIiwicHJvY2VkdXJlTmFtZSIsInByb2NlZHVyZU5hbWVDb21wYXJlcyIsInRvSlNPTiIsImdldFN0cmluZyIsImpzb24iLCJmcm9tSlNPTiIsImluc3RhbnRpYXRlIiwibGFiZWxOb2RlIiwiaW5zdGFudGlhdGVMYWJlbCIsIm5hbWVGcm9tTGFiZWxOb2RlIiwibGFiZWwiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBQTs7O2dDQVB3QjswQkFFRDt5QkFDSzs2QkFDSzt5QkFDQztNQUVsQyxXQUFlQSxJQUFBQSxnQkFBTSxFQUFDLE1BQU1DLGNBQWNDLHVCQUFPO0lBQy9DLFlBQVlDLE9BQU8sRUFBRUMsTUFBTSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsSUFBSSxDQUFFO1FBQ25ELEtBQUssQ0FBQ0osU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxJQUFJLEdBQUdBO0lBQ2Q7SUFFQUMsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDRCxJQUFJO0lBQ2xCO0lBRUFFLHFCQUFxQkMsYUFBYSxFQUFFO1FBQ2xDLE1BQU1DLHdCQUF5QixJQUFJLENBQUNKLElBQUksS0FBS0c7UUFFN0MsT0FBT0M7SUFDVDtJQUVBQyxTQUFTO1FBQ1AsTUFBTVIsU0FBUyxJQUFJLENBQUNTLFNBQVM7UUFFN0IsTUFBTUMsT0FBTztZQUNYVjtRQUNGO1FBRUEsT0FBT1U7SUFDVDtJQUVBLE9BQU9QLE9BQU8sUUFBUTtJQUV0QixPQUFPUSxTQUFTRCxJQUFJLEVBQUVYLE9BQU8sRUFBRTtRQUM3QixPQUFPYSxJQUFBQSxvQkFBVyxFQUFDLENBQUNiO1lBQ2xCLE1BQU0sRUFBRUMsTUFBTSxFQUFFLEdBQUdVLE1BQ2JHLFlBQVlDLElBQUFBLDZCQUFnQixFQUFDZCxRQUFRRCxVQUNyQ0UsT0FBT1ksV0FDUFgsYUFBYSxNQUNiQyxPQUFPWSxJQUFBQSwwQkFBaUIsRUFBQ0YsV0FBV2Q7WUFFMUNBLFVBQVU7WUFFVixNQUFNaUIsUUFBUSxJQUFJbkIsTUFBTUUsU0FBU0MsUUFBUUMsTUFBTUMsWUFBWUM7WUFFM0QsT0FBT2E7UUFDVCxHQUFHakI7SUFDTDtBQUNGIn0=
|
|
@@ -19,7 +19,7 @@ function _interop_require_default(obj) {
|
|
|
19
19
|
default: obj
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
-
const { forEach } = _occamlanguages.continuationUtilities
|
|
22
|
+
const { forEach } = _occamlanguages.continuationUtilities;
|
|
23
23
|
const _default = (0, _elements.define)(class Parameters extends _occamlanguages.Element {
|
|
24
24
|
constructor(context, string, node, breakPoint, array){
|
|
25
25
|
super(context, string, node, breakPoint);
|
|
@@ -60,13 +60,8 @@ const _default = (0, _elements.define)(class Parameters extends _occamlanguages.
|
|
|
60
60
|
}
|
|
61
61
|
toJSON() {
|
|
62
62
|
const string = this.getString();
|
|
63
|
-
let breakPoint;
|
|
64
|
-
breakPoint = this.getBreakPoint();
|
|
65
|
-
const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
|
|
66
|
-
breakPoint = breakPointJSON; ///
|
|
67
63
|
const json = {
|
|
68
|
-
string
|
|
69
|
-
breakPoint
|
|
64
|
+
string
|
|
70
65
|
};
|
|
71
66
|
return json;
|
|
72
67
|
}
|
|
@@ -81,4 +76,4 @@ const _default = (0, _elements.define)(class Parameters extends _occamlanguages.
|
|
|
81
76
|
}
|
|
82
77
|
});
|
|
83
78
|
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3BhcmFtZXRlcnMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IEVsZW1lbnQsIGNvbnRpbnVhdGlvblV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IEV4Y2VwdGlvbiBmcm9tIFwiLi4vZXhjZXB0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi9lbGVtZW50c1wiO1xuaW1wb3J0IHsgaW5zdGFudGlhdGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2NvbnRleHRcIjtcbmltcG9ydCB7IGluc3RhbnRpYXRlUGFyYW1ldGVycyB9IGZyb20gXCIuLi9wcm9jZXNzL2luc3RhbnRpYXRlXCI7XG5pbXBvcnQgeyBwYXJhbWV0ZXJzQXJyYXlGcm9tUGFyYW1ldGVyc05vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2VsZW1lbnRcIjtcblxuY29uc3QgeyBmb3JFYWNoIH0gPSBjb250aW51YXRpb25VdGlsaXRpZXNcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lKGNsYXNzIFBhcmFtZXRlcnMgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBhcnJheSkge1xuICAgIHN1cGVyKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCk7XG5cbiAgICB0aGlzLmFycmF5ID0gYXJyYXk7XG4gIH1cblxuICBnZXRBcnJheSgpIHtcbiAgICByZXR1cm4gdGhpcy5hcnJheTtcbiAgfVxuXG4gIGdldExlbmd0aCgpIHtcbiAgICBjb25zdCBsZW5ndGggPSB0aGlzLmFycmF5Lmxlbmd0aDtcblxuICAgIHJldHVybiBsZW5ndGg7XG4gIH1cblxuICBnZXRQYXJhbWV0ZXIoaW5kZXgpIHtcbiAgICBjb25zdCBwYXJhbWV0ZXIgPSB0aGlzLmFycmF5W2luZGV4XSB8fCBudWxsO1xuXG4gICAgcmV0dXJuIHBhcmFtZXRlcjtcbiAgfVxuXG4gIGZvckVhY2hQYXJhbWV0ZXIoY2FsbGJhY2ssIGZvcndhcmQsIGJhY2spIHtcbiAgICByZXR1cm4gZm9yRWFjaCh0aGlzLmFycmF5LCBjYWxsYmFjaywgZm9yd2FyZCwgYmFjayk7XG4gIH1cblxuICBjb21wYXJlVmFsdWVzKHZhbHVlcywgY29udGV4dCwgZm9yd2FyZCwgYmFjaykge1xuICAgIGNvbnN0IHZhbHVlc1N0cmluZyA9IHZhbHVlcy5nZXRTdHJpbmcoKSxcbiAgICAgICAgICBwYXJhbWV0ZXJzU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBDb21wYXJpbmcgdGhlICcke3ZhbHVlc1N0cmluZ30nIHZhbHVlcyBhZ2FpbnN0IHRoZSAnJHtwYXJhbWV0ZXJzU3RyaW5nfScgcGFyYW1ldGVycy4uLmApO1xuXG4gICAgY29uc3QgdmFsdWVzTGVuZ3RoID0gdmFsdWVzLmdldExlbmd0aCgpLFxuICAgICAgICAgIHBhcmFtZXRlcnNMZW5ndGggPSB0aGlzLmdldExlbmd0aCgpO1xuXG4gICAgaWYgKHZhbHVlc0xlbmd0aCAhPT0gcGFyYW1ldGVyc0xlbmd0aCkge1xuICAgICAgY29uc3QgbWVzc2FnZSA9IGBUaGUgJyR7dmFsdWVzU3RyaW5nfScgZXhwcmVzc2lvbnMgYW5kICcke3BhcmFtZXRlcnNTdHJpbmd9JyBwYXJhbWV0ZXJzIGFyZSBub3Qgb2YgdGhlIHNhbWUgbGVuZ3RoLmAsXG4gICAgICAgICAgICBleGNlcHRpb24gPSBFeGNlcHRpb24uZnJvbU1lc3NhZ2UobWVzc2FnZSk7XG5cbiAgICAgIHJldHVybiBiYWNrKGV4Y2VwdGlvbik7XG4gICAgfVxuXG4gICAgcmV0dXJuIHRoaXMuZm9yRWFjaFBhcmFtZXRlcigocGFyYW1ldGVyLCBmb3J3YXJkLCBiYWNrLCBpbmRleCkgPT4ge1xuICAgICAgaWYgKHBhcmFtZXRlciA9PT0gbnVsbCkge1xuICAgICAgICByZXR1cm4gZm9yd2FyZChiYWNrKTtcbiAgICAgIH1cblxuICAgICAgY29uc3QgdmFsdWUgPSB2YWx1ZXMuZ2V0VmFsdWUoaW5kZXgpO1xuXG4gICAgICByZXR1cm4gcGFyYW1ldGVyLmNvbXBhcmVWYWx1ZSh2YWx1ZSwgY29udGV4dCwgZm9yd2FyZCwgYmFjayk7XG4gICAgfSwgKGJhY2spID0+IHtcbiAgICAgIGNvbnRleHQuZGVidWcoYC4uLmNvbXBhcmVkIHRoZSAnJHt2YWx1ZXNTdHJpbmd9JyB2YWx1ZXMgYWdhaW5zdCB0aGUgJyR7cGFyYW1ldGVyc1N0cmluZ30nIHBhcmFtZXRlcnMuYCk7XG5cbiAgICAgIHJldHVybiBmb3J3YXJkKGJhY2spO1xuICAgIH0sIGJhY2spO1xuICB9XG5cbiAgdG9KU09OKCkge1xuICAgIGNvbnN0IHN0cmluZyA9IHRoaXMuZ2V0U3RyaW5nKCk7XG5cbiAgICBjb25zdCBqc29uID0ge1xuICAgICAgc3RyaW5nXG4gICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIlBhcmFtZXRlcnNcIjtcblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgY29udGV4dCkge1xuICAgIHJldHVybiBpbnN0YW50aWF0ZSgoY29udGV4dCkgPT4ge1xuICAgICAgY29uc3QgeyBzdHJpbmcgfSA9IGpzb24sXG4gICAgICAgICAgICBwYXJhbWV0ZXJzTm9kZSA9IGluc3RhbnRpYXRlUGFyYW1ldGVycyhzdHJpbmcsIGNvbnRleHQpLFxuICAgICAgICAgICAgbm9kZSA9IHBhcmFtZXRlcnNOb2RlLCAgLy8vXG4gICAgICAgICAgICBicmVha1BvaW50ID0gbnVsbCxcbiAgICAgICAgICAgIHBhcmFtZXRlcnNBcnJheSA9IHBhcmFtZXRlcnNBcnJheUZyb21QYXJhbWV0ZXJzTm9kZShwYXJhbWV0ZXJzTm9kZSwgY29udGV4dCksXG4gICAgICAgICAgICBhcnJheSA9IHBhcmFtZXRlcnNBcnJheTsgLy8vXG5cbiAgICAgIGNvbnRleHQgPSBudWxsO1xuXG4gICAgICBjb25zdCBwYXJhbWV0ZXJzID0gbmV3IFBhcmFtZXRlcnMoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBhcnJheSk7XG5cbiAgICAgIHJldHVybiBwYXJhbWV0ZXJzO1xuICAgIH0sIGNvbnRleHQpO1xuICB9XG59KTtcbiJdLCJuYW1lcyI6WyJmb3JFYWNoIiwiY29udGludWF0aW9uVXRpbGl0aWVzIiwiZGVmaW5lIiwiUGFyYW1ldGVycyIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJhcnJheSIsImdldEFycmF5IiwiZ2V0TGVuZ3RoIiwibGVuZ3RoIiwiZ2V0UGFyYW1ldGVyIiwiaW5kZXgiLCJwYXJhbWV0ZXIiLCJmb3JFYWNoUGFyYW1ldGVyIiwiY2FsbGJhY2siLCJmb3J3YXJkIiwiYmFjayIsImNvbXBhcmVWYWx1ZXMiLCJ2YWx1ZXMiLCJ2YWx1ZXNTdHJpbmciLCJnZXRTdHJpbmciLCJwYXJhbWV0ZXJzU3RyaW5nIiwidHJhY2UiLCJ2YWx1ZXNMZW5ndGgiLCJwYXJhbWV0ZXJzTGVuZ3RoIiwibWVzc2FnZSIsImV4Y2VwdGlvbiIsIkV4Y2VwdGlvbiIsImZyb21NZXNzYWdlIiwidmFsdWUiLCJnZXRWYWx1ZSIsImNvbXBhcmVWYWx1ZSIsImRlYnVnIiwidG9KU09OIiwianNvbiIsIm5hbWUiLCJmcm9tSlNPTiIsImluc3RhbnRpYXRlIiwicGFyYW1ldGVyc05vZGUiLCJpbnN0YW50aWF0ZVBhcmFtZXRlcnMiLCJwYXJhbWV0ZXJzQXJyYXkiLCJwYXJhbWV0ZXJzQXJyYXlGcm9tUGFyYW1ldGVyc05vZGUiLCJwYXJhbWV0ZXJzIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFhQTs7O2VBQUE7OztnQ0FYK0M7a0VBRXpCOzBCQUVDO3lCQUNLOzZCQUNVO3lCQUNZOzs7Ozs7QUFFbEQsTUFBTSxFQUFFQSxPQUFPLEVBQUUsR0FBR0MscUNBQXFCO01BRXpDLFdBQWVDLElBQUFBLGdCQUFNLEVBQUMsTUFBTUMsbUJBQW1CQyx1QkFBTztJ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
|
package/lib/element/procedure.js
CHANGED
|
@@ -61,15 +61,15 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
|
|
|
61
61
|
const node = this.getNode(), context = this.getContext(), procedureNode = node;
|
|
62
62
|
this.returnBlock = (0, _element.returnBlockFromProcedureNode)(procedureNode, context);
|
|
63
63
|
}
|
|
64
|
-
verify(context, forward, back) {
|
|
64
|
+
verify = breakable(function(context, forward, back) {
|
|
65
65
|
const procedureString = this.getString();
|
|
66
66
|
context.trace(`Verifying the '${procedureString}' function...`);
|
|
67
67
|
const procedure = this; ///
|
|
68
68
|
context.addProcedure(procedure);
|
|
69
69
|
context.debug(`...verified the '${procedureString}' function.`);
|
|
70
70
|
return forward(context, back);
|
|
71
|
-
}
|
|
72
|
-
|
|
71
|
+
});
|
|
72
|
+
evaluate = breakable(function(values, context, forward, back) {
|
|
73
73
|
forward = cut(forward, back);
|
|
74
74
|
const procedureString = this.getString(); ///
|
|
75
75
|
context.trace(`Calling the '${procedureString}' function...`);
|
|
@@ -91,7 +91,7 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
|
|
|
91
91
|
const context = this.getContext(), procedureString = this.getString(); ///
|
|
92
92
|
context.trace(`Calling the '${procedureString}' function nominally...`);
|
|
93
93
|
const values = (0, _values.valuesFromNominalValues)(nominalValues, context);
|
|
94
|
-
return this.
|
|
94
|
+
return this.evaluate(values, context, (value, back)=>{
|
|
95
95
|
context.debug(`...called the '${procedureString}' function nominally.`);
|
|
96
96
|
return forward(value, back);
|
|
97
97
|
}, back);
|
|
@@ -118,4 +118,4 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
|
|
|
118
118
|
}
|
|
119
119
|
});
|
|
120
120
|
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/procedure.js"],"sourcesContent":["\"use strict\";\n\nimport { Element, breakPointUtilities, continuationUtilities } from \"occam-languages\";\n\nimport Exception from \"../exception\";\n\nimport { define } from \"../elements\";\nimport { valuesFromNominalValues } from \"../utilities/values\";\nimport { returnBlockFromProcedureNode } from \"../utilities/element\";\nimport { variablesFromValuesAndParameters } from \"../utilities/parameters\";\nimport { typeFromJSON, labelFromJSON, parametersFromJSON, typeToTypeJSON, labelToLabelJSON, parametersToParametersJSON } from \"../utilities/json\";\n\nconst { cut } = continuationUtilities,\n      { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = breakPointUtilities;\n\nexport default define(class Procedure extends Element {\n  constructor(context, string, node, breakPoint, type, label, parameters, returnBlock) {\n    super(context, string, node, breakPoint);\n\n    this.type = type;\n    this.label = label;\n    this.parameters = parameters;\n    this.returnBlock = returnBlock;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  getLabel() {\n    return this.label;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  getReturnBlock() {\n    return this.returnBlock;\n  }\n\n  getName() { return this.label.getName(); }\n\n  isBoolean() {\n    const type = this.getType(),\n          booleanType = type.isBooleanType(),\n          boolean = booleanType;  ///\n\n    return boolean;\n  }\n\n  getReturnStatement() { return this.returnBlock.getReturnStatement(); }\n\n  compareProcedureName(procedureName) { return this.label.compareProcedureName(procedureName); }\n\n  guaranteeReturnBlock() {\n    if (this.returnBlock != null) {\n      return;\n    }\n\n    const node = this.getNode(),\n          context = this.getContext(),\n          procedureNode = node;\n\n    this.returnBlock = returnBlockFromProcedureNode(procedureNode, context);\n  }\n\n  verify(context, forward, back) {\n    const procedureString = this.getString();\n\n    context.trace(`Verifying the '${procedureString}' function...`)\n\n    const procedure = this; ///\n\n    context.addProcedure(procedure);\n\n    context.debug(`...verified the '${procedureString}' function.`)\n\n    return forward(context, back);\n  }\n\n  call = breakable(function (values, context, forward, back) {\n    forward = cut(forward, back);\n\n    const procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function...`);\n\n    return this.parameters.compareValues(values, context, (back) => {\n      this.guaranteeReturnBlock();\n\n      const variables = variablesFromValuesAndParameters(values, this.parameters, context);\n\n      return this.returnBlock.evaluate(variables, context, (value, back) => {\n        const valueType = value.getType(),\n              typeEqualToValueType = this.type.isEqualTo(valueType);\n\n        if (!typeEqualToValueType) {\n          const typeString = this.type.getString(),\n                valueString = value.getString(),\n                valueTypeString = valueType.getString(),\n                message = `The '${valueString}' value's '${valueTypeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`,\n                exception = Exception.fromMessage(message);\n\n          return back(exception);\n        }\n\n        context.debug(`...called the '${procedureString}' function.`);\n\n        return forward(value, back);\n      }, back);\n    }, back);\n  });\n\n  callNominally(nominalValues, forward, back) {\n    const context = this.getContext(),\n          procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function nominally...`);\n\n    const values = valuesFromNominalValues(nominalValues, context);\n\n    return this.call(values, context, (value, back) => {\n      context.debug(`...called the '${procedureString}' function nominally.`);\n\n      return forward(value, back);\n    }, back);\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          labelJSON = labelToLabelJSON(this.label),\n          parametersJSON = parametersToParametersJSON(this.parameters),\n          string = this.getString();\n\n    let breakPoint;\n\n    breakPoint = this.getBreakPoint();\n\n    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);\n\n    breakPoint = breakPointJSON;  ///\n\n    const type = typeJSON,  ///\n          label = labelJSON,  ///\n          parameters = parametersJSON,  ///\n          json = {\n            string,\n            breakPoint,\n            type,\n            label,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"Procedure\";\n\n  static fromJSON(json, context) {\n    const { string } = json,\n          breakPoint = breakPointFromJSON(json),\n          type = typeFromJSON(json, context),\n          label = labelFromJSON(json, context),\n          parameters = parametersFromJSON(json, context),\n          procedureNode = context.findProcedureNode(label),\n          returnBlock = null, ///\n          node = procedureNode, ///\n          procedure = new Procedure(context, string, node, breakPoint, type, label, parameters, returnBlock);\n\n    return procedure;\n  }\n});\n"],"names":["cut","continuationUtilities","breakable","breakPointFromJSON","breakPointToBreakPointJSON","breakPointUtilities","define","Procedure","Element","context","string","node","breakPoint","type","label","parameters","returnBlock","getType","getLabel","getParameters","getReturnBlock","getName","isBoolean","booleanType","isBooleanType","boolean","getReturnStatement","compareProcedureName","procedureName","guaranteeReturnBlock","getNode","getContext","procedureNode","returnBlockFromProcedureNode","verify","forward","back","procedureString","getString","trace","procedure","addProcedure","debug","call","values","compareValues","variables","variablesFromValuesAndParameters","evaluate","value","valueType","typeEqualToValueType","isEqualTo","typeString","valueString","valueTypeString","message","exception","Exception","fromMessage","callNominally","nominalValues","valuesFromNominalValues","toJSON","typeJSON","typeToTypeJSON","labelJSON","labelToLabelJSON","parametersJSON","parametersToParametersJSON","getBreakPoint","breakPointJSON","json","name","fromJSON","typeFromJSON","labelFromJSON","parametersFromJSON","findProcedureNode"],"mappings":"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"}
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/procedure.js"],"sourcesContent":["\"use strict\";\n\nimport { Element, breakPointUtilities, continuationUtilities } from \"occam-languages\";\n\nimport Exception from \"../exception\";\n\nimport { define } from \"../elements\";\nimport { valuesFromNominalValues } from \"../utilities/values\";\nimport { returnBlockFromProcedureNode } from \"../utilities/element\";\nimport { variablesFromValuesAndParameters } from \"../utilities/parameters\";\nimport { typeFromJSON, labelFromJSON, parametersFromJSON, typeToTypeJSON, labelToLabelJSON, parametersToParametersJSON } from \"../utilities/json\";\n\nconst { cut } = continuationUtilities,\n      { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = breakPointUtilities;\n\nexport default define(class Procedure extends Element {\n  constructor(context, string, node, breakPoint, type, label, parameters, returnBlock) {\n    super(context, string, node, breakPoint);\n\n    this.type = type;\n    this.label = label;\n    this.parameters = parameters;\n    this.returnBlock = returnBlock;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  getLabel() {\n    return this.label;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  getReturnBlock() {\n    return this.returnBlock;\n  }\n\n  getName() { return this.label.getName(); }\n\n  isBoolean() {\n    const type = this.getType(),\n          booleanType = type.isBooleanType(),\n          boolean = booleanType;  ///\n\n    return boolean;\n  }\n\n  getReturnStatement() { return this.returnBlock.getReturnStatement(); }\n\n  compareProcedureName(procedureName) { return this.label.compareProcedureName(procedureName); }\n\n  guaranteeReturnBlock() {\n    if (this.returnBlock != null) {\n      return;\n    }\n\n    const node = this.getNode(),\n          context = this.getContext(),\n          procedureNode = node;\n\n    this.returnBlock = returnBlockFromProcedureNode(procedureNode, context);\n  }\n\n  verify = breakable(function (context, forward, back) {\n    const procedureString = this.getString();\n\n    context.trace(`Verifying the '${procedureString}' function...`)\n\n    const procedure = this; ///\n\n    context.addProcedure(procedure);\n\n    context.debug(`...verified the '${procedureString}' function.`)\n\n    return forward(context, back);\n  });\n\n  evaluate = breakable(function (values, context, forward, back) {\n    forward = cut(forward, back);\n\n    const procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function...`);\n\n    return this.parameters.compareValues(values, context, (back) => {\n      this.guaranteeReturnBlock();\n\n      const variables = variablesFromValuesAndParameters(values, this.parameters, context);\n\n      return this.returnBlock.evaluate(variables, context, (value, back) => {\n        const valueType = value.getType(),\n              typeEqualToValueType = this.type.isEqualTo(valueType);\n\n        if (!typeEqualToValueType) {\n          const typeString = this.type.getString(),\n                valueString = value.getString(),\n                valueTypeString = valueType.getString(),\n                message = `The '${valueString}' value's '${valueTypeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`,\n                exception = Exception.fromMessage(message);\n\n          return back(exception);\n        }\n\n        context.debug(`...called the '${procedureString}' function.`);\n\n        return forward(value, back);\n      }, back);\n    }, back);\n  });\n\n  callNominally(nominalValues, forward, back) {\n    const context = this.getContext(),\n          procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function nominally...`);\n\n    const values = valuesFromNominalValues(nominalValues, context);\n\n    return this.evaluate(values, context, (value, back) => {\n      context.debug(`...called the '${procedureString}' function nominally.`);\n\n      return forward(value, back);\n    }, back);\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          labelJSON = labelToLabelJSON(this.label),\n          parametersJSON = parametersToParametersJSON(this.parameters),\n          string = this.getString();\n\n    let breakPoint;\n\n    breakPoint = this.getBreakPoint();\n\n    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);\n\n    breakPoint = breakPointJSON;  ///\n\n    const type = typeJSON,  ///\n          label = labelJSON,  ///\n          parameters = parametersJSON,  ///\n          json = {\n            string,\n            breakPoint,\n            type,\n            label,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"Procedure\";\n\n  static fromJSON(json, context) {\n    const { string } = json,\n          breakPoint = breakPointFromJSON(json),\n          type = typeFromJSON(json, context),\n          label = labelFromJSON(json, context),\n          parameters = parametersFromJSON(json, context),\n          procedureNode = context.findProcedureNode(label),\n          returnBlock = null, ///\n          node = procedureNode, ///\n          procedure = new Procedure(context, string, node, breakPoint, type, label, parameters, returnBlock);\n\n    return procedure;\n  }\n});\n"],"names":["cut","continuationUtilities","breakable","breakPointFromJSON","breakPointToBreakPointJSON","breakPointUtilities","define","Procedure","Element","context","string","node","breakPoint","type","label","parameters","returnBlock","getType","getLabel","getParameters","getReturnBlock","getName","isBoolean","booleanType","isBooleanType","boolean","getReturnStatement","compareProcedureName","procedureName","guaranteeReturnBlock","getNode","getContext","procedureNode","returnBlockFromProcedureNode","verify","forward","back","procedureString","getString","trace","procedure","addProcedure","debug","evaluate","values","compareValues","variables","variablesFromValuesAndParameters","value","valueType","typeEqualToValueType","isEqualTo","typeString","valueString","valueTypeString","message","exception","Exception","fromMessage","callNominally","nominalValues","valuesFromNominalValues","toJSON","typeJSON","typeToTypeJSON","labelJSON","labelToLabelJSON","parametersJSON","parametersToParametersJSON","getBreakPoint","breakPointJSON","json","name","fromJSON","typeFromJSON","labelFromJSON","parametersFromJSON","findProcedureNode"],"mappings":"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"}
|
|
@@ -17,7 +17,6 @@ function _interop_require_default(obj) {
|
|
|
17
17
|
default: obj
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
|
-
const { breakable } = _occamlanguages.breakPointUtilities;
|
|
21
20
|
const _default = (0, _elements.define)(class ProcedureCall extends _occamlanguages.Element {
|
|
22
21
|
constructor(context, string, node, breakPoint, reference, values){
|
|
23
22
|
super(context, string, node, breakPoint);
|
|
@@ -33,7 +32,7 @@ const _default = (0, _elements.define)(class ProcedureCall extends _occamlanguag
|
|
|
33
32
|
getProcedureName() {
|
|
34
33
|
return this.reference.getProcedureName();
|
|
35
34
|
}
|
|
36
|
-
evaluate
|
|
35
|
+
evaluate(context, forward, back) {
|
|
37
36
|
const procedureCallString = this.getString(); ///
|
|
38
37
|
context.trace(`Evaluating the '${procedureCallString}' function call...`);
|
|
39
38
|
const procedureName = this.getProcedureName(), procedurePresent = context.isProcedurePresentByProcedureName(procedureName);
|
|
@@ -44,15 +43,15 @@ const _default = (0, _elements.define)(class ProcedureCall extends _occamlanguag
|
|
|
44
43
|
const procedure = context.findProcedureByProcedureName(procedureName);
|
|
45
44
|
return this.values.evaluate(context, (values, back)=>{
|
|
46
45
|
return (0, _context.free)((context)=>{
|
|
47
|
-
return procedure.
|
|
46
|
+
return procedure.evaluate(values, context, (value, back)=>{
|
|
48
47
|
const valueString = value.getString();
|
|
49
48
|
context.debug(`...evaluated the '${procedureCallString}' function call as '${valueString}'.`);
|
|
50
49
|
return forward(value, back);
|
|
51
50
|
}, back);
|
|
52
51
|
}, context);
|
|
53
52
|
}, back);
|
|
54
|
-
}
|
|
53
|
+
}
|
|
55
54
|
static name = "ProcedureCall";
|
|
56
55
|
});
|
|
57
56
|
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3Byb2NlZHVyZUNhbGwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IEVsZW1lbnQgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5pbXBvcnQgeyBmcmVlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9jb250ZXh0XCI7XG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lKGNsYXNzIFByb2NlZHVyZUNhbGwgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCByZWZlcmVuY2UsIHZhbHVlcykge1xuICAgIHN1cGVyKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCk7XG5cbiAgICB0aGlzLnJlZmVyZW5jZSA9IHJlZmVyZW5jZTtcbiAgICB0aGlzLnZhbHVlcyA9IHZhbHVlcztcbiAgfVxuXG4gIGdldFJlZmVyZW5jZSgpIHtcbiAgICByZXR1cm4gdGhpcy5yZWZlcmVuY2U7XG4gIH1cblxuICBnZXRWYWx1ZXMoKSB7XG4gICAgcmV0dXJuIHRoaXMudmFsdWVzO1xuICB9XG5cbiAgZ2V0UHJvY2VkdXJlTmFtZSgpIHsgcmV0dXJuIHRoaXMucmVmZXJlbmNlLmdldFByb2NlZHVyZU5hbWUoKTsgfVxuXG4gIGV2YWx1YXRlKGNvbnRleHQsIGZvcndhcmQsIGJhY2spIHtcbiAgICBjb25zdCBwcm9jZWR1cmVDYWxsU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgIC8vL1xuXG4gICAgY29udGV4dC50cmFjZShgRXZhbHVhdGluZyB0aGUgJyR7cHJvY2VkdXJlQ2FsbFN0cmluZ30nIGZ1bmN0aW9uIGNhbGwuLi5gKTtcblxuICAgIGNvbnN0IHByb2NlZHVyZU5hbWUgPSB0aGlzLmdldFByb2NlZHVyZU5hbWUoKSxcbiAgICAgICAgICBwcm9jZWR1cmVQcmVzZW50ID0gY29udGV4dC5pc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSk7XG5cbiAgICBpZiAoIXByb2NlZHVyZVByZXNlbnQpIHtcbiAgICAgIGNvbnN0IG1lc3NhZ2UgPSBgVGhlICcke3Byb2NlZHVyZUNhbGxTdHJpbmd9JyBmdW5jdGlvbiBpcyBub3QgcHJlc2VudC4nYCxcbiAgICAgICAgICAgIGV4Y2VwdGlvbiA9IEV4Y2VwdGlvbi5mcm9tTWVzc2FnZShtZXNzYWdlKTtcblxuICAgICAgcmV0dXJuIGJhY2soZXhjZXB0aW9uKTtcbiAgICB9XG5cbiAgICBjb25zdCBwcm9jZWR1cmUgPSBjb250ZXh0LmZpbmRQcm9jZWR1cmVCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSk7XG5cbiAgICByZXR1cm4gdGhpcy52YWx1ZXMuZXZhbHVhdGUoY29udGV4dCwgKHZhbHVlcywgYmFjaykgPT4ge1xuICAgICAgcmV0dXJuIGZyZWUoKGNvbnRleHQpID0+IHtcbiAgICAgICAgcmV0dXJuIHByb2NlZHVyZS5ldmFsdWF0ZSh2YWx1ZXMsIGNvbnRleHQsICh2YWx1ZSwgYmFjaykgPT4ge1xuICAgICAgICAgIGNvbnN0IHZhbHVlU3RyaW5nID0gdmFsdWUuZ2V0U3RyaW5nKCk7XG5cbiAgICAgICAgICBjb250ZXh0LmRlYnVnKGAuLi5ldmFsdWF0ZWQgdGhlICcke3Byb2NlZHVyZUNhbGxTdHJpbmd9JyBmdW5jdGlvbiBjYWxsIGFzICcke3ZhbHVlU3RyaW5nfScuYCk7XG5cbiAgICAgICAgICByZXR1cm4gZm9yd2FyZCh2YWx1ZSwgYmFjayk7XG4gICAgICAgIH0sIGJhY2spO1xuICAgICAgfSwgY29udGV4dCk7XG4gICAgfSwgYmFjayk7XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiUHJvY2VkdXJlQ2FsbFwiO1xufSk7XG4iXSwibmFtZXMiOlsiZGVmaW5lIiwiUHJvY2VkdXJlQ2FsbCIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJyZWZlcmVuY2UiLCJ2YWx1ZXMiLCJnZXRSZWZlcmVuY2UiLCJnZXRWYWx1ZXMiLCJnZXRQcm9jZWR1cmVOYW1lIiwiZXZhbHVhdGUiLCJmb3J3YXJkIiwiYmFjayIsInByb2NlZHVyZUNhbGxTdHJpbmciLCJnZXRTdHJpbmciLCJ0cmFjZSIsInByb2NlZHVyZU5hbWUiLCJwcm9jZWR1cmVQcmVzZW50IiwiaXNQcm9jZWR1cmVQcmVzZW50QnlQcm9jZWR1cmVOYW1lIiwibWVzc2FnZSIsImV4Y2VwdGlvbiIsIkV4Y2VwdGlvbiIsImZyb21NZXNzYWdlIiwicHJvY2VkdXJlIiwiZmluZFByb2NlZHVyZUJ5UHJvY2VkdXJlTmFtZSIsImZyZWUiLCJ2YWx1ZSIsInZhbHVlU3RyaW5nIiwiZGVidWciLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFTQTs7O2VBQUE7OztnQ0FQd0I7a0VBRUY7eUJBRUQ7MEJBQ0U7Ozs7OztNQUV2QixXQUFlQSxJQUFBQSxnQkFBTSxFQUFDLE1BQU1DLHNCQUFzQkMsdUJBQU87SUFDdkQsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksRUFBRUMsVUFBVSxFQUFFQyxTQUFTLEVBQUVDLE1BQU0sQ0FBRTtRQUNoRSxLQUFLLENBQUNMLFNBQVNDLFFBQVFDLE1BQU1DO1FBRTdCLElBQUksQ0FBQ0MsU0FBUyxHQUFHQTtRQUNqQixJQUFJLENBQUNDLE1BQU0sR0FBR0E7SUFDaEI7SUFFQUMsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDRixTQUFTO0lBQ3ZCO0lBRUFHLFlBQVk7UUFDVixPQUFPLElBQUksQ0FBQ0YsTUFBTTtJQUNwQjtJQUVBRyxtQkFBbUI7UUFBRSxPQUFPLElBQUksQ0FBQ0osU0FBUyxDQUFDSSxnQkFBZ0I7SUFBSTtJQUUvREMsU0FBU1QsT0FBTyxFQUFFVSxPQUFPLEVBQUVDLElBQUksRUFBRTtRQUMvQixNQUFNQyxzQkFBc0IsSUFBSSxDQUFDQyxTQUFTLElBQUssR0FBRztRQUVsRGIsUUFBUWMsS0FBSyxDQUFDLENBQUMsZ0JBQWdCLEVBQUVGLG9CQUFvQixrQkFBa0IsQ0FBQztRQUV4RSxNQUFNRyxnQkFBZ0IsSUFBSSxDQUFDUCxnQkFBZ0IsSUFDckNRLG1CQUFtQmhCLFFBQVFpQixpQ0FBaUMsQ0FBQ0Y7UUFFbkUsSUFBSSxDQUFDQyxrQkFBa0I7WUFDckIsTUFBTUUsVUFBVSxDQUFDLEtBQUssRUFBRU4sb0JBQW9CLDJCQUEyQixDQUFDLEVBQ2xFTyxZQUFZQyxrQkFBUyxDQUFDQyxXQUFXLENBQUNIO1lBRXhDLE9BQU9QLEtBQUtRO1FBQ2Q7UUFFQSxNQUFNRyxZQUFZdEIsUUFBUXVCLDRCQUE0QixDQUFDUjtRQUV2RCxPQUFPLElBQUksQ0FBQ1YsTUFBTSxDQUFDSSxRQUFRLENBQUNULFNBQVMsQ0FBQ0ssUUFBUU07WUFDNUMsT0FBT2EsSUFBQUEsYUFBSSxFQUFDLENBQUN4QjtnQkFDWCxPQUFPc0IsVUFBVWIsUUFBUSxDQUFDSixRQUFRTCxTQUFTLENBQUN5QixPQUFPZDtvQkFDakQsTUFBTWUsY0FBY0QsTUFBTVosU0FBUztvQkFFbkNiLFFBQVEyQixLQUFLLENBQUMsQ0FBQyxrQkFBa0IsRUFBRWYsb0JBQW9CLG9CQUFvQixFQUFFYyxZQUFZLEVBQUUsQ0FBQztvQkFFNUYsT0FBT2hCLFFBQVFlLE9BQU9kO2dCQUN4QixHQUFHQTtZQUNMLEdBQUdYO1FBQ0wsR0FBR1c7SUFDTDtJQUVBLE9BQU9pQixPQUFPLGdCQUFnQjtBQUNoQyJ9
|
package/lib/element/reduce.js
CHANGED
|
@@ -88,7 +88,7 @@ const _default = (0, _elements.define)(class Reduce extends _occamlanguages.Elem
|
|
|
88
88
|
const primitiveValue = value.getPrimitiveValue(), nominalValues = primitiveValue; ///
|
|
89
89
|
return this.initialValue.evaluate(context, (initialValue, back)=>{
|
|
90
90
|
return reduce(nominalValues, (currentValue, nominalValue, forward, back)=>{
|
|
91
|
-
return this.
|
|
91
|
+
return this.evaluateAnonymousProcedure(currentValue, nominalValue, context, forward, back);
|
|
92
92
|
}, initialValue, (value, back)=>{
|
|
93
93
|
const valueString = value.getString();
|
|
94
94
|
context.trace(`...evaluated the '${reduceString}' reduce as '${valueString}'.`);
|
|
@@ -97,16 +97,16 @@ const _default = (0, _elements.define)(class Reduce extends _occamlanguages.Elem
|
|
|
97
97
|
}, back);
|
|
98
98
|
}, back);
|
|
99
99
|
});
|
|
100
|
-
|
|
100
|
+
evaluateAnonymousProcedure(currentValue, nominalValue, context, forward, back) {
|
|
101
101
|
let value;
|
|
102
102
|
const { Values } = _elements.default;
|
|
103
103
|
value = currentValue; ///
|
|
104
104
|
const values = Values.fromValue(value, context);
|
|
105
105
|
value = (0, _value.valueFromNominalValue)(nominalValue);
|
|
106
106
|
values.addValue(value);
|
|
107
|
-
return this.anonymousProcedure.
|
|
107
|
+
return this.anonymousProcedure.evaluate(values, context, forward, back);
|
|
108
108
|
}
|
|
109
109
|
static name = "Reduce";
|
|
110
110
|
});
|
|
111
111
|
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3JlZHVjZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCwgYnJlYWtQb2ludFV0aWxpdGllcywgY29udGludWF0aW9uVXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuXG5pbXBvcnQgZWxlbWVudHMgZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgRXhjZXB0aW9uIGZyb20gXCIuLi9leGNlcHRpb25cIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgeyBMSVNUX1RZUEVfTkFNRSB9IGZyb20gXCIuLi90eXBlTmFtZXNcIjtcbmltcG9ydCB7IHZhbHVlRnJvbU5vbWluYWxWYWx1ZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvdmFsdWVcIjtcblxuY29uc3QgeyByZWR1Y2UgfSA9IGNvbnRpbnVhdGlvblV0aWxpdGllcyxcbiAgICAgIHsgYnJlYWthYmxlIH0gPSBicmVha1BvaW50VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgUmVkdWNlIGV4dGVuZHMgRWxlbWVudCB7XG4gIGNvbnN0cnVjdG9yKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgdmFyaWFibGUsIGluaXRpYWxWYWx1ZSwgYW5vbnltb3VzUHJvY2VkdXJlKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcblxuICAgIHRoaXMudmFyaWFibGUgPSB2YXJpYWJsZTtcbiAgICB0aGlzLmluaXRpYWxWYWx1ZSA9IGluaXRpYWxWYWx1ZTtcbiAgICB0aGlzLmFub255bW91c1Byb2NlZHVyZSA9IGFub255bW91c1Byb2NlZHVyZTtcbiAgfVxuXG4gIGdldFZhcmlhYmxlKCkge1xuICAgIHJldHVybiB0aGlzLnZhcmlhYmxlO1xuICB9XG5cbiAgZ2V0SW5pdGlhbFZhbHVlKCkge1xuICAgIHJldHVybiB0aGlzLmluaXRpYWxWYWx1ZTtcbiAgfVxuXG4gIGdldEFub255bW91c1Byb2NlZHVyZSgpIHtcbiAgICByZXR1cm4gdGhpcy5hbm9ueW1vdXNQcm9jZWR1cmU7XG4gIH1cblxuICBldmFsdWF0ZSA9IGJyZWFrYWJsZShmdW5jdGlvbiAoY29udGV4dCwgZm9yd2FyZCwgYmFjaykge1xuICAgIGNvbnN0IHJlZHVjZVN0cmluZyA9IHRoaXMuZ2V0U3RyaW5nKCk7XG5cbiAgICBjb250ZXh0LnRyYWNlKGBFdmFsdWF0aW5nIHRoZSAnJHtyZWR1Y2VTdHJpbmd9JyByZWR1Y2UuLi5gKTtcblxuICAgIHJldHVybiB0aGlzLnZhcmlhYmxlLmV2YWx1YXRlKGNvbnRleHQsICh2YWx1ZSwgYmFjaykgPT4ge1xuICAgICAgY29uc3QgdmFsdWVUeXBlID0gdmFsdWUuZ2V0VHlwZSgpLFxuICAgICAgICAgICAgdmFsdWVUeXBlTGlzdFR5cGUgPSB2YWx1ZVR5cGUuaXNMaXN0VHlwZSgpO1xuXG4gICAgICBpZiAoIXZhbHVlVHlwZUxpc3RUeXBlKSB7XG4gICAgICAgIGNvbnN0IHZhbHVlU3RyaW5nID0gdmFsdWUuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgICAgIG1lc3NhZ2UgPSBgVGhlICcke3ZhbHVlU3RyaW5nfScgdmFsdWUncyAnJHt2YWx1ZVR5cGV9JyB0eXBlIHNob3VsZCBiZSAnJHtMSVNUX1RZUEVfTkFNRX0nLmAsXG4gICAgICAgICAgICAgIGV4Y2VwdGlvbiA9IEV4Y2VwdGlvbi5mcm9tTWVzc2FnZShtZXNzYWdlKTtcblxuICAgICAgICByZXR1cm4gYmFjayhleGNlcHRpb24pO1xuICAgICAgfVxuXG4gICAgICBjb25zdCBwcmltaXRpdmVWYWx1ZSA9IHZhbHVlLmdldFByaW1pdGl2ZVZhbHVlKCksXG4gICAgICAgICAgICBub21pbmFsVmFsdWVzID0gcHJpbWl0aXZlVmFsdWU7IC8vL1xuXG4gICAgICByZXR1cm4gdGhpcy5pbml0aWFsVmFsdWUuZXZhbHVhdGUoY29udGV4dCwgKGluaXRpYWxWYWx1ZSwgYmFjaykgPT4ge1xuICAgICAgICByZXR1cm4gcmVkdWNlKG5vbWluYWxWYWx1ZXMsIChjdXJyZW50VmFsdWUsIG5vbWluYWxWYWx1ZSwgZm9yd2FyZCwgYmFjaykgPT4ge1xuICAgICAgICAgIHJldHVybiB0aGlzLmV2YWx1YXRlQW5vbnltb3VzUHJvY2VkdXJlKGN1cnJlbnRWYWx1ZSwgbm9taW5hbFZhbHVlLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKTtcbiAgICAgICAgfSwgaW5pdGlhbFZhbHVlLCAodmFsdWUsIGJhY2spID0+IHtcbiAgICAgICAgICBjb25zdCB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpO1xuXG4gICAgICAgICAgY29udGV4dC50cmFjZShgLi4uZXZhbHVhdGVkIHRoZSAnJHtyZWR1Y2VTdHJpbmd9JyByZWR1Y2UgYXMgJyR7dmFsdWVTdHJpbmd9Jy5gKTtcblxuICAgICAgICAgIHJldHVybiBmb3J3YXJkKHZhbHVlLCBiYWNrKTtcbiAgICAgICAgfSwgYmFjayk7XG4gICAgICB9LCBiYWNrKTtcbiAgICB9LCBiYWNrKTtcbiAgfSk7XG5cbiAgZXZhbHVhdGVBbm9ueW1vdXNQcm9jZWR1cmUoY3VycmVudFZhbHVlLCBub21pbmFsVmFsdWUsIGNvbnRleHQsIGZvcndhcmQsIGJhY2spIHtcbiAgICBsZXQgdmFsdWU7XG5cbiAgICBjb25zdCB7IFZhbHVlcyB9ID0gZWxlbWVudHM7XG5cbiAgICB2YWx1ZSA9IGN1cnJlbnRWYWx1ZTsgLy8vXG5cbiAgICBjb25zdCB2YWx1ZXMgPSBWYWx1ZXMuZnJvbVZhbHVlKHZhbHVlLCBjb250ZXh0KTtcblxuICAgIHZhbHVlID0gdmFsdWVGcm9tTm9taW5hbFZhbHVlKG5vbWluYWxWYWx1ZSk7XG5cbiAgICB2YWx1ZXMuYWRkVmFsdWUodmFsdWUpO1xuXG4gICAgcmV0dXJuIHRoaXMuYW5vbnltb3VzUHJvY2VkdXJlLmV2YWx1YXRlKHZhbHVlcywgY29udGV4dCwgZm9yd2FyZCwgYmFjayk7XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiUmVkdWNlXCI7XG59KTtcbiJdLCJuYW1lcyI6WyJyZWR1Y2UiLCJjb250aW51YXRpb25VdGlsaXRpZXMiLCJicmVha2FibGUiLCJicmVha1BvaW50VXRpbGl0aWVzIiwiZGVmaW5lIiwiUmVkdWNlIiwiRWxlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsInZhcmlhYmxlIiwiaW5pdGlhbFZhbHVlIiwiYW5vbnltb3VzUHJvY2VkdXJlIiwiZ2V0VmFyaWFibGUiLCJnZXRJbml0aWFsVmFsdWUiLCJnZXRBbm9ueW1vdXNQcm9jZWR1cmUiLCJldmFsdWF0ZSIsImZvcndhcmQiLCJiYWNrIiwicmVkdWNlU3RyaW5nIiwiZ2V0U3RyaW5nIiwidHJhY2UiLCJ2YWx1ZSIsInZhbHVlVHlwZSIsImdldFR5cGUiLCJ2YWx1ZVR5cGVMaXN0VHlwZSIsImlzTGlzdFR5cGUiLCJ2YWx1ZVN0cmluZyIsIm1lc3NhZ2UiLCJMSVNUX1RZUEVfTkFNRSIsImV4Y2VwdGlvbiIsIkV4Y2VwdGlvbiIsImZyb21NZXNzYWdlIiwicHJpbWl0aXZlVmFsdWUiLCJnZXRQcmltaXRpdmVWYWx1ZSIsIm5vbWluYWxWYWx1ZXMiLCJjdXJyZW50VmFsdWUiLCJub21pbmFsVmFsdWUiLCJldmFsdWF0ZUFub255bW91c1Byb2NlZHVyZSIsIlZhbHVlcyIsImVsZW1lbnRzIiwidmFsdWVzIiwiZnJvbVZhbHVlIiwidmFsdWVGcm9tTm9taW5hbFZhbHVlIiwiYWRkVmFsdWUiLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFjQTs7O2VBQUE7OztnQ0Fab0U7a0VBRS9DO2tFQUNDOzJCQUdTO3VCQUNPOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUV0QyxNQUFNLEVBQUVBLE1BQU0sRUFBRSxHQUFHQyxxQ0FBcUIsRUFDbEMsRUFBRUMsU0FBUyxFQUFFLEdBQUdDLG1DQUFtQjtNQUV6QyxXQUFl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
|
package/lib/element/some.js
CHANGED
|
@@ -83,7 +83,7 @@ const _default = (0, _elements.define)(class Some extends _occamlanguages.Elemen
|
|
|
83
83
|
}
|
|
84
84
|
const primitiveValue = value.getPrimitiveValue(), nominalValues = primitiveValue; ///
|
|
85
85
|
return some(nominalValues, (nominalValue, forward, back)=>{
|
|
86
|
-
return this.
|
|
86
|
+
return this.evaluateAnonymousProcedure(nominalValue, context, forward, back);
|
|
87
87
|
}, (boolean, back)=>{
|
|
88
88
|
const value = (0, _value.valueFromBoolean)(boolean, context), valueString = value.getString();
|
|
89
89
|
context.trace(`...evaluated the '${someString}' some as '${valueString}'.`);
|
|
@@ -91,9 +91,9 @@ const _default = (0, _elements.define)(class Some extends _occamlanguages.Elemen
|
|
|
91
91
|
}, back);
|
|
92
92
|
}, back);
|
|
93
93
|
});
|
|
94
|
-
|
|
94
|
+
evaluateAnonymousProcedure(nominalValue, context, forward, back) {
|
|
95
95
|
const { Values } = _elements.default, value = (0, _value.valueFromNominalValue)(nominalValue), values = Values.fromValue(value, context);
|
|
96
|
-
return this.anonymousProcedure.
|
|
96
|
+
return this.anonymousProcedure.evaluate(values, context, (value, back)=>{
|
|
97
97
|
const valueType = value.getType(), valueTypeBooleanType = valueType.isBooleanType();
|
|
98
98
|
if (!valueTypeBooleanType) {
|
|
99
99
|
const valueString = value.getString(), message = `The '${valueString}' value's type is '${valueType}' when it should be of type '${_typeNames.BOOLEAN_TYPE_NAME}'.`, exception = _exception.default.fromMessage(message);
|
|
@@ -106,4 +106,4 @@ const _default = (0, _elements.define)(class Some extends _occamlanguages.Elemen
|
|
|
106
106
|
static name = "Some";
|
|
107
107
|
});
|
|
108
108
|
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3NvbWUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IEVsZW1lbnQsIGJyZWFrUG9pbnRVdGlsaXRpZXMsIGNvbnRpbnVhdGlvblV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IGVsZW1lbnRzIGZyb20gXCIuLi9lbGVtZW50c1wiO1xuaW1wb3J0IEV4Y2VwdGlvbiBmcm9tIFwiLi4vZXhjZXB0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi9lbGVtZW50c1wiO1xuaW1wb3J0IHsgTElTVF9UWVBFX05BTUUsIEJPT0xFQU5fVFlQRV9OQU1FIH0gZnJvbSBcIi4uL3R5cGVOYW1lc1wiO1xuaW1wb3J0IHsgdmFsdWVGcm9tQm9vbGVhbiwgdmFsdWVGcm9tTm9taW5hbFZhbHVlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy92YWx1ZVwiO1xuXG5jb25zdCB7IHNvbWUgfSA9IGNvbnRpbnVhdGlvblV0aWxpdGllcyxcbiAgICAgIHsgYnJlYWthYmxlIH0gPSBicmVha1BvaW50VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgU29tZSBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHZhcmlhYmxlLCBhbm9ueW1vdXNQcm9jZWR1cmUpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy52YXJpYWJsZSA9IHZhcmlhYmxlO1xuICAgIHRoaXMuYW5vbnltb3VzUHJvY2VkdXJlID0gYW5vbnltb3VzUHJvY2VkdXJlO1xuICB9XG5cbiAgZ2V0VmFyaWFibGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudmFyaWFibGU7XG4gIH1cblxuICBnZXRBbm9ueW1vdXNQcm9jZWR1cmUoKSB7XG4gICAgcmV0dXJuIHRoaXMuYW5vbnltb3VzUHJvY2VkdXJlO1xuICB9XG5cbiAgZXZhbHVhdGUgPSBicmVha2FibGUoZnVuY3Rpb24gKGNvbnRleHQsIGZvcndhcmQsIGJhY2spIHtcbiAgICBjb25zdCBzb21lU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTtcblxuICAgIGNvbnRleHQudHJhY2UoYEV2YWx1YXRpbmcgdGhlICcke3NvbWVTdHJpbmd9JyBzb21lLi4uYCk7XG5cbiAgICByZXR1cm4gdGhpcy52YXJpYWJsZS5ldmFsdWF0ZShjb250ZXh0LCAodmFsdWUsIGJhY2spID0+
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3NvbWUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IEVsZW1lbnQsIGJyZWFrUG9pbnRVdGlsaXRpZXMsIGNvbnRpbnVhdGlvblV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IGVsZW1lbnRzIGZyb20gXCIuLi9lbGVtZW50c1wiO1xuaW1wb3J0IEV4Y2VwdGlvbiBmcm9tIFwiLi4vZXhjZXB0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi9lbGVtZW50c1wiO1xuaW1wb3J0IHsgTElTVF9UWVBFX05BTUUsIEJPT0xFQU5fVFlQRV9OQU1FIH0gZnJvbSBcIi4uL3R5cGVOYW1lc1wiO1xuaW1wb3J0IHsgdmFsdWVGcm9tQm9vbGVhbiwgdmFsdWVGcm9tTm9taW5hbFZhbHVlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy92YWx1ZVwiO1xuXG5jb25zdCB7IHNvbWUgfSA9IGNvbnRpbnVhdGlvblV0aWxpdGllcyxcbiAgICAgIHsgYnJlYWthYmxlIH0gPSBicmVha1BvaW50VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgU29tZSBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHZhcmlhYmxlLCBhbm9ueW1vdXNQcm9jZWR1cmUpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy52YXJpYWJsZSA9IHZhcmlhYmxlO1xuICAgIHRoaXMuYW5vbnltb3VzUHJvY2VkdXJlID0gYW5vbnltb3VzUHJvY2VkdXJlO1xuICB9XG5cbiAgZ2V0VmFyaWFibGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudmFyaWFibGU7XG4gIH1cblxuICBnZXRBbm9ueW1vdXNQcm9jZWR1cmUoKSB7XG4gICAgcmV0dXJuIHRoaXMuYW5vbnltb3VzUHJvY2VkdXJlO1xuICB9XG5cbiAgZXZhbHVhdGUgPSBicmVha2FibGUoZnVuY3Rpb24gKGNvbnRleHQsIGZvcndhcmQsIGJhY2spIHtcbiAgICBjb25zdCBzb21lU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTtcblxuICAgIGNvbnRleHQudHJhY2UoYEV2YWx1YXRpbmcgdGhlICcke3NvbWVTdHJpbmd9JyBzb21lLi4uYCk7XG5cbiAgICByZXR1cm4gdGhpcy52YXJpYWJsZS5ldmFsdWF0ZShjb250ZXh0LCAodmFsdWUsIGJhY2spID0+IHtcbiAgICAgIGNvbnN0IHZhbHVlVHlwZSA9IHZhbHVlLmdldFR5cGUoKSxcbiAgICAgICAgICAgIHZhbHVlVHlwZUxpc3RUeXBlID0gdmFsdWVUeXBlLmlzTGlzdFR5cGUoKTtcblxuICAgICAgaWYgKCF2YWx1ZVR5cGVMaXN0VHlwZSkge1xuICAgICAgICBjb25zdCB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpLFxuICAgICAgICAgICAgICBtZXNzYWdlID0gYFRoZSAnJHt2YWx1ZVN0cmluZ30nIHZhbHVlJ3MgJyR7dmFsdWVUeXBlfScgdHlwZSBzaG91bGQgYmUgJyR7TElTVF9UWVBFX05BTUV9Jy5gLFxuICAgICAgICAgICAgICBleGNlcHRpb24gPSBFeGNlcHRpb24uZnJvbU1lc3NhZ2UobWVzc2FnZSk7XG5cbiAgICAgICAgcmV0dXJuIGJhY2soZXhjZXB0aW9uKTtcbiAgICAgIH1cblxuICAgICAgY29uc3QgcHJpbWl0aXZlVmFsdWUgPSB2YWx1ZS5nZXRQcmltaXRpdmVWYWx1ZSgpLFxuICAgICAgICAgICAgbm9taW5hbFZhbHVlcyA9IHByaW1pdGl2ZVZhbHVlOyAvLy9cblxuICAgICAgcmV0dXJuIHNvbWUobm9taW5hbFZhbHVlcywgKG5vbWluYWxWYWx1ZSwgZm9yd2FyZCwgYmFjaykgPT4ge1xuICAgICAgICByZXR1cm4gdGhpcy5ldmFsdWF0ZUFub255bW91c1Byb2NlZHVyZShub21pbmFsVmFsdWUsIGNvbnRleHQsIGZvcndhcmQsIGJhY2spO1xuICAgICAgfSwgKGJvb2xlYW4sIGJhY2spID0+IHtcbiAgICAgICAgY29uc3QgdmFsdWUgPSB2YWx1ZUZyb21Cb29sZWFuKGJvb2xlYW4sIGNvbnRleHQpLFxuICAgICAgICAgICAgICB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpO1xuXG4gICAgICAgIGNvbnRleHQudHJhY2UoYC4uLmV2YWx1YXRlZCB0aGUgJyR7c29tZVN0cmluZ30nIHNvbWUgYXMgJyR7dmFsdWVTdHJpbmd9Jy5gKTtcblxuICAgICAgICByZXR1cm4gZm9yd2FyZCh2YWx1ZSwgYmFjayk7XG4gICAgICB9LCBiYWNrKTtcbiAgICB9LCBiYWNrKTtcbiAgfSk7XG5cbiAgZXZhbHVhdGVBbm9ueW1vdXNQcm9jZWR1cmUobm9taW5hbFZhbHVlLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKSB7XG4gICAgY29uc3QgeyBWYWx1ZXMgfSA9IGVsZW1lbnRzLFxuICAgICAgICAgIHZhbHVlID0gdmFsdWVGcm9tTm9taW5hbFZhbHVlKG5vbWluYWxWYWx1ZSksXG4gICAgICAgICAgdmFsdWVzID0gVmFsdWVzLmZyb21WYWx1ZSh2YWx1ZSwgY29udGV4dCk7XG5cbiAgICByZXR1cm4gdGhpcy5hbm9ueW1vdXNQcm9jZWR1cmUuZXZhbHVhdGUodmFsdWVzLCBjb250ZXh0LCAodmFsdWUsIGJhY2spID0+IHtcbiAgICAgIGNvbnN0IHZhbHVlVHlwZSA9IHZhbHVlLmdldFR5cGUoKSxcbiAgICAgICAgICAgIHZhbHVlVHlwZUJvb2xlYW5UeXBlID0gdmFsdWVUeXBlLmlzQm9vbGVhblR5cGUoKTtcblxuICAgICAgaWYgKCF2YWx1ZVR5cGVCb29sZWFuVHlwZSkge1xuICAgICAgICBjb25zdCB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpLFxuICAgICAgICAgICAgICBtZXNzYWdlID0gYFRoZSAnJHt2YWx1ZVN0cmluZ30nIHZhbHVlJ3MgdHlwZSBpcyAnJHt2YWx1ZVR5cGV9JyB3aGVuIGl0IHNob3VsZCBiZSBvZiB0eXBlICcke0JPT0xFQU5fVFlQRV9OQU1FfScuYCxcbiAgICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICAgIHJldHVybiBiYWNrKGV4Y2VwdGlvbik7XG4gICAgICB9XG5cbiAgICAgIGNvbnN0IHByaW1pdGl2ZVZhbHVlID0gdmFsdWUuZ2V0UHJpbWl0aXZlVmFsdWUoKSxcbiAgICAgICAgICAgIGJvb2xlYW4gPSBwcmltaXRpdmVWYWx1ZTsgLy8vXG5cbiAgICAgIHJldHVybiBmb3J3YXJkKGJvb2xlYW4sIGJhY2spO1xuICAgIH0sIGJhY2spO1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIlNvbWVcIjtcbn0pO1xuIl0sIm5hbWVzIjpbInNvbWUiLCJjb250aW51YXRpb25VdGlsaXRpZXMiLCJicmVha2FibGUiLCJicmVha1BvaW50VXRpbGl0aWVzIiwiZGVmaW5lIiwiU29tZSIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJ2YXJpYWJsZSIsImFub255bW91c1Byb2NlZHVyZSIsImdldFZhcmlhYmxlIiwiZ2V0QW5vbnltb3VzUHJvY2VkdXJlIiwiZXZhbHVhdGUiLCJmb3J3YXJkIiwiYmFjayIsInNvbWVTdHJpbmciLCJnZXRTdHJpbmciLCJ0cmFjZSIsInZhbHVlIiwidmFsdWVUeXBlIiwiZ2V0VHlwZSIsInZhbHVlVHlwZUxpc3RUeXBlIiwiaXNMaXN0VHlwZSIsInZhbHVlU3RyaW5nIiwibWVzc2FnZSIsIkxJU1RfVFlQRV9OQU1FIiwiZXhjZXB0aW9uIiwiRXhjZXB0aW9uIiwiZnJvbU1lc3NhZ2UiLCJwcmltaXRpdmVWYWx1ZSIsImdldFByaW1pdGl2ZVZhbHVlIiwibm9taW5hbFZhbHVlcyIsIm5vbWluYWxWYWx1ZSIsImV2YWx1YXRlQW5vbnltb3VzUHJvY2VkdXJlIiwiYm9vbGVhbiIsInZhbHVlRnJvbUJvb2xlYW4iLCJWYWx1ZXMiLCJlbGVtZW50cyIsInZhbHVlRnJvbU5vbWluYWxWYWx1ZSIsInZhbHVlcyIsImZyb21WYWx1ZSIsInZhbHVlVHlwZUJvb2xlYW5UeXBlIiwiaXNCb29sZWFuVHlwZSIsIkJPT0xFQU5fVFlQRV9OQU1FIiwibmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBY0E7OztlQUFBOzs7Z0NBWm9FO2tFQUUvQztrRUFDQzsyQkFHNEI7dUJBQ007Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRXhELE1BQU0sRUFBRUEsSUFBSSxFQUFFLEdBQUdDLHFDQUFxQixFQUNoQyxFQUFFQyxTQUFTLEVBQUUsR0FBR0MsbUNBQW1CO01BRXpDLFdBQWVDLElBQUFBLGdCQUFNLEVBQUMsTUFBTUMsYUFBYUMsdUJBQU87SUFDOUMsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksRUFBRUMsVUFBVSxFQUFFQyxRQUFRLEVBQUVDLGtCQUFrQixDQUFFO1FBQzNFLEtBQUssQ0FBQ0wsU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxRQUFRLEdBQUdBO1FBQ2hCLElBQUksQ0FBQ0Msa0JBQWtCLEdBQUdBO0lBQzVCO0lBRUFDLGNBQWM7UUFDWixPQUFPLElBQUksQ0FBQ0YsUUFBUTtJQUN0QjtJQUVBRyx3QkFBd0I7UUFDdEIsT0FBTyxJQUFJLENBQUNGLGtCQUFrQjtJQUNoQztJQUVBRyxXQUFXYixVQUFVLFNBQVVLLE9BQU8sRUFBRVMsT0FBTyxFQUFFQyxJQUFJO1FBQ25ELE1BQU1DLGFBQWEsSUFBSSxDQUFDQyxTQUFTO1FBRWpDWixRQUFRYSxLQUFLLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRUYsV0FBVyxTQUFTLENBQUM7UUFFdEQsT0FBTyxJQUFJLENBQUNQLFFBQVEsQ0FBQ0ksUUFBUSxDQUFDUixTQUFTLENBQUNjLE9BQU9KO1lBQzdDLE1BQU1LLFlBQVlELE1BQU1FLE9BQU8sSUFDekJDLG9CQUFvQkYsVUFBVUcsVUFBVTtZQUU5QyxJQUFJLENBQUNELG1CQUFtQjtnQkFDdEIsTUFBTUUsY0FBY0wsTUFBTUYsU0FBUyxJQUM3QlEsVUFBVSxDQUFDLEtBQUssRUFBRUQsWUFBWSxXQUFXLEVBQUVKLFVBQVUsa0JBQWtCLEVBQUVNLHlCQUFjLENBQUMsRUFBRSxDQUFDLEVBQzNGQyxZQUFZQyxrQkFBUyxDQUFDQyxXQUFXLENBQUNKO2dCQUV4QyxPQUFPVixLQUFLWTtZQUNkO1lBRUEsTUFBTUcsaUJBQWlCWCxNQUFNWSxpQkFBaUIsSUFDeENDLGdCQUFnQkYsZ0JBQWdCLEdBQUc7WUFFekMsT0FBT2hDLEtBQUtrQyxlQUFlLENBQUNDLGNBQWNuQixTQUFTQztnQkFDakQsT0FBTyxJQUFJLENBQUNtQiwwQkFBMEIsQ0FBQ0QsY0FBYzVCLFNBQVNTLFNBQVNDO1lBQ3pFLEdBQUcsQ0FBQ29CLFNBQVNwQjtnQkFDWCxNQUFNSSxRQUFRaUIsSUFBQUEsdUJBQWdCLEVBQUNELFNBQVM5QixVQUNsQ21CLGNBQWNMLE1BQU1GLFNBQVM7Z0JBRW5DWixRQUFRYSxLQUFLLENBQUMsQ0FBQyxrQkFBa0IsRUFBRUYsV0FBVyxXQUFXLEVBQUVRLFlBQVksRUFBRSxDQUFDO2dCQUUxRSxPQUFPVixRQUFRSyxPQUFPSjtZQUN4QixHQUFHQTtRQUNMLEdBQUdBO0lBQ0wsR0FBRztJQUVIbUIsMkJBQTJCRCxZQUFZLEVBQUU1QixPQUFPLEVBQUVTLE9BQU8sRUFBRUMsSUFBSSxFQUFFO1FBQy9ELE1BQU0sRUFBRXNCLE1BQU0sRUFBRSxHQUFHQyxpQkFBUSxFQUNyQm5CLFFBQVFvQixJQUFBQSw0QkFBcUIsRUFBQ04sZUFDOUJPLFNBQVNILE9BQU9JLFNBQVMsQ0FBQ3RCLE9BQU9kO1FBRXZDLE9BQU8sSUFBSSxDQUFDSyxrQkFBa0IsQ0FBQ0csUUFBUSxDQUFDMkIsUUFBUW5DLFNBQVMsQ0FBQ2MsT0FBT0o7WUFDL0QsTUFBTUssWUFBWUQsTUFBTUUsT0FBTyxJQUN6QnFCLHVCQUF1QnRCLFVBQVV1QixhQUFhO1lBRXBELElBQUksQ0FBQ0Qsc0JBQXNCO2dCQUN6QixNQUFNbEIsY0FBY0wsTUFBTUYsU0FBUyxJQUM3QlEsVUFBVSxDQUFDLEtBQUssRUFBRUQsWUFBWSxtQkFBbUIsRUFBRUosVUFBVSw2QkFBNkIsRUFBRXdCLDRCQUFpQixDQUFDLEVBQUUsQ0FBQyxFQUNqSGpCLFlBQVlDLGtCQUFTLENBQUNDLFdBQVcsQ0FBQ0o7Z0JBRXhDLE9BQU9WLEtBQUtZO1lBQ2Q7WUFFQSxNQUFNRyxpQkFBaUJYLE1BQU1ZLGlCQUFpQixJQUN4Q0ksVUFBVUwsZ0JBQWdCLEdBQUc7WUFFbkMsT0FBT2hCLFFBQVFxQixTQUFTcEI7UUFDMUIsR0FBR0E7SUFDTDtJQUVBLE9BQU84QixPQUFPLE9BQU87QUFDdkIifQ==
|
|
@@ -11,8 +11,8 @@ Object.defineProperty(exports, "default", {
|
|
|
11
11
|
const _occamlanguages = require("occam-languages");
|
|
12
12
|
const _exception = /*#__PURE__*/ _interop_require_default(require("../../exception"));
|
|
13
13
|
const _elements = require("../../elements");
|
|
14
|
-
const _typeNames = require("../../typeNames");
|
|
15
14
|
const _value = require("../../utilities/value");
|
|
15
|
+
const _typeNames = require("../../typeNames");
|
|
16
16
|
function _interop_require_default(obj) {
|
|
17
17
|
return obj && obj.__esModule ? obj : {
|
|
18
18
|
default: obj
|
|
@@ -64,4 +64,4 @@ const _default = (0, _elements.define)(class LogicalTerm extends _occamlanguages
|
|
|
64
64
|
static name = "LogicalTerm";
|
|
65
65
|
});
|
|
66
66
|
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbGVtZW50L3Rlcm0vbG9naWNhbC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IEV4Y2VwdGlvbiBmcm9tIFwiLi4vLi4vZXhjZXB0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi8uLi9lbGVtZW50c1wiO1xuaW1wb3J0IHsgdmFsdWVGcm9tQm9vbGVhbiB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvdmFsdWVcIjtcbmltcG9ydCB7IEJPT0xFQU5fVFlQRV9OQU1FIH0gZnJvbSBcIi4uLy4uL3R5cGVOYW1lc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgTG9naWNhbFRlcm0gZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB0eXBlLCBkaXNqdW5jdGlvbiwgbGVmdFRlcm0sIHJpZ2h0VGVybSkge1xuICAgIHN1cGVyKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCk7XG5cbiAgICB0aGlzLnR5cGUgPSB0eXBlO1xuICAgIHRoaXMuZGlzanVuY3Rpb24gPSBkaXNqdW5jdGlvbjtcbiAgICB0aGlzLmxlZnRUZXJtID0gbGVmdFRlcm07XG4gICAgdGhpcy5yaWdodFRlcm0gPSByaWdodFRlcm07XG4gIH1cblxuICBnZXRUeXBlKCkge1xuICAgIHJldHVybiB0aGlzLnR5cGU7XG4gIH1cblxuICBpc0Rpc2p1bmN0aW9uKCkge1xuICAgIHJldHVybiB0aGlzLmRpc2p1bmN0aW9uO1xuICB9XG5cbiAgZ2V0TGVmdFRlcm0oKSB7XG4gICAgcmV0dXJuIHRoaXMubGVmdFRlcm07XG4gIH1cblxuICBnZXRSaWdodFRlcm0oKSB7XG4gICAgcmV0dXJuIHRoaXMucmlnaHRUZXJtO1xuICB9XG5cbiAgZXZhbHVhdGUoY29udGV4dCwgZm9yd2FyZCwgYmFjaykge1xuICAgIGxldCB2YWx1ZTtcblxuICAgIGNvbnN0IGxvZ2ljYWxUZXJtU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBFdmFsdWF0aW5nIHRoZSAnJHtsb2dpY2FsVGVybVN0cmluZ30nIGxvZ2ljYWwgdGVybS4uLmApO1xuXG4gICAgcmV0dXJuIHRoaXMubGVmdFRlcm0uZXZhbHVhdGUoY29udGV4dCwgKGxlZnRWYWx1ZSwgYmFjaykgPT4ge1xuICAgICAgcmV0dXJuIHRoaXMucmlnaHRUZXJtLmV2YWx1YXRlKGNvbnRleHQsIChyaWdodFZhbHVlLCBiYWNrKSA9PiB7XG4gICAgICAgIGNvbnN0IGxlZnRWYWx1ZVR5cGUgPSBsZWZ0VmFsdWUuZ2V0VHlwZSgpLFxuICAgICAgICAgICAgICByaWdodFZhbHVlVHlwZSA9IHJpZ2h0VmFsdWUuZ2V0VHlwZSgpLFxuICAgICAgICAgICAgICBsZWZ0VmFsdWVUeXBlQm9vbGVhblR5cGUgPSBsZWZ0VmFsdWVUeXBlLmlzQm9vbGVhblR5cGUoKSxcbiAgICAgICAgICAgICAgcmlnaHRWYWx1ZVR5cGVCb29sZWFuVHlwZSA9IHJpZ2h0VmFsdWVUeXBlLmlzQm9vbGVhblR5cGUoKTtcblxuICAgICAgICBpZiAoIWxlZnRWYWx1ZVR5cGVCb29sZWFuVHlwZSkge1xuICAgICAgICAgIGNvbnN0IGxlZnRWYWx1ZVN0cmluZyA9IGxlZnRWYWx1ZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICAgICAgICBtZXNzYWdlID0gYFRoZSAnJHtsZWZ0VmFsdWVTdHJpbmd9JyBsZWZ0IHRlcm0ncyB0eXBlIGlzICcke2xlZnRWYWx1ZVR5cGV9JyB3aGVuIGl0IHNob3VsZCBiZSBvZiB0eXBlICcke0JPT0xFQU5fVFlQRV9OQU1FfScuYCxcbiAgICAgICAgICAgICAgICBleGNlcHRpb24gPSBFeGNlcHRpb24uZnJvbU1lc3NhZ2UobWVzc2FnZSk7XG5cbiAgICAgICAgICByZXR1cm4gYmFjayhleGNlcHRpb24pO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKCFyaWdodFZhbHVlVHlwZUJvb2xlYW5UeXBlKSB7XG4gICAgICAgICAgY29uc3QgcmlnaHRWYWx1ZVN0cmluZyA9IHJpZ2h0VmFsdWUuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgICAgICAgbWVzc2FnZSA9IGBUaGUgJyR7cmlnaHRWYWx1ZVN0cmluZ30nIHJpZ2h0IHRlcm0ncyB0eXBlIGlzICcke3JpZ2h0VmFsdWVUeXBlfScgd2hlbiBpdCBzaG91bGQgYmUgb2YgdHlwZSAnJHtCT09MRUFOX1RZUEVfTkFNRX0nLmAsXG4gICAgICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICAgICAgcmV0dXJuIGJhY2soZXhjZXB0aW9uKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IGxlZnRWYWx1ZVByaW1pdGl2ZVZhbHVlID0gbGVmdFZhbHVlLmdldFByaW1pdGl2ZVZhbHVlKCksXG4gICAgICAgICAgICAgIHJpZ2h0VmFsdWVQcmltaXRpdmVWYWx1ZSA9IHJpZ2h0VmFsdWUuZ2V0UHJpbWl0aXZlVmFsdWUoKSxcbiAgICAgICAgICAgICAgbGVmdEJvb2xlYW4gPWxlZnRWYWx1ZVByaW1pdGl2ZVZhbHVlLCAvLy9cbiAgICAgICAgICAgICAgcmlnaHRCb29sZWFuID0gcmlnaHRWYWx1ZVByaW1pdGl2ZVZhbHVlLCAvLy9cbiAgICAgICAgICAgICAgYm9vbGVhbiA9IHRoaXMuZGlzanVuY3Rpb24gP1xuICAgICAgICAgICAgICAgICAgICAgICAgICAobGVmdEJvb2xlYW4gfHwgcmlnaHRCb29sZWFuKSA6XG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxlZnRCb29sZWFuICYmIHJpZ2h0Qm9vbGVhbik7XG5cbiAgICAgICAgdmFsdWUgPSB2YWx1ZUZyb21Cb29sZWFuKGJvb2xlYW4sIGNvbnRleHQpO1xuXG4gICAgICAgIGNvbnN0IHZhbHVlU3RyaW5nID0gdmFsdWUuZ2V0U3RyaW5nKCk7XG5cbiAgICAgICAgY29udGV4dC5kZWJ1ZyhgLi4uZXZhbHVhdGVkIHRoZSAnJHtsb2dpY2FsVGVybVN0cmluZ30nIGxvZ2ljYWwgdmFsdWUgYXMgJyR7dmFsdWVTdHJpbmd9Jy5gKTtcblxuICAgICAgICByZXR1cm4gZm9yd2FyZCh2YWx1ZSwgYmFjayk7XG4gICAgICB9LCBiYWNrKTtcbiAgICB9LCBiYWNrKTtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJMb2dpY2FsVGVybVwiO1xufSk7XG4iXSwibmFtZXMiOlsiZGVmaW5lIiwiTG9naWNhbFRlcm0iLCJFbGVtZW50IiwiY29udGV4dCIsInN0cmluZyIsIm5vZGUiLCJicmVha1BvaW50IiwidHlwZSIsImRpc2p1bmN0aW9uIiwibGVmdFRlcm0iLCJyaWdodFRlcm0iLCJnZXRUeXBlIiwiaXNEaXNqdW5jdGlvbiIsImdldExlZnRUZXJtIiwiZ2V0UmlnaHRUZXJtIiwiZXZhbHVhdGUiLCJmb3J3YXJkIiwiYmFjayIsInZhbHVlIiwibG9naWNhbFRlcm1TdHJpbmciLCJnZXRTdHJpbmciLCJ0cmFjZSIsImxlZnRWYWx1ZSIsInJpZ2h0VmFsdWUiLCJsZWZ0VmFsdWVUeXBlIiwicmlnaHRWYWx1ZVR5cGUiLCJsZWZ0VmFsdWVUeXBlQm9vbGVhblR5cGUiLCJpc0Jvb2xlYW5UeXBlIiwicmlnaHRWYWx1ZVR5cGVCb29sZWFuVHlwZSIsImxlZnRWYWx1ZVN0cmluZyIsIm1lc3NhZ2UiLCJCT09MRUFOX1RZUEVfTkFNRSIsImV4Y2VwdGlvbiIsIkV4Y2VwdGlvbiIsImZyb21NZXNzYWdlIiwicmlnaHRWYWx1ZVN0cmluZyIsImxlZnRWYWx1ZVByaW1pdGl2ZVZhbHVlIiwiZ2V0UHJpbWl0aXZlVmFsdWUiLCJyaWdodFZhbHVlUHJpbWl0aXZlVmFsdWUiLCJsZWZ0Qm9vbGVhbiIsInJpZ2h0Qm9vbGVhbiIsImJvb2xlYW4iLCJ2YWx1ZUZyb21Cb29sZWFuIiwidmFsdWVTdHJpbmciLCJkZWJ1ZyIs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
|
|
@@ -11,8 +11,8 @@ Object.defineProperty(exports, "default", {
|
|
|
11
11
|
const _occamlanguages = require("occam-languages");
|
|
12
12
|
const _exception = /*#__PURE__*/ _interop_require_default(require("../../exception"));
|
|
13
13
|
const _elements = require("../../elements");
|
|
14
|
-
const _typeNames = require("../../typeNames");
|
|
15
14
|
const _value = require("../../utilities/value");
|
|
15
|
+
const _typeNames = require("../../typeNames");
|
|
16
16
|
function _interop_require_default(obj) {
|
|
17
17
|
return obj && obj.__esModule ? obj : {
|
|
18
18
|
default: obj
|
|
@@ -52,4 +52,4 @@ const _default = (0, _elements.define)(class NegatedTerm extends _occamlanguages
|
|
|
52
52
|
static name = "NegatedTerm";
|
|
53
53
|
});
|
|
54
54
|
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbGVtZW50L3Rlcm0vbmVnYXRlZC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IEV4Y2VwdGlvbiBmcm9tIFwiLi4vLi4vZXhjZXB0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi8uLi9lbGVtZW50c1wiO1xuaW1wb3J0IHsgdmFsdWVGcm9tQm9vbGVhbiB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvdmFsdWVcIjtcbmltcG9ydCB7IEJPT0xFQU5fVFlQRV9OQU1FIH0gZnJvbSBcIi4uLy4uL3R5cGVOYW1lc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgTmVnYXRlZFRlcm0gZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB0eXBlLCB0ZXJtKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcblxuICAgIHRoaXMudHlwZSA9IHR5cGU7XG4gICAgdGhpcy50ZXJtID0gdGVybTtcbiAgfVxuXG4gIGdldFR5cGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudHlwZTtcbiAgfVxuXG4gIGdldFRlcm0oKSB7XG4gICAgcmV0dXJuIHRoaXMudGVybTtcbiAgfVxuXG4gIGV2YWx1YXRlKGNvbnRleHQsIGZvcndhcmQsIGJhY2spIHtcbiAgICBjb25zdCBuZWdhdGVkVGVybVN0cmluZyA9IHRoaXMuZ2V0U3RyaW5nKCk7IC8vL1xuXG4gICAgY29udGV4dC50cmFjZShgRXZhbHVhdGluZyB0aGUgJyR7bmVnYXRlZFRlcm1TdHJpbmd9JyBuZWdhdGVkIHZhbHVlLi4uYCk7XG5cbiAgICByZXR1cm4gdGhpcy50ZXJtLmV2YWx1YXRlKGNvbnRleHQsICh2YWx1ZSwgYmFjaykgPT4ge1xuICAgICAgY29uc3QgdmFsdWVUeXBlID0gdmFsdWUuZ2V0VHlwZSgpLFxuICAgICAgICAgICAgdmFsdWVUeXBlQm9vbGVhblR5cGUgPSB2YWx1ZVR5cGUuaXNCb29sZWFuVHlwZSgpO1xuXG4gICAgICBpZiAoIXZhbHVlVHlwZUJvb2xlYW5UeXBlKSB7XG4gICAgICAgIGNvbnN0IHZhbHVlU3RyaW5nID0gdmFsdWUuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgICAgIG1lc3NhZ2UgPSBgVGhlICcke3ZhbHVlU3RyaW5nfScgbGVmdCB2YWx1ZSdzIHR5cGUgaXMgJyR7dmFsdWVUeXBlfScgd2hlbiBpdCBzaG91bGQgYmUgb2YgdHlwZSAnJHtCT09MRUFOX1RZUEVfTkFNRX0nLmAsXG4gICAgICAgICAgICAgIGV4Y2VwdGlvbiA9IEV4Y2VwdGlvbi5mcm9tTWVzc2FnZShtZXNzYWdlKTtcblxuICAgICAgICByZXR1cm4gYmFjayhleGNlcHRpb24pO1xuICAgICAgfVxuXG4gICAgICBsZXQgYm9vbGVhbjtcblxuICAgICAgY29uc3QgcHJpbWl0aXZlVmFsdWUgPSB2YWx1ZS5nZXRQcmltaXRpdmVWYWx1ZSgpO1xuXG4gICAgICBib29sZWFuID0gcHJpbWl0aXZlVmFsdWU7IC8vL1xuXG4gICAgICBib29sZWFuID0gIWJvb2xlYW47XG5cbiAgICAgIHZhbHVlID0gdmFsdWVGcm9tQm9vbGVhbihib29sZWFuLCBjb250ZXh0KTtcblxuICAgICAgY29uc3QgdmFsdWVTdHJpbmcgPSB2YWx1ZS5nZXRTdHJpbmcoKTtcblxuICAgICAgY29udGV4dC5kZWJ1ZyhgLi4uZXZhbHVhdGVkIHRoZSAnJHtuZWdhdGVkVGVybVN0cmluZ30nIG5lZ2F0ZWQgdmFsdWUgYXMgJyR7dmFsdWVTdHJpbmd9Jy5gKTtcblxuICAgICAgcmV0dXJuIGZvcndhcmQodmFsdWUsIGJhY2spO1xuICAgIH0sIGJhY2spO1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIk5lZ2F0ZWRUZXJtXCI7XG59KTtcbiJdLCJuYW1lcyI6WyJkZWZpbmUiLCJOZWdhdGVkVGVybSIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJ0eXBlIiwidGVybSIsImdldFR5cGUiLCJnZXRUZXJtIiwiZXZhbHVhdGUiLCJmb3J3YXJkIiwiYmFjayIsIm5lZ2F0ZWRUZXJtU3RyaW5nIiwiZ2V0U3RyaW5nIiwidHJhY2UiLCJ2YWx1ZSIsInZhbHVlVHlwZSIsInZhbHVlVHlwZUJvb2xlYW5UeXBlIiwiaXNCb29sZWFuVHlwZSIsInZhbHVlU3RyaW5nIiwibWVzc2FnZSIsIkJPT0xFQU5fVFlQRV9OQU1FIiwiZXhjZXB0aW9uIiwiRXhjZXB0aW9uIiwiZnJvbU1lc3NhZ2UiLCJib29sZWFuIiwicHJpbWl0aXZlVmFsdWUiLCJnZXRQcmltaXRpdmVWYWx1ZSIsInZhbHVlRnJvbUJvb2xlYW4iLCJkZWJ1ZyIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVVBOzs7ZUFBQTs7O2dDQVJ3QjtrRUFFRjswQkFFQzt1QkFDVTsyQkFDQzs7Ozs7O01BRWxDLFdBQWVBLElBQUFBLGdCQUFNLEVBQUMsTUFBTUMsb0JBQW9CQyx1QkFBTztJQUNyRCxZQUFZQyxPQUFPLEVBQUVDLE1BQU0sRUFBRUMsSUFBSSxFQUFFQyxVQUFVLEVBQUVDLElBQUksRUFBRUMsSUFBSSxDQUFFO1FBQ3pELEtBQUssQ0FBQ0wsU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDQyxJQUFJLEdBQUdBO0lBQ2Q7SUFFQUMsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDRixJQUFJO0lBQ2xCO0lBRUFHLFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQ0YsSUFBSTtJQUNsQjtJQUVBRyxTQUFTUixPQUFPLEVBQUVTLE9BQU8sRUFBRUMsSUFBSSxFQUFFO1FBQy9CLE1BQU1DLG9CQUFvQixJQUFJLENBQUNDLFNBQVMsSUFBSSxHQUFHO1FBRS9DWixRQUFRYSxLQUFLLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRUYsa0JBQWtCLGtCQUFrQixDQUFDO1FBRXRFLE9BQU8sSUFBSSxDQUFDTixJQUFJLENBQUNHLFFBQVEsQ0FBQ1IsU0FBUyxDQUFDYyxPQUFPSjtZQUN6QyxNQUFNSyxZQUFZRCxNQUFNUixPQUFPLElBQ3pCVSx1QkFBdUJELFVBQVVFLGFBQWE7WUFFcEQsSUFBSSxDQUFDRCxzQkFBc0I7Z0JBQ3pCLE1BQU1FLGNBQWNKLE1BQU1GLFNBQVMsSUFDN0JPLFVBQVUsQ0FBQyxLQUFLLEVBQUVELFlBQVksd0JBQXdCLEVBQUVILFVBQVUsNkJBQTZCLEVBQUVLLDRCQUFpQixDQUFDLEVBQUUsQ0FBQyxFQUN0SEMsWUFBWUMsa0JBQVMsQ0FBQ0MsV0FBVyxDQUFDSjtnQkFFeEMsT0FBT1QsS0FBS1c7WUFDZDtZQUVBLElBQUlHO1lBRUosTUFBTUMsaUJBQWlCWCxNQUFNWSxpQkFBaUI7WUFFOUNGLFVBQVVDLGdCQUFnQixHQUFHO1lBRTdCRCxVQUFVLENBQUNBO1lBRVhWLFFBQVFhLElBQUFBLHVCQUFnQixFQUFDSCxTQUFTeEI7WUFFbEMsTUFBTWtCLGNBQWNKLE1BQU1GLFNBQVM7WUFFbkNaLFFBQVE0QixLQUFLLENBQUMsQ0FBQyxrQkFBa0IsRUFBRWpCLGtCQUFrQixvQkFBb0IsRUFBRU8sWUFBWSxFQUFFLENBQUM7WUFFMUYsT0FBT1QsUUFBUUssT0FBT0o7UUFDeEIsR0FBR0E7SUFDTDtJQUVBLE9BQU9tQixPQUFPLGNBQWM7QUFDOUIifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-furtle",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "3.0.
|
|
4
|
+
"version": "3.0.513",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-furtle",
|
|
7
7
|
"description": "Occam's Furtle language.",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"necessary": "^17.7.2",
|
|
14
14
|
"occam-grammars": "^1.3.687",
|
|
15
|
-
"occam-languages": "^3.0.
|
|
15
|
+
"occam-languages": "^3.0.79",
|
|
16
16
|
"occam-lexers": "^23.2.12",
|
|
17
17
|
"occam-parsers": "^23.2.17",
|
|
18
18
|
"occam-query": "^4.1.210"
|
|
@@ -30,7 +30,7 @@ export default define(class AnonymousProcedure extends Element {
|
|
|
30
30
|
return this.returnBlock;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
evaluate(values, context, forward, back) {
|
|
34
34
|
forward = cut(forward, back); ///
|
|
35
35
|
|
|
36
36
|
const anonymousProcedureString = this.getString(); ///
|
package/src/element/error.js
CHANGED
|
@@ -1,21 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import {Element, breakPointUtilities} from "occam-languages";
|
|
4
4
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
6
|
|
|
7
|
+
const { breakable } = breakPointUtilities;
|
|
8
|
+
|
|
7
9
|
export default define(class Error extends Element {
|
|
8
10
|
constructor(context, string, node, breakPoint) {
|
|
9
11
|
super(context, string, node, breakPoint);
|
|
10
12
|
}
|
|
11
13
|
|
|
12
|
-
verify(context, forward, back) {
|
|
14
|
+
verify = breakable(function (context, forward, back) {
|
|
13
15
|
const errorString = this.getString(); ///
|
|
14
16
|
|
|
15
17
|
context.warning(`The '${errorString}' error cannot be verified.`);
|
|
16
18
|
|
|
17
19
|
return back();
|
|
18
|
-
}
|
|
20
|
+
});
|
|
19
21
|
|
|
20
22
|
static name = "Error";
|
|
21
23
|
});
|
package/src/element/every.js
CHANGED
|
@@ -49,7 +49,7 @@ export default define(class Every extends Element {
|
|
|
49
49
|
const nodes = value.getNodes();
|
|
50
50
|
|
|
51
51
|
return every(nodes, (node, forward, back) => {
|
|
52
|
-
return this.
|
|
52
|
+
return this.evaluateAnonymousProcedure(node, context, forward, back);
|
|
53
53
|
}, (boolean, back) => {
|
|
54
54
|
const value = valueFromBoolean(boolean, context),
|
|
55
55
|
valueString = value.getString();
|
|
@@ -61,12 +61,12 @@ export default define(class Every extends Element {
|
|
|
61
61
|
}, back);
|
|
62
62
|
});
|
|
63
63
|
|
|
64
|
-
|
|
64
|
+
evaluateAnonymousProcedure(node, context, forward, back) {
|
|
65
65
|
const { Values } = elements,
|
|
66
66
|
value = valueFromNode(node, context),
|
|
67
67
|
values = Values.fromValue(value, context);
|
|
68
68
|
|
|
69
|
-
return this.anonymousProcedure.
|
|
69
|
+
return this.anonymousProcedure.evaluate(values, context, (value, back) => {
|
|
70
70
|
const valueType = value.getType(),
|
|
71
71
|
valueTypeBooleanType = valueType.isBooleanType();
|
|
72
72
|
|
package/src/element/label.js
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { Element
|
|
3
|
+
import { Element } from "occam-languages";
|
|
4
4
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
6
|
import { instantiate } from "../utilities/context";
|
|
7
7
|
import { instantiateLabel } from "../process/instantiate";
|
|
8
8
|
import { nameFromLabelNode } from "../utilities/element";
|
|
9
9
|
|
|
10
|
-
const { breakPointToBreakPointJSON } = breakPointUtilities;
|
|
11
|
-
|
|
12
10
|
export default define(class Label extends Element {
|
|
13
11
|
constructor(context, string, node, breakPoint, name) {
|
|
14
12
|
super(context, string, node, breakPoint);
|
|
@@ -29,17 +27,8 @@ export default define(class Label extends Element {
|
|
|
29
27
|
toJSON() {
|
|
30
28
|
const string = this.getString();
|
|
31
29
|
|
|
32
|
-
let breakPoint;
|
|
33
|
-
|
|
34
|
-
breakPoint = this.getBreakPoint();
|
|
35
|
-
|
|
36
|
-
const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
|
|
37
|
-
|
|
38
|
-
breakPoint = breakPointJSON; ///
|
|
39
|
-
|
|
40
30
|
const json = {
|
|
41
|
-
string
|
|
42
|
-
breakPoint
|
|
31
|
+
string
|
|
43
32
|
};
|
|
44
33
|
|
|
45
34
|
return json;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { Element,
|
|
3
|
+
import { Element, continuationUtilities } from "occam-languages";
|
|
4
4
|
|
|
5
5
|
import Exception from "../exception";
|
|
6
6
|
|
|
@@ -9,8 +9,7 @@ import { instantiate } from "../utilities/context";
|
|
|
9
9
|
import { instantiateParameters } from "../process/instantiate";
|
|
10
10
|
import { parametersArrayFromParametersNode } from "../utilities/element";
|
|
11
11
|
|
|
12
|
-
const { forEach } = continuationUtilities
|
|
13
|
-
{ breakPointToBreakPointJSON } = breakPointUtilities;
|
|
12
|
+
const { forEach } = continuationUtilities
|
|
14
13
|
|
|
15
14
|
export default define(class Parameters extends Element {
|
|
16
15
|
constructor(context, string, node, breakPoint, array) {
|
|
@@ -73,17 +72,8 @@ export default define(class Parameters extends Element {
|
|
|
73
72
|
toJSON() {
|
|
74
73
|
const string = this.getString();
|
|
75
74
|
|
|
76
|
-
let breakPoint;
|
|
77
|
-
|
|
78
|
-
breakPoint = this.getBreakPoint();
|
|
79
|
-
|
|
80
|
-
const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
|
|
81
|
-
|
|
82
|
-
breakPoint = breakPointJSON; ///
|
|
83
|
-
|
|
84
75
|
const json = {
|
|
85
|
-
string
|
|
86
|
-
breakPoint
|
|
76
|
+
string
|
|
87
77
|
};
|
|
88
78
|
|
|
89
79
|
return json;
|
package/src/element/procedure.js
CHANGED
|
@@ -65,7 +65,7 @@ export default define(class Procedure extends Element {
|
|
|
65
65
|
this.returnBlock = returnBlockFromProcedureNode(procedureNode, context);
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
verify(context, forward, back) {
|
|
68
|
+
verify = breakable(function (context, forward, back) {
|
|
69
69
|
const procedureString = this.getString();
|
|
70
70
|
|
|
71
71
|
context.trace(`Verifying the '${procedureString}' function...`)
|
|
@@ -77,9 +77,9 @@ export default define(class Procedure extends Element {
|
|
|
77
77
|
context.debug(`...verified the '${procedureString}' function.`)
|
|
78
78
|
|
|
79
79
|
return forward(context, back);
|
|
80
|
-
}
|
|
80
|
+
});
|
|
81
81
|
|
|
82
|
-
|
|
82
|
+
evaluate = breakable(function (values, context, forward, back) {
|
|
83
83
|
forward = cut(forward, back);
|
|
84
84
|
|
|
85
85
|
const procedureString = this.getString(); ///
|
|
@@ -120,7 +120,7 @@ export default define(class Procedure extends Element {
|
|
|
120
120
|
|
|
121
121
|
const values = valuesFromNominalValues(nominalValues, context);
|
|
122
122
|
|
|
123
|
-
return this.
|
|
123
|
+
return this.evaluate(values, context, (value, back) => {
|
|
124
124
|
context.debug(`...called the '${procedureString}' function nominally.`);
|
|
125
125
|
|
|
126
126
|
return forward(value, back);
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { Element
|
|
3
|
+
import { Element } from "occam-languages";
|
|
4
4
|
|
|
5
5
|
import Exception from "../exception";
|
|
6
6
|
|
|
7
7
|
import { free } from "../utilities/context";
|
|
8
8
|
import { define } from "../elements";
|
|
9
9
|
|
|
10
|
-
const { breakable } = breakPointUtilities;
|
|
11
|
-
|
|
12
10
|
export default define(class ProcedureCall extends Element {
|
|
13
11
|
constructor(context, string, node, breakPoint, reference, values) {
|
|
14
12
|
super(context, string, node, breakPoint);
|
|
@@ -27,7 +25,7 @@ export default define(class ProcedureCall extends Element {
|
|
|
27
25
|
|
|
28
26
|
getProcedureName() { return this.reference.getProcedureName(); }
|
|
29
27
|
|
|
30
|
-
evaluate
|
|
28
|
+
evaluate(context, forward, back) {
|
|
31
29
|
const procedureCallString = this.getString(); ///
|
|
32
30
|
|
|
33
31
|
context.trace(`Evaluating the '${procedureCallString}' function call...`);
|
|
@@ -46,7 +44,7 @@ export default define(class ProcedureCall extends Element {
|
|
|
46
44
|
|
|
47
45
|
return this.values.evaluate(context, (values, back) => {
|
|
48
46
|
return free((context) => {
|
|
49
|
-
return procedure.
|
|
47
|
+
return procedure.evaluate(values, context, (value, back) => {
|
|
50
48
|
const valueString = value.getString();
|
|
51
49
|
|
|
52
50
|
context.debug(`...evaluated the '${procedureCallString}' function call as '${valueString}'.`);
|
|
@@ -55,7 +53,7 @@ export default define(class ProcedureCall extends Element {
|
|
|
55
53
|
}, back);
|
|
56
54
|
}, context);
|
|
57
55
|
}, back);
|
|
58
|
-
}
|
|
56
|
+
}
|
|
59
57
|
|
|
60
58
|
static name = "ProcedureCall";
|
|
61
59
|
});
|
package/src/element/reduce.js
CHANGED
|
@@ -55,7 +55,7 @@ export default define(class Reduce extends Element {
|
|
|
55
55
|
|
|
56
56
|
return this.initialValue.evaluate(context, (initialValue, back) => {
|
|
57
57
|
return reduce(nominalValues, (currentValue, nominalValue, forward, back) => {
|
|
58
|
-
return this.
|
|
58
|
+
return this.evaluateAnonymousProcedure(currentValue, nominalValue, context, forward, back);
|
|
59
59
|
}, initialValue, (value, back) => {
|
|
60
60
|
const valueString = value.getString();
|
|
61
61
|
|
|
@@ -67,7 +67,7 @@ export default define(class Reduce extends Element {
|
|
|
67
67
|
}, back);
|
|
68
68
|
});
|
|
69
69
|
|
|
70
|
-
|
|
70
|
+
evaluateAnonymousProcedure(currentValue, nominalValue, context, forward, back) {
|
|
71
71
|
let value;
|
|
72
72
|
|
|
73
73
|
const { Values } = elements;
|
|
@@ -80,7 +80,7 @@ export default define(class Reduce extends Element {
|
|
|
80
80
|
|
|
81
81
|
values.addValue(value);
|
|
82
82
|
|
|
83
|
-
return this.anonymousProcedure.
|
|
83
|
+
return this.anonymousProcedure.evaluate(values, context, forward, back);
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
static name = "Reduce";
|
package/src/element/some.js
CHANGED
|
@@ -49,7 +49,7 @@ export default define(class Some extends Element {
|
|
|
49
49
|
nominalValues = primitiveValue; ///
|
|
50
50
|
|
|
51
51
|
return some(nominalValues, (nominalValue, forward, back) => {
|
|
52
|
-
return this.
|
|
52
|
+
return this.evaluateAnonymousProcedure(nominalValue, context, forward, back);
|
|
53
53
|
}, (boolean, back) => {
|
|
54
54
|
const value = valueFromBoolean(boolean, context),
|
|
55
55
|
valueString = value.getString();
|
|
@@ -61,12 +61,12 @@ export default define(class Some extends Element {
|
|
|
61
61
|
}, back);
|
|
62
62
|
});
|
|
63
63
|
|
|
64
|
-
|
|
64
|
+
evaluateAnonymousProcedure(nominalValue, context, forward, back) {
|
|
65
65
|
const { Values } = elements,
|
|
66
66
|
value = valueFromNominalValue(nominalValue),
|
|
67
67
|
values = Values.fromValue(value, context);
|
|
68
68
|
|
|
69
|
-
return this.anonymousProcedure.
|
|
69
|
+
return this.anonymousProcedure.evaluate(values, context, (value, back) => {
|
|
70
70
|
const valueType = value.getType(),
|
|
71
71
|
valueTypeBooleanType = valueType.isBooleanType();
|
|
72
72
|
|
|
@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
|
|
|
5
5
|
import Exception from "../../exception";
|
|
6
6
|
|
|
7
7
|
import { define } from "../../elements";
|
|
8
|
-
import { BOOLEAN_TYPE_NAME } from "../../typeNames";
|
|
9
8
|
import { valueFromBoolean } from "../../utilities/value";
|
|
9
|
+
import { BOOLEAN_TYPE_NAME } from "../../typeNames";
|
|
10
10
|
|
|
11
11
|
export default define(class LogicalTerm extends Element {
|
|
12
12
|
constructor(context, string, node, breakPoint, type, disjunction, leftTerm, rightTerm) {
|
|
@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
|
|
|
5
5
|
import Exception from "../../exception";
|
|
6
6
|
|
|
7
7
|
import { define } from "../../elements";
|
|
8
|
-
import { BOOLEAN_TYPE_NAME } from "../../typeNames";
|
|
9
8
|
import { valueFromBoolean } from "../../utilities/value";
|
|
9
|
+
import { BOOLEAN_TYPE_NAME } from "../../typeNames";
|
|
10
10
|
|
|
11
11
|
export default define(class NegatedTerm extends Element {
|
|
12
12
|
constructor(context, string, node, breakPoint, type, term) {
|