occam-furtle 3.0.536 → 3.0.537
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/bindings/named.js +1 -20
- package/lib/element/bindings.js +1 -26
- package/lib/element/every.js +9 -2
- package/lib/element/some.js +9 -2
- package/lib/element/terms.js +3 -3
- package/lib/element/values.js +3 -3
- package/package.json +1 -1
- package/src/element/bindings/named.js +0 -31
- package/src/element/bindings.js +0 -33
- package/src/element/every.js +13 -1
- package/src/element/some.js +13 -1
- package/src/element/terms.js +3 -3
- package/src/element/values.js +3 -3
|
@@ -39,25 +39,6 @@ const _default = (0, _elements.define)(class NamedBindings extends _occamlanguag
|
|
|
39
39
|
forEachNamedBinding(callback, forward, back) {
|
|
40
40
|
return forEach(this.array, callback, forward, back);
|
|
41
41
|
}
|
|
42
|
-
compareTerms(terms, context, forward, back) {
|
|
43
|
-
const termsString = terms.getString(), namedBindingsString = this.getString(); ///
|
|
44
|
-
context.trace(`Comparing the '${termsString}' terms with the '${namedBindingsString}' named bindings...`);
|
|
45
|
-
const termsLength = terms.getLength(), namedBindingsLength = this.getLength();
|
|
46
|
-
if (termsLength !== namedBindingsLength) {
|
|
47
|
-
const message = `The '${termsString}' terms and '${namedBindingsString}' named bindings are not of the same length.`, exception = _exception.default.fromMessage(message);
|
|
48
|
-
return back(exception);
|
|
49
|
-
}
|
|
50
|
-
return this.forEachNamedBinding((namedBinding, forward, back, index)=>{
|
|
51
|
-
if (namedBinding === null) {
|
|
52
|
-
return forward(back);
|
|
53
|
-
}
|
|
54
|
-
const term = terms.getTerm(index);
|
|
55
|
-
return namedBinding.compareTerm(term, context, forward, back);
|
|
56
|
-
}, (back)=>{
|
|
57
|
-
context.debug(`...compared the '${termsString}' terms with the '${namedBindingsString}' named bindings.`);
|
|
58
|
-
return forward(back);
|
|
59
|
-
}, back);
|
|
60
|
-
}
|
|
61
42
|
compareNamedBinding(namedBinding, context, forward, back) {
|
|
62
43
|
const namedBindingString = namedBinding.getString(), namedBindingsString = this.getString(); ///
|
|
63
44
|
context.trace(`Comparing the '${namedBindingString}' named binding with the '${namedBindingsString}' named bindings...`);
|
|
@@ -84,4 +65,4 @@ const _default = (0, _elements.define)(class NamedBindings extends _occamlanguag
|
|
|
84
65
|
static name = "NamedBindings";
|
|
85
66
|
});
|
|
86
67
|
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbGVtZW50L2JpbmRpbmdzL25hbWVkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50LCBjb250aW51YXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uLy4uL2V4Y2VwdGlvblwiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vLi4vZWxlbWVudHNcIjtcblxuY29uc3QgeyBzb21lLCBmb3JFYWNoIH0gPSBjb250aW51YXRpb25VdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZShjbGFzcyBOYW1lZEJpbmRpbmdzIGV4dGVuZHMgRWxlbWVudCB7XG4gIGNvbnN0cnVjdG9yKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgYXJyYXkpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy5hcnJheSA9IGFycmF5O1xuICB9XG5cbiAgZ2V0QXJyYXkoKSB7XG4gICAgcmV0dXJuIHRoaXMuYXJyYXk7XG4gIH1cblxuICBnZXRMZW5ndGgoKSB7XG4gICAgY29uc3QgbGVuZ3RoID0gdGhpcy5hcnJheS5sZW5ndGg7XG5cbiAgICByZXR1cm4gbGVuZ3RoO1xuICB9XG5cbiAgZ2V0TmFtZWRCaW5kaW5nKGluZGV4KSB7XG4gICAgY29uc3QgbmFtZWRCaW5kaW5nID0gdGhpcy5hcnJheVtpbmRleF0gfHwgbnVsbDtcblxuICAgIHJldHVybiBuYW1lZEJpbmRpbmc7XG4gIH1cblxuICBzb21lTmFtZWRCaW5kaW5nKGNhbGxiYWNrLCBmb3J3YXJkLCBiYWNrKSB7XG4gICAgcmV0dXJuIHNvbWUodGhpcy5hcnJheSwgY2FsbGJhY2ssIGZvcndhcmQsIGJhY2spO1xuICB9XG5cbiAgZm9yRWFjaE5hbWVkQmluZGluZyhjYWxsYmFjaywgZm9yd2FyZCwgYmFjaykge1xuICAgIHJldHVybiBmb3JFYWNoKHRoaXMuYXJyYXksIGNhbGxiYWNrLCBmb3J3YXJkLCBiYWNrKTtcbiAgfVxuXG4gIGNvbXBhcmVOYW1lZEJpbmRpbmcobmFtZWRCaW5kaW5nLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKSB7XG4gICAgY29uc3QgbmFtZWRCaW5kaW5nU3RyaW5nID0gbmFtZWRCaW5kaW5nLmdldFN0cmluZygpLFxuICAgICAgICAgIG5hbWVkQmluZGluZ3NTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpOyAvLy9cblxuICAgIGNvbnRleHQudHJhY2UoYENvbXBhcmluZyB0aGUgJyR7bmFtZWRCaW5kaW5nU3RyaW5nfScgbmFtZWQgYmluZGluZyB3aXRoIHRoZSAnJHtuYW1lZEJpbmRpbmdzU3RyaW5nfScgbmFtZWQgYmluZGluZ3MuLi5gKTtcblxuICAgIGNvbnN0IG5hbWVkQmluZGluZ0EgPSBuYW1lZEJpbmRpbmc7IC8vL1xuXG4gICAgcmV0dXJuIHRoaXMuc29tZU5hbWVkQmluZGluZygobmFtZWRCaW5kaW5nLCBmb3J3YXJkLCBiYWNrKSA9PiB7XG4gICAgICBpZiAobmFtZWRCaW5kaW5nID09PSBudWxsKSB7XG4gICAgICAgIHJldHVybiBmb3J3YXJkKGJhY2spO1xuICAgICAgfVxuXG4gICAgICBjb25zdCBuYW1lZEJpbmRpbmdCID0gbmFtZWRCaW5kaW5nOyAvLy9cblxuICAgICAgcmV0dXJuIG5hbWVkQmluZGluZ0EuY29tcGFyZU5hbWVkQmluZGluZyhuYW1lZEJpbmRpbmdCLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKTtcbiAgICB9LCAoYmFjaykgPT4ge1xuICAgICAgY29udGV4dC5kZWJ1ZyhgLi4uY29tcGFyZWQgdGhlICcke25hbWVkQmluZGluZ1N0cmluZ30nIG5hbWVkIGJpbmRpbmcgd2l0aCB0aGUgJyR7bmFtZWRCaW5kaW5nc1N0cmluZ30nIG5hbWVkIGJpbmRpbmdzLmApO1xuXG4gICAgICByZXR1cm4gZm9yd2FyZChiYWNrKTtcbiAgICB9LCBiYWNrKTtcbiAgfVxuXG4gIGNvbXBhcmVOYW1lZEJpbmRpbmdzKG5hbWVkQmluZGluZ3MsIGNvbnRleHQsIGZvcndhcmQsIGJhY2spIHtcbiAgICByZXR1cm4gbmFtZWRCaW5kaW5ncy5mb3JFYWNoTmFtZWRCaW5kaW5nKChuYW1lZEJpbmRpbmcsIGZvcndhcmQsIGJhY2spID0+IHtcbiAgICAgIGlmIChuYW1lZEJpbmRpbmcgPT09IG51bGwpIHtcbiAgICAgICAgcmV0dXJuIGZvcndhcmQoYmFjayk7XG4gICAgICB9XG5cbiAgICAgIHJldHVybiB0aGlzLmNvbXBhcmVOYW1lZEJpbmRpbmcobmFtZWRCaW5kaW5nLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKTtcbiAgICB9LCBmb3J3YXJkLCBiYWNrKTtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJOYW1lZEJpbmRpbmdzXCI7XG59KTtcbiJdLCJuYW1lcyI6WyJzb21lIiwiZm9yRWFjaCIsImNvbnRpbnVhdGlvblV0aWxpdGllcyIsImRlZmluZSIsIk5hbWVkQmluZGluZ3MiLCJFbGVtZW50IiwiY29udGV4dCIsInN0cmluZyIsIm5vZGUiLCJicmVha1BvaW50IiwiYXJyYXkiLCJnZXRBcnJheSIsImdldExlbmd0aCIsImxlbmd0aCIsImdldE5hbWVkQmluZGluZyIsImluZGV4IiwibmFtZWRCaW5kaW5nIiwic29tZU5hbWVkQmluZGluZyIsImNhbGxiYWNrIiwiZm9yd2FyZCIsImJhY2siLCJmb3JFYWNoTmFtZWRCaW5kaW5nIiwiY29tcGFyZU5hbWVkQmluZGluZyIsIm5hbWVkQmluZGluZ1N0cmluZyIsImdldFN0cmluZyIsIm5hbWVkQmluZGluZ3NTdHJpbmciLCJ0cmFjZSIsIm5hbWVkQmluZGluZ0EiLCJuYW1lZEJpbmRpbmdCIiwiZGVidWciLCJjb21wYXJlTmFtZWRCaW5kaW5ncyIsIm5hbWVkQmluZGluZ3MiLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFVQTs7O2VBQUE7OztnQ0FSK0M7a0VBRXpCOzBCQUVDOzs7Ozs7QUFFdkIsTUFBTSxFQUFFQSxJQUFJLEVBQUVDLE9BQU8sRUFBRSxHQUFHQyxxQ0FBcUI7TUFFL0MsV0FBZUMsSUFBQUEsZ0JBQU0sRUFBQyxNQUFNQyxzQkFBc0JDLHVCQUFPO0lBQ3ZELFlBQVlDLE9BQU8sRUFBRUMsTUFBTSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsS0FBSyxDQUFFO1FBQ3BELEtBQUssQ0FBQ0osU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxLQUFLLEdBQUdBO0lBQ2Y7SUFFQUMsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDRCxLQUFLO0lBQ25CO0lBRUFFLFlBQVk7UUFDVixNQUFNQyxTQUFTLElBQUksQ0FBQ0gsS0FBSyxDQUFDRyxNQUFNO1FBRWhDLE9BQU9BO0lBQ1Q7SUFFQUMsZ0JBQWdCQyxLQUFLLEVBQUU7UUFDckIsTUFBTUMsZUFBZSxJQUFJLENBQUNOLEtBQUssQ0FBQ0ssTUFBTSxJQUFJO1FBRTFDLE9BQU9DO0lBQ1Q7SUFFQUMsaUJBQWlCQyxRQUFRLEVBQUVDLE9BQU8sRUFBRUMsSUFBSSxFQUFFO1FBQ3hDLE9BQU9wQixLQUFLLElBQUksQ0FBQ1UsS0FBSyxFQUFFUSxVQUFVQyxTQUFTQztJQUM3QztJQUVBQyxvQkFBb0JILFFBQVEsRUFBRUMsT0FBTyxFQUFFQyxJQUFJLEVBQUU7UUFDM0MsT0FBT25CLFFBQVEsSUFBSSxDQUFDUyxLQUFLLEVBQUVRLFVBQVVDLFNBQVNDO0lBQ2hEO0lBRUFFLG9CQUFvQk4sWUFBWSxFQUFFVixPQUFPLEVBQUVhLE9BQU8sRUFBRUMsSUFBSSxFQUFFO1FBQ3hELE1BQU1HLHFCQUFxQlAsYUFBYVEsU0FBUyxJQUMzQ0Msc0JBQXNCLElBQUksQ0FBQ0QsU0FBUyxJQUFJLEdBQUc7UUFFakRsQixRQUFRb0IsS0FBSyxDQUFDLENBQUMsZUFBZSxFQUFFSCxtQkFBbUIsMEJBQTBCLEVBQUVFLG9CQUFvQixtQkFBbUIsQ0FBQztRQUV2SCxNQUFNRSxnQkFBZ0JYLGNBQWMsR0FBRztRQUV2QyxPQUFPLElBQUksQ0FBQ0MsZ0JBQWdCLENBQUMsQ0FBQ0QsY0FBY0csU0FBU0M7WUFDbkQsSUFBSUosaUJBQWlCLE1BQU07Z0JBQ3pCLE9BQU9HLFFBQVFDO1lBQ2pCO1lBRUEsTUFBTVEsZ0JBQWdCWixjQUFjLEdBQUc7WUFFdkMsT0FBT1csY0FBY0wsbUJBQW1CLENBQUNNLGVBQWV0QixTQUFTYSxTQUFTQztRQUM1RSxHQUFHLENBQUNBO1lBQ0ZkLFFBQVF1QixLQUFLLENBQUMsQ0FBQyxpQkFBaUIsRUFBRU4sbUJBQW1CLDBCQUEwQixFQUFFRSxvQkFBb0IsaUJBQWlCLENBQUM7WUFFdkgsT0FBT04sUUFBUUM7UUFDakIsR0FBR0E7SUFDTDtJQUVBVSxxQkFBcUJDLGFBQWEsRUFBRXpCLE9BQU8sRUFBRWEsT0FBTyxFQUFFQyxJQUFJLEVBQUU7UUFDMUQsT0FBT1csY0FBY1YsbUJBQW1CLENBQUMsQ0FBQ0wsY0FBY0csU0FBU0M7WUFDL0QsSUFBSUosaUJBQWlCLE1BQU07Z0JBQ3pCLE9BQU9HLFFBQVFDO1lBQ2pCO1lBRUEsT0FBTyxJQUFJLENBQUNFLG1CQUFtQixDQUFDTixjQUFjVixTQUFTYSxTQUFTQztRQUNsRSxHQUFHRCxTQUFTQztJQUNkO0lBRUEsT0FBT1ksT0FBTyxnQkFBZ0I7QUFDaEMifQ==
|
package/lib/element/bindings.js
CHANGED
|
@@ -9,13 +9,7 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _occamlanguages = require("occam-languages");
|
|
12
|
-
const _exception = /*#__PURE__*/ _interop_require_default(require("../exception"));
|
|
13
12
|
const _elements = require("../elements");
|
|
14
|
-
function _interop_require_default(obj) {
|
|
15
|
-
return obj && obj.__esModule ? obj : {
|
|
16
|
-
default: obj
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
13
|
const { forEach } = _occamlanguages.continuationUtilities;
|
|
20
14
|
const _default = (0, _elements.define)(class Bindings extends _occamlanguages.Element {
|
|
21
15
|
constructor(context, string, node, breakPoint, array){
|
|
@@ -36,26 +30,7 @@ const _default = (0, _elements.define)(class Bindings extends _occamlanguages.El
|
|
|
36
30
|
forEachBinding(callback, forward, back) {
|
|
37
31
|
return forEach(this.array, callback, forward, back);
|
|
38
32
|
}
|
|
39
|
-
compareTerms(terms, context, forward, back) {
|
|
40
|
-
const termsString = terms.getString(), bindingsString = this.getString(); ///
|
|
41
|
-
context.trace(`Comparing the '${termsString}' terms against the '${bindingsString}' bindings...`);
|
|
42
|
-
const termsLength = terms.getLength(), bindingsLength = this.getLength();
|
|
43
|
-
if (termsLength !== bindingsLength) {
|
|
44
|
-
const message = `The '${termsString}' expressions and '${bindingsString}' bindings are not of the same length.`, exception = _exception.default.fromMessage(message);
|
|
45
|
-
return back(exception);
|
|
46
|
-
}
|
|
47
|
-
return this.forEachBinding((binding, forward, back, index)=>{
|
|
48
|
-
if (binding === null) {
|
|
49
|
-
return forward(back);
|
|
50
|
-
}
|
|
51
|
-
const term = terms.getTerm(index);
|
|
52
|
-
return binding.compareTerm(term, context, forward, back);
|
|
53
|
-
}, (back)=>{
|
|
54
|
-
context.debug(`...compared the '${termsString}' terms against the '${bindingsString}' bindings.`);
|
|
55
|
-
return forward(back);
|
|
56
|
-
}, back);
|
|
57
|
-
}
|
|
58
33
|
static name = "Bindings";
|
|
59
34
|
});
|
|
60
35
|
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L2JpbmRpbmdzLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50LCBjb250aW51YXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi9lbGVtZW50c1wiO1xuXG5jb25zdCB7IGZvckVhY2ggfSA9IGNvbnRpbnVhdGlvblV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lKGNsYXNzIEJpbmRpbmdzIGV4dGVuZHMgRWxlbWVudCB7XG4gIGNvbnN0cnVjdG9yKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgYXJyYXkpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy5hcnJheSA9IGFycmF5O1xuICB9XG5cbiAgZ2V0QXJyYXkoKSB7XG4gICAgcmV0dXJuIHRoaXMuYXJyYXk7XG4gIH1cblxuICBnZXRMZW5ndGgoKSB7XG4gICAgY29uc3QgbGVuZ3RoID0gdGhpcy5hcnJheS5sZW5ndGg7XG5cbiAgICByZXR1cm4gbGVuZ3RoO1xuICB9XG5cbiAgZ2V0QmluZGluZyhpbmRleCkge1xuICAgIGNvbnN0IGJpbmRpbmcgPSB0aGlzLmFycmF5W2luZGV4XSB8fCBudWxsO1xuXG4gICAgcmV0dXJuIGJpbmRpbmc7XG4gIH1cblxuICBmb3JFYWNoQmluZGluZyhjYWxsYmFjaywgZm9yd2FyZCwgYmFjaykge1xuICAgIHJldHVybiBmb3JFYWNoKHRoaXMuYXJyYXksIGNhbGxiYWNrLCBmb3J3YXJkLCBiYWNrKTtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJCaW5kaW5nc1wiO1xufSk7XG4iXSwibmFtZXMiOlsiZm9yRWFjaCIsImNvbnRpbnVhdGlvblV0aWxpdGllcyIsImRlZmluZSIsIkJpbmRpbmdzIiwiRWxlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsImFycmF5IiwiZ2V0QXJyYXkiLCJnZXRMZW5ndGgiLCJsZW5ndGgiLCJnZXRCaW5kaW5nIiwiaW5kZXgiLCJiaW5kaW5nIiwiZm9yRWFjaEJpbmRpbmciLCJjYWxsYmFjayIsImZvcndhcmQiLCJiYWNrIiwibmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBUUE7OztlQUFBOzs7Z0NBTitDOzBCQUV4QjtBQUV2QixNQUFNLEVBQUVBLE9BQU8sRUFBRSxHQUFHQyxxQ0FBcUI7TUFFekMsV0FBZUMsSUFBQUEsZ0JBQU0sRUFBQyxNQUFNQyxpQkFBaUJDLHVCQUFPO0lBQ2xELFlBQVlDLE9BQU8sRUFBRUMsTUFBTSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsS0FBSyxDQUFFO1FBQ3BELEtBQUssQ0FBQ0osU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxLQUFLLEdBQUdBO0lBQ2Y7SUFFQUMsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDRCxLQUFLO0lBQ25CO0lBRUFFLFlBQVk7UUFDVixNQUFNQyxTQUFTLElBQUksQ0FBQ0gsS0FBSyxDQUFDRyxNQUFNO1FBRWhDLE9BQU9BO0lBQ1Q7SUFFQUMsV0FBV0MsS0FBSyxFQUFFO1FBQ2hCLE1BQU1DLFVBQVUsSUFBSSxDQUFDTixLQUFLLENBQUNLLE1BQU0sSUFBSTtRQUVyQyxPQUFPQztJQUNUO0lBRUFDLGVBQWVDLFFBQVEsRUFBRUMsT0FBTyxFQUFFQyxJQUFJLEVBQUU7UUFDdEMsT0FBT25CLFFBQVEsSUFBSSxDQUFDUyxLQUFLLEVBQUVRLFVBQVVDLFNBQVNDO0lBQ2hEO0lBRUEsT0FBT0MsT0FBTyxXQUFXO0FBQzNCIn0=
|
package/lib/element/every.js
CHANGED
|
@@ -89,7 +89,14 @@ const _default = (0, _elements.define)(class Every extends _occamlanguages.Eleme
|
|
|
89
89
|
const boolean = true, value = (0, _value.valueFromBoolean)(boolean, context), valueString = value.getString();
|
|
90
90
|
context.trace(`...evaluated the '${everyString}' function as '${valueString}'.`);
|
|
91
91
|
return forward(value, back);
|
|
92
|
-
},
|
|
92
|
+
}, (exception)=>{
|
|
93
|
+
if (exception) {
|
|
94
|
+
return back(exception);
|
|
95
|
+
}
|
|
96
|
+
const boolean = false, value = (0, _value.valueFromBoolean)(boolean, context), valueString = value.getString();
|
|
97
|
+
context.trace(`...evaluated the '${everyString}' function as '${valueString}'.`);
|
|
98
|
+
return forward(value, back);
|
|
99
|
+
});
|
|
93
100
|
}, back);
|
|
94
101
|
});
|
|
95
102
|
evaluateAnonymousProcedure(nominalValue, context, forward, back) {
|
|
@@ -110,4 +117,4 @@ const _default = (0, _elements.define)(class Every extends _occamlanguages.Eleme
|
|
|
110
117
|
static name = "Every";
|
|
111
118
|
});
|
|
112
119
|
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/every.js"],"sourcesContent":["\"use strict\";\n\nimport { Element, breakPointUtilities, continuationUtilities } from \"occam-languages\";\n\nimport elements from \"../elements\";\nimport Exception from \"../exception\";\n\nimport { define } from \"../elements\";\nimport { LIST_TYPE_NAME, BOOLEAN_TYPE_NAME } from \"../typeNames\";\nimport { valueFromBoolean, valueFromNominalValue } from \"../utilities/value\";\n\nconst { every } = continuationUtilities,\n      { unbreakable } = breakPointUtilities;\n\nexport default define(class Every extends Element {\n  constructor(context, string, node, breakPoint, variable, anonymousProcedure) {\n    super(context, string, node, breakPoint);\n\n    this.string = string;\n    this.variable = variable;\n    this.anonymousProcedure = anonymousProcedure;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  getAnonymousProcedure() {\n    return this.anonymousProcedure;\n  }\n\n  evaluate = unbreakable(function (context, forward, back) {\n    const everyString = this.getString();\n\n    context.trace(`Evaluating the '${everyString}' function...`);\n\n    return this.variable.evaluate(context, (value, back) => {\n      const valueType = value.getType(),\n            valueTypeListType = valueType.isListType();\n\n      if (!valueTypeListType) {\n        const valueString = value.getString(),\n              message = `The '${valueString}' value's '${valueType}' type should be '${LIST_TYPE_NAME}'.`,\n              exception = Exception.fromMessage(message);\n\n        return back(exception);\n      }\n\n      const primitiveValue = value.getPrimitiveValue(),\n            nominalValues = primitiveValue; ///\n\n      return every(nominalValues, (nominalValue, context, forward, back) => {\n        return this.evaluateAnonymousProcedure(nominalValue, context, forward, back);\n      }, context, (context, back) => {\n        const boolean = true,\n              value = valueFromBoolean(boolean, context),\n              valueString = value.getString();\n\n        context.trace(`...evaluated the '${everyString}' function as '${valueString}'.`);\n\n        return forward(value, back);\n      }, (exception) => {\n        if (exception) {\n          return back(exception);\n        }\n\n        const boolean = false,\n              value = valueFromBoolean(boolean, context),\n              valueString = value.getString();\n\n        context.trace(`...evaluated the '${everyString}' function as '${valueString}'.`);\n\n        return forward(value, back);\n      });\n    }, back);\n  });\n\n  evaluateAnonymousProcedure(nominalValue, context, forward, back) {\n    const { Values } = elements,\n          value = valueFromNominalValue(nominalValue, context),\n          values = Values.fromValue(value, context);\n\n    return this.anonymousProcedure.evaluate(values, context, (value, back) => {\n      const valueType = value.getType(),\n            valueTypeBooleanType = valueType.isBooleanType();\n\n      if (!valueTypeBooleanType) {\n        const valueString = value.getString(),\n              message = `The '${valueString}' value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE_NAME}'.`,\n              exception = Exception.fromMessage(message);\n\n        return back(exception);\n      }\n\n      const primitiveValue = value.getPrimitiveValue(),\n            boolean = primitiveValue; ///\n\n      if (!boolean) {\n        return back();\n      }\n\n      return forward(context, back);\n    }, back);\n  }\n\n  static name = \"Every\";\n});\n"],"names":["every","continuationUtilities","unbreakable","breakPointUtilities","define","Every","Element","context","string","node","breakPoint","variable","anonymousProcedure","getVariable","getAnonymousProcedure","evaluate","forward","back","everyString","getString","trace","value","valueType","getType","valueTypeListType","isListType","valueString","message","LIST_TYPE_NAME","exception","Exception","fromMessage","primitiveValue","getPrimitiveValue","nominalValues","nominalValue","evaluateAnonymousProcedure","boolean","valueFromBoolean","Values","elements","valueFromNominalValue","values","fromValue","valueTypeBooleanType","isBooleanType","BOOLEAN_TYPE_NAME","name"],"mappings":"AAAA;;;;+BAcA;;;eAAA;;;gCAZoE;kEAE/C;kEACC;2BAG4B;uBACM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExD,MAAM,EAAEA,KAAK,EAAE,GAAGC,qCAAqB,EACjC,EAAEC,WAAW,EAAE,GAAGC,mCAAmB;MAE3C,WAAeC,IAAAA,gBAAM,EAAC,MAAMC,cAAcC,uBAAO;IAC/C,YAAYC,OAAO,EAAEC,MAAM,EAAEC,IAAI,EAAEC,UAAU,EAAEC,QAAQ,EAAEC,kBAAkB,CAAE;QAC3E,KAAK,CAACL,SAASC,QAAQC,MAAMC;QAE7B,IAAI,CAACF,MAAM,GAAGA;QACd,IAAI,CAACG,QAAQ,GAAGA;QAChB,IAAI,CAACC,kBAAkB,GAAGA;IAC5B;IAEAC,cAAc;QACZ,OAAO,IAAI,CAACF,QAAQ;IACtB;IAEAG,wBAAwB;QACtB,OAAO,IAAI,CAACF,kBAAkB;IAChC;IAEAG,WAAWb,YAAY,SAAUK,OAAO,EAAES,OAAO,EAAEC,IAAI;QACrD,MAAMC,cAAc,IAAI,CAACC,SAAS;QAElCZ,QAAQa,KAAK,CAAC,CAAC,gBAAgB,EAAEF,YAAY,aAAa,CAAC;QAE3D,OAAO,IAAI,CAACP,QAAQ,CAACI,QAAQ,CAACR,SAAS,CAACc,OAAOJ;YAC7C,MAAMK,YAAYD,MAAME,OAAO,IACzBC,oBAAoBF,UAAUG,UAAU;YAE9C,IAAI,CAACD,mBAAmB;gBACtB,MAAME,cAAcL,MAAMF,SAAS,IAC7BQ,UAAU,CAAC,KAAK,EAAED,YAAY,WAAW,EAAEJ,UAAU,kBAAkB,EAAEM,yBAAc,CAAC,EAAE,CAAC,EAC3FC,YAAYC,kBAAS,CAACC,WAAW,CAACJ;gBAExC,OAAOV,KAAKY;YACd;YAEA,MAAMG,iBAAiBX,MAAMY,iBAAiB,IACxCC,gBAAgBF,gBAAgB,GAAG;YAEzC,OAAOhC,MAAMkC,eAAe,CAACC,cAAc5B,SAASS,SAASC;gBAC3D,OAAO,IAAI,CAACmB,0BAA0B,CAACD,cAAc5B,SAASS,SAASC;YACzE,GAAGV,SAAS,CAACA,SAASU;gBACpB,MAAMoB,UAAU,MACVhB,QAAQiB,IAAAA,uBAAgB,EAACD,SAAS9B,UAClCmB,cAAcL,MAAMF,SAAS;gBAEnCZ,QAAQa,KAAK,CAAC,CAAC,kBAAkB,EAAEF,YAAY,eAAe,EAAEQ,YAAY,EAAE,CAAC;gBAE/E,OAAOV,QAAQK,OAAOJ;YACxB,GAAG,CAACY;gBACF,IAAIA,WAAW;oBACb,OAAOZ,KAAKY;gBACd;gBAEA,MAAMQ,UAAU,OACVhB,QAAQiB,IAAAA,uBAAgB,EAACD,SAAS9B,UAClCmB,cAAcL,MAAMF,SAAS;gBAEnCZ,QAAQa,KAAK,CAAC,CAAC,kBAAkB,EAAEF,YAAY,eAAe,EAAEQ,YAAY,EAAE,CAAC;gBAE/E,OAAOV,QAAQK,OAAOJ;YACxB;QACF,GAAGA;IACL,GAAG;IAEHmB,2BAA2BD,YAAY,EAAE5B,OAAO,EAAES,OAAO,EAAEC,IAAI,EAAE;QAC/D,MAAM,EAAEsB,MAAM,EAAE,GAAGC,iBAAQ,EACrBnB,QAAQoB,IAAAA,4BAAqB,EAACN,cAAc5B,UAC5CmC,SAASH,OAAOI,SAAS,CAACtB,OAAOd;QAEvC,OAAO,IAAI,CAACK,kBAAkB,CAACG,QAAQ,CAAC2B,QAAQnC,SAAS,CAACc,OAAOJ;YAC/D,MAAMK,YAAYD,MAAME,OAAO,IACzBqB,uBAAuBtB,UAAUuB,aAAa;YAEpD,IAAI,CAACD,sBAAsB;gBACzB,MAAMlB,cAAcL,MAAMF,SAAS,IAC7BQ,UAAU,CAAC,KAAK,EAAED,YAAY,mBAAmB,EAAEJ,UAAU,6BAA6B,EAAEwB,4BAAiB,CAAC,EAAE,CAAC,EACjHjB,YAAYC,kBAAS,CAACC,WAAW,CAACJ;gBAExC,OAAOV,KAAKY;YACd;YAEA,MAAMG,iBAAiBX,MAAMY,iBAAiB,IACxCI,UAAUL,gBAAgB,GAAG;YAEnC,IAAI,CAACK,SAAS;gBACZ,OAAOpB;YACT;YAEA,OAAOD,QAAQT,SAASU;QAC1B,GAAGA;IACL;IAEA,OAAO8B,OAAO,QAAQ;AACxB"}
|
package/lib/element/some.js
CHANGED
|
@@ -88,7 +88,14 @@ const _default = (0, _elements.define)(class Some extends _occamlanguages.Elemen
|
|
|
88
88
|
const boolean = true, value = (0, _value.valueFromBoolean)(boolean, context), valueString = value.getString();
|
|
89
89
|
context.trace(`...evaluated the '${someString}' function as '${valueString}'.`);
|
|
90
90
|
return forward(value, back);
|
|
91
|
-
},
|
|
91
|
+
}, (exception)=>{
|
|
92
|
+
if (exception) {
|
|
93
|
+
return back(exception);
|
|
94
|
+
}
|
|
95
|
+
const boolean = false, value = (0, _value.valueFromBoolean)(boolean, context), valueString = value.getString();
|
|
96
|
+
context.trace(`...evaluated the '${someString}' function as '${valueString}'.`);
|
|
97
|
+
return forward(value, back);
|
|
98
|
+
});
|
|
92
99
|
}, back);
|
|
93
100
|
});
|
|
94
101
|
evaluateAnonymousProcedure(nominalValue, context, forward, back) {
|
|
@@ -109,4 +116,4 @@ const _default = (0, _elements.define)(class Some extends _occamlanguages.Elemen
|
|
|
109
116
|
static name = "Some";
|
|
110
117
|
});
|
|
111
118
|
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/some.js"],"sourcesContent":["\"use strict\";\n\nimport { Element, breakPointUtilities, continuationUtilities } from \"occam-languages\";\n\nimport elements from \"../elements\";\nimport Exception from \"../exception\";\n\nimport { define } from \"../elements\";\nimport { LIST_TYPE_NAME, BOOLEAN_TYPE_NAME } from \"../typeNames\";\nimport { valueFromBoolean, valueFromNominalValue } from \"../utilities/value\";\n\nconst { some } = continuationUtilities,\n      { unbreakable } = breakPointUtilities;\n\nexport default define(class Some extends Element {\n  constructor(context, string, node, breakPoint, variable, anonymousProcedure) {\n    super(context, string, node, breakPoint);\n\n    this.variable = variable;\n    this.anonymousProcedure = anonymousProcedure;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  getAnonymousProcedure() {\n    return this.anonymousProcedure;\n  }\n\n  evaluate = unbreakable(function (context, forward, back) {\n    const someString = this.getString();\n\n    context.trace(`Evaluating the '${someString}' function...`);\n\n    return this.variable.evaluate(context, (value, back) => {\n      const valueType = value.getType(),\n            valueTypeListType = valueType.isListType();\n\n      if (!valueTypeListType) {\n        const valueString = value.getString(),\n              message = `The '${valueString}' value's '${valueType}' type should be '${LIST_TYPE_NAME}'.`,\n              exception = Exception.fromMessage(message);\n\n        return back(exception);\n      }\n\n      const primitiveValue = value.getPrimitiveValue(),\n            nominalValues = primitiveValue; ///\n\n      return some(nominalValues, (nominalValue, context, forward, back) => {\n        return this.evaluateAnonymousProcedure(nominalValue, context, forward, back);\n      }, context, (context, back) => {\n        const boolean = true,\n              value = valueFromBoolean(boolean, context),\n              valueString = value.getString();\n\n        context.trace(`...evaluated the '${someString}' function as '${valueString}'.`);\n\n        return forward(value, back);\n      }, (exception) => {\n        if (exception) {\n          return back(exception);\n        }\n\n        const boolean = false,\n              value = valueFromBoolean(boolean, context),\n              valueString = value.getString();\n\n        context.trace(`...evaluated the '${someString}' function as '${valueString}'.`);\n\n        return forward(value, back);\n      });\n    }, back);\n  });\n\n  evaluateAnonymousProcedure(nominalValue, context, forward, back) {\n    const { Values } = elements,\n          value = valueFromNominalValue(nominalValue),\n          values = Values.fromValue(value, context);\n\n    return this.anonymousProcedure.evaluate(values, context, (value, back) => {\n      const valueType = value.getType(),\n            valueTypeBooleanType = valueType.isBooleanType();\n\n      if (!valueTypeBooleanType) {\n        const valueString = value.getString(),\n              message = `The '${valueString}' value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE_NAME}'.`,\n              exception = Exception.fromMessage(message);\n\n        return back(exception);\n      }\n\n      const primitiveValue = value.getPrimitiveValue(),\n            boolean = primitiveValue; ///\n\n      if (!boolean) {\n        return back();\n      }\n\n      return forward(context, back);\n    }, back);\n  }\n\n  static name = \"Some\";\n});\n"],"names":["some","continuationUtilities","unbreakable","breakPointUtilities","define","Some","Element","context","string","node","breakPoint","variable","anonymousProcedure","getVariable","getAnonymousProcedure","evaluate","forward","back","someString","getString","trace","value","valueType","getType","valueTypeListType","isListType","valueString","message","LIST_TYPE_NAME","exception","Exception","fromMessage","primitiveValue","getPrimitiveValue","nominalValues","nominalValue","evaluateAnonymousProcedure","boolean","valueFromBoolean","Values","elements","valueFromNominalValue","values","fromValue","valueTypeBooleanType","isBooleanType","BOOLEAN_TYPE_NAME","name"],"mappings":"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"}
|
package/lib/element/terms.js
CHANGED
|
@@ -78,8 +78,8 @@ const _default = (0, _elements.define)(class Terms extends _occamlanguages.Eleme
|
|
|
78
78
|
evaluate(context, back, forward) {
|
|
79
79
|
return this.mapTerm((term, context, forward, back)=>{
|
|
80
80
|
return term.evaluate(context, forward, back);
|
|
81
|
-
}, (
|
|
82
|
-
const valuesString = (0, _string.valuesStringFromValuesArray)(valuesArray), string = valuesString,
|
|
81
|
+
}, (array)=>{
|
|
82
|
+
const valuesArray = array, valuesString = (0, _string.valuesStringFromValuesArray)(valuesArray), string = valuesString, node = null, breakPoint = null;
|
|
83
83
|
context = null;
|
|
84
84
|
const { Values } = _elements.default, values = new Values(context, string, node, breakPoint, array);
|
|
85
85
|
return forward(values, back);
|
|
@@ -96,4 +96,4 @@ const _default = (0, _elements.define)(class Terms extends _occamlanguages.Eleme
|
|
|
96
96
|
}
|
|
97
97
|
});
|
|
98
98
|
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3Rlcm1zLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50LCBjb250aW51YXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBlbGVtZW50cyBmcm9tIFwiLi4vZWxlbWVudHNcIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgeyB0ZXJtc1N0cmluZ0Zyb21UZXJtc0FycmF5LCB2YWx1ZXNTdHJpbmdGcm9tVmFsdWVzQXJyYXkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCB7IG1hcCB9ID0gY29udGludWF0aW9uVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgVGVybXMgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBhcnJheSkge1xuICAgIHN1cGVyKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCk7XG5cbiAgICB0aGlzLmFycmF5ID0gYXJyYXk7XG4gIH1cblxuICBnZXRBcnJheSgpIHtcbiAgICByZXR1cm4gdGhpcy5hcnJheTtcbiAgfVxuXG4gIGdldExlbmd0aCgpIHtcbiAgICBjb25zdCBsZW5ndGggPSB0aGlzLmFycmF5Lmxlbmd0aDtcblxuICAgIHJldHVybiBsZW5ndGg7XG4gIH1cblxuICBnZXRUZXJtKGluZGV4KSB7XG4gICAgY29uc3QgdGVybSA9IHRoaXMuYXJyYXlbaW5kZXhdIHx8IG51bGw7ICAvLy9cblxuICAgIHJldHVybiB0ZXJtO1xuICB9XG5cbiAgYWRkVGVybSh0ZXJtKSB7XG4gICAgdGhpcy5hcnJheS5wdXNoKHRlcm0pO1xuICB9XG5cbiAgbWFwVGVybShjYWxsYmFjaywgY29udGV4dCwgZm9yd2FyZCwgYmFjaykge1xuICAgIHJldHVybiBtYXAodGhpcy5hcnJheSwgY2FsbGJhY2ssIGNvbnRleHQsIGZvcndhcmQsIGJhY2spO1xuICB9XG5cbiAgZXZhbHVhdGUoY29udGV4dCwgYmFjaywgZm9yd2FyZCkge1xuICAgIHJldHVybiB0aGlzLm1hcFRlcm0oKHRlcm0sIGNvbnRleHQsIGZvcndhcmQsIGJhY2spID0+
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3Rlcm1zLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50LCBjb250aW51YXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBlbGVtZW50cyBmcm9tIFwiLi4vZWxlbWVudHNcIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgeyB0ZXJtc1N0cmluZ0Zyb21UZXJtc0FycmF5LCB2YWx1ZXNTdHJpbmdGcm9tVmFsdWVzQXJyYXkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCB7IG1hcCB9ID0gY29udGludWF0aW9uVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgVGVybXMgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBhcnJheSkge1xuICAgIHN1cGVyKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCk7XG5cbiAgICB0aGlzLmFycmF5ID0gYXJyYXk7XG4gIH1cblxuICBnZXRBcnJheSgpIHtcbiAgICByZXR1cm4gdGhpcy5hcnJheTtcbiAgfVxuXG4gIGdldExlbmd0aCgpIHtcbiAgICBjb25zdCBsZW5ndGggPSB0aGlzLmFycmF5Lmxlbmd0aDtcblxuICAgIHJldHVybiBsZW5ndGg7XG4gIH1cblxuICBnZXRUZXJtKGluZGV4KSB7XG4gICAgY29uc3QgdGVybSA9IHRoaXMuYXJyYXlbaW5kZXhdIHx8IG51bGw7ICAvLy9cblxuICAgIHJldHVybiB0ZXJtO1xuICB9XG5cbiAgYWRkVGVybSh0ZXJtKSB7XG4gICAgdGhpcy5hcnJheS5wdXNoKHRlcm0pO1xuICB9XG5cbiAgbWFwVGVybShjYWxsYmFjaywgY29udGV4dCwgZm9yd2FyZCwgYmFjaykge1xuICAgIHJldHVybiBtYXAodGhpcy5hcnJheSwgY2FsbGJhY2ssIGNvbnRleHQsIGZvcndhcmQsIGJhY2spO1xuICB9XG5cbiAgZXZhbHVhdGUoY29udGV4dCwgYmFjaywgZm9yd2FyZCkge1xuICAgIHJldHVybiB0aGlzLm1hcFRlcm0oKHRlcm0sIGNvbnRleHQsIGZvcndhcmQsIGJhY2spID0+IHtcbiAgICAgIHJldHVybiB0ZXJtLmV2YWx1YXRlKGNvbnRleHQsIGZvcndhcmQsIGJhY2spO1xuICAgIH0sIChhcnJheSkgPT4ge1xuICAgICAgY29uc3QgdmFsdWVzQXJyYXkgPSBhcnJheSwgIC8vL1xuICAgICAgICAgICAgdmFsdWVzU3RyaW5nID0gdmFsdWVzU3RyaW5nRnJvbVZhbHVlc0FycmF5KHZhbHVlc0FycmF5KSxcbiAgICAgICAgICAgIHN0cmluZyA9IHZhbHVlc1N0cmluZywgLy8vXG4gICAgICAgICAgICBub2RlID0gbnVsbCxcbiAgICAgICAgICAgIGJyZWFrUG9pbnQgPSBudWxsO1xuXG4gICAgICBjb250ZXh0ID0gbnVsbDtcblxuICAgICAgY29uc3QgeyBWYWx1ZXMgfSA9IGVsZW1lbnRzLFxuICAgICAgICAgICAgdmFsdWVzID0gbmV3IFZhbHVlcyhjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIGFycmF5KTtcblxuICAgICAgcmV0dXJuIGZvcndhcmQodmFsdWVzLCBiYWNrKTtcbiAgICB9LCBiYWNrKTtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJUZXJtc1wiO1xuXG4gIHN0YXRpYyBmcm9tVGVybSh0ZXJtLCBjb250ZXh0KSB7XG4gICAgY29uc3QgdGVybXNBcnJheSA9IFtcbiAgICAgICAgICAgIHRlcm1cbiAgICAgICAgICBdLFxuICAgICAgICAgIHRlcm1zU3RyaW5nID0gdGVybXNTdHJpbmdGcm9tVGVybXNBcnJheSh0ZXJtc0FycmF5LCBjb250ZXh0KSxcbiAgICAgICAgICBzdHJpbmcgPSB0ZXJtc1N0cmluZywgLy8vXG4gICAgICAgICAgYXJyYXkgPSB0ZXJtc0FycmF5LCAvLy9cbiAgICAgICAgICBub2RlID0gbnVsbCxcbiAgICAgICAgICBicmVha1BvaW50ID0gbnVsbDtcblxuICAgIGNvbnRleHQgPSBudWxsO1xuXG4gICAgY29uc3QgdGVybXMgPSBuZXcgVGVybXMoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBhcnJheSk7XG5cbiAgICByZXR1cm4gdGVybXM7XG4gIH1cbn0pO1xuIl0sIm5hbWVzIjpbIm1hcCIsImNvbnRpbnVhdGlvblV0aWxpdGllcyIsImRlZmluZSIsIlRlcm1zIiwiRWxlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsImFycmF5IiwiZ2V0QXJyYXkiLCJnZXRMZW5ndGgiLCJsZW5ndGgiLCJnZXRUZXJtIiwiaW5kZXgiLCJ0ZXJtIiwiYWRkVGVybSIsInB1c2giLCJtYXBUZXJtIiwiY2FsbGJhY2siLCJmb3J3YXJkIiwiYmFjayIsImV2YWx1YXRlIiwidmFsdWVzQXJyYXkiLCJ2YWx1ZXNTdHJpbmciLCJ2YWx1ZXNTdHJpbmdGcm9tVmFsdWVzQXJyYXkiLCJWYWx1ZXMiLCJlbGVtZW50cyIsInZhbHVlcyIsIm5hbWUiLCJmcm9tVGVybSIsInRlcm1zQXJyYXkiLCJ0ZXJtc1N0cmluZyIsInRlcm1zU3RyaW5nRnJvbVRlcm1zQXJyYXkiLCJ0ZXJtcyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBV0E7OztlQUFBOzs7Z0NBVCtDO2tFQUUxQjt3QkFHa0Q7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUV2RSxNQUFNLEVBQUVBLEdBQUcsRUFBRSxHQUFHQyxxQ0FBcUI7TUFFckMsV0FBZUMsSUFBQUEsZ0JBQU0sRUFBQyxNQUFNQyxjQUFjQyx1QkFBTztJQUMvQyxZQUFZQyxPQUFPLEVBQUVDLE1BQU0sRUFBRUMsSUFBSSxFQUFFQyxVQUFVLEVBQUVDLEtBQUssQ0FBRTtRQUNwRCxLQUFLLENBQUNKLFNBQVNDLFFBQVFDLE1BQU1DO1FBRTdCLElBQUksQ0FBQ0MsS0FBSyxHQUFHQTtJQUNmO0lBRUFDLFdBQVc7UUFDVCxPQUFPLElBQUksQ0FBQ0QsS0FBSztJQUNuQjtJQUVBRSxZQUFZO1FBQ1YsTUFBTUMsU0FBUyxJQUFJLENBQUNILEtBQUssQ0FBQ0csTUFBTTtRQUVoQyxPQUFPQTtJQUNUO0lBRUFDLFFBQVFDLEtBQUssRUFBRTtRQUNiLE1BQU1DLE9BQU8sSUFBSSxDQUFDTixLQUFLLENBQUNLLE1BQU0sSUFBSSxNQUFPLEdBQUc7UUFFNUMsT0FBT0M7SUFDVDtJQUVBQyxRQUFRRCxJQUFJLEVBQUU7UUFDWixJQUFJLENBQUNOLEtBQUssQ0FBQ1EsSUFBSSxDQUFDRjtJQUNsQjtJQUVBRyxRQUFRQyxRQUFRLEVBQUVkLE9BQU8sRUFBRWUsT0FBTyxFQUFFQyxJQUFJLEVBQUU7UUFDeEMsT0FBT3JCLElBQUksSUFBSSxDQUFDUyxLQUFLLEVBQUVVLFVBQVVkLFNBQVNlLFNBQVNDO0lBQ3JEO0lBRUFDLFNBQVNqQixPQUFPLEVBQUVnQixJQUFJLEVBQUVELE9BQU8sRUFBRTtRQUMvQixPQUFPLElBQUksQ0FBQ0YsT0FBTyxDQUFDLENBQUNILE1BQU1WLFNBQVNlLFNBQVNDO1lBQzNDLE9BQU9OLEtBQUtPLFFBQVEsQ0FBQ2pCLFNBQVNlLFNBQVNDO1FBQ3pDLEdBQUcsQ0FBQ1o7WUFDRixNQUFNYyxjQUFjZCxPQUNkZSxlQUFlQyxJQUFBQSxtQ0FBMkIsRUFBQ0YsY0FDM0NqQixTQUFTa0IsY0FDVGpCLE9BQU8sTUFDUEMsYUFBYTtZQUVuQkgsVUFBVTtZQUVWLE1BQU0sRUFBRXFCLE1BQU0sRUFBRSxHQUFHQyxpQkFBUSxFQUNyQkMsU0FBUyxJQUFJRixPQUFPckIsU0FBU0MsUUFBUUMsTUFBTUMsWUFBWUM7WUFFN0QsT0FBT1csUUFBUVEsUUFBUVA7UUFDekIsR0FBR0E7SUFDTDtJQUVBLE9BQU9RLE9BQU8sUUFBUTtJQUV0QixPQUFPQyxTQUFTZixJQUFJLEVBQUVWLE9BQU8sRUFBRTtRQUM3QixNQUFNMEIsYUFBYTtZQUNYaEI7U0FDRCxFQUNEaUIsY0FBY0MsSUFBQUEsaUNBQXlCLEVBQUNGLFlBQVkxQixVQUNwREMsU0FBUzBCLGFBQ1R2QixRQUFRc0IsWUFDUnhCLE9BQU8sTUFDUEMsYUFBYTtRQUVuQkgsVUFBVTtRQUVWLE1BQU02QixRQUFRLElBQUkvQixNQUFNRSxTQUFTQyxRQUFRQyxNQUFNQyxZQUFZQztRQUUzRCxPQUFPeUI7SUFDVDtBQUNGIn0=
|
package/lib/element/values.js
CHANGED
|
@@ -40,8 +40,8 @@ const _default = (0, _elements.define)(class Values extends _occamlanguages.Elem
|
|
|
40
40
|
evaluate(context, forward, back) {
|
|
41
41
|
return this.mapValue((value, forward, back)=>{
|
|
42
42
|
return value.evaluate(context, forward, back);
|
|
43
|
-
}, (
|
|
44
|
-
const valuesString = (0, _string.valuesStringFromValuesArray)(valuesArray), string = valuesString,
|
|
43
|
+
}, (array, back)=>{
|
|
44
|
+
const valuesArray = array, valuesString = (0, _string.valuesStringFromValuesArray)(valuesArray), string = valuesString, node = null, breakPoint = null;
|
|
45
45
|
context = null;
|
|
46
46
|
const values = new Values(context, string, node, breakPoint, array);
|
|
47
47
|
return forward(values, back);
|
|
@@ -71,4 +71,4 @@ const _default = (0, _elements.define)(class Values extends _occamlanguages.Elem
|
|
|
71
71
|
}
|
|
72
72
|
});
|
|
73
73
|
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3ZhbHVlcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCwgY29udGludWF0aW9uVXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcbmltcG9ydCB7IHZhbHVlc1N0cmluZ0Zyb21WYWx1ZXNBcnJheSB9IGZyb20gXCIuLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5cbmNvbnN0IHsgbWFwIH0gPSBjb250aW51YXRpb25VdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZShjbGFzcyBWYWx1ZXMgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBhcnJheSkge1xuICAgIHN1cGVyKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCk7XG5cbiAgICB0aGlzLmFycmF5ID0gYXJyYXk7XG4gIH1cblxuICBnZXRBcnJheSgpIHtcbiAgICByZXR1cm4gdGhpcy5hcnJheTtcbiAgfVxuXG4gIGdldExlbmd0aCgpIHtcbiAgICBjb25zdCBsZW5ndGggPSB0aGlzLmFycmF5Lmxlbmd0aDtcblxuICAgIHJldHVybiBsZW5ndGg7XG4gIH1cblxuICBnZXRWYWx1ZShpbmRleCkge1xuICAgIGNvbnN0IHZhbHVlID0gdGhpcy5hcnJheVtpbmRleF0gfHwgbnVsbDsgIC8vL1xuXG4gICAgcmV0dXJuIHZhbHVlO1xuICB9XG5cbiAgYWRkVmFsdWUodmFsdWUpIHtcbiAgICB0aGlzLmFycmF5LnB1c2godmFsdWUpO1xuICB9XG5cbiAgbWFwVmFsdWUoY2FsbGJhY2ssIGZvcndhcmQsIGJhY2spIHtcbiAgICByZXR1cm4gbWFwKHRoaXMuYXJyYXksIGNhbGxiYWNrLCBmb3J3YXJkLCBiYWNrKTtcbiAgfVxuXG4gIGZvckVhY2hWYWx1ZShjYWxsYmFjaykge1xuICAgIHRoaXMuYXJyYXkuZm9yRWFjaChjYWxsYmFjayk7XG4gIH1cblxuICBldmFsdWF0ZShjb250ZXh0LCBmb3J3YXJkLCBiYWNrKSB7XG4gICAgcmV0dXJuIHRoaXMubWFwVmFsdWUoKHZhbHVlLCBmb3J3YXJkLCBiYWNrKSA9PiB7XG4gICAgICByZXR1cm4gdmFsdWUuZXZhbHVhdGUoY29udGV4dCwgZm9yd2FyZCwgYmFjayk7XG4gICAgfSwgKGFycmF5LCBiYWNrKSA9PiB7XG4gICAgICBjb25zdCB2YWx1ZXNBcnJheSA9IGFycmF5LCAgLy8vXG4gICAgICAgICAgICB2YWx1ZXNTdHJpbmcgPSB2YWx1ZXNTdHJpbmdGcm9tVmFsdWVzQXJyYXkodmFsdWVzQXJyYXkpLFxuICAgICAgICAgICAgc3RyaW5nID0gdmFsdWVzU3RyaW5nLCAvLy9cbiAgICAgICAgICAgIG5vZGUgPSBudWxsLFxuICAgICAgICAgICAgYnJlYWtQb2ludCA9IG51bGw7XG5cbiAgICAgIGNvbnRleHQgPSBudWxsO1xuXG4gICAgICBjb25zdCB2YWx1ZXMgPSBuZXcgVmFsdWVzKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgYXJyYXkpO1xuXG4gICAgICByZXR1cm4gZm9yd2FyZCh2YWx1ZXMsIGJhY2spO1xuICAgIH0sIGJhY2spO1xuICB9XG5cbiAgbWVyZ2UodmFsdWVzLCBjb250ZXh0KSB7XG4gICAgbGV0IGFycmF5O1xuXG4gICAgYXJyYXkgPSB2YWx1ZXMuZ2V0QXJyYXkoKTtcblxuICAgIGNvbnN0IHZhbHVlc0FycmF5ID0gW1xuICAgICAgICAgICAgLi4udGhpcy5hcnJheSxcbiAgICAgICAgICAgIC4uLmFycmF5LFxuICAgICAgICAgIF0sXG4gICAgICAgICAgdmFsdWVzU3RyaW5nID0gdmFsdWVzU3RyaW5nRnJvbVZhbHVlc0FycmF5KHZhbHVlc0FycmF5KSxcbiAgICAgICAgICBzdHJpbmcgPSB2YWx1ZXNTdHJpbmc7IC8vL1xuXG4gICAgYXJyYXkgPSB2YWx1ZXNBcnJheTsgLy8vXG5cbiAgICBjb25zdCBub2RlID0gbnVsbCxcbiAgICAgICAgICBicmVha1BvaW50ID0gbnVsbDtcblxuICAgIGNvbnRleHQgPSBudWxsO1xuXG4gICAgdmFsdWVzID0gbmV3IFZhbHVlcyhjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIGFycmF5KTtcblxuICAgIHJldHVybiB2YWx1ZXM7XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiVmFsdWVzXCI7XG5cbiAgc3RhdGljIGZyb21WYWx1ZSh2YWx1ZSwgY29udGV4dCkge1xuICAgIGNvbnN0IHZhbHVlc0FycmF5ID0gW1xuICAgICAgICAgICAgdmFsdWVcbiAgICAgICAgICBdLFxuICAgICAgICAgIHZhbHVlc1N0cmluZyA9IHZhbHVlc1N0cmluZ0Zyb21WYWx1ZXNBcnJheSh2YWx1ZXNBcnJheSksXG4gICAgICAgICAgc3RyaW5nID0gdmFsdWVzU3RyaW5nLCAvLy9cbiAgICAgICAgICBhcnJheSA9IHZhbHVlc0FycmF5LCAvLy9cbiAgICAgICAgICBub2RlID0gbnVsbCxcbiAgICAgICAgICBicmVha1BvaW50ID0gbnVsbDtcblxuICAgIGNvbnRleHQgPSBudWxsO1xuXG4gICAgY29uc3QgdmFsdWVzID0gbmV3IFZhbHVlcyhjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIGFycmF5KTtcblxuICAgIHJldHVybiB2YWx1ZXM7XG4gIH1cbn0pO1xuIl0sIm5hbWVzIjpbIm1hcCIsImNvbnRpbnVhdGlvblV0aWxpdGllcyIsImRlZmluZSIsIlZhbHVlcyIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJhcnJheSIsImdldEFycmF5IiwiZ2V0TGVuZ3RoIiwibGVuZ3RoIiwiZ2V0VmFsdWUiLCJpbmRleCIsInZhbHVlIiwiYWRkVmFsdWUiLCJwdXNoIiwibWFwVmFsdWUiLCJjYWxsYmFjayIsImZvcndhcmQiLCJiYWNrIiwiZm9yRWFjaFZhbHVlIiwiZm9yRWFjaCIsImV2YWx1YXRlIiwidmFsdWVzQXJyYXkiLCJ2YWx1ZXNTdHJpbmciLCJ2YWx1ZXNTdHJpbmdGcm9tVmFsdWVzQXJyYXkiLCJ2YWx1ZXMiLCJtZXJnZSIsIm5hbWUiLCJmcm9tVmFsdWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBQTs7O2dDQVArQzswQkFFeEI7d0JBQ3FCO0FBRTVDLE1BQU0sRUFBRUEsR0FBRyxFQUFFLEdBQUdDLHFDQUFxQjtNQUVyQyxXQUFlQyxJQUFBQSxnQkFBTSxFQUFDLE1BQU1DLGVBQWVDLHVCQUFPO0lBQ2hELFlBQVlDLE9BQU8sRUFBRUMsTUFBTSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsS0FBSyxDQUFFO1FBQ3BELEtBQUssQ0FBQ0osU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxLQUFLLEdBQUdBO0lBQ2Y7SUFFQUMsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDRCxLQUFLO0lBQ25CO0lBRUFFLFlBQVk7UUFDVixNQUFNQyxTQUFTLElBQUksQ0FBQ0gsS0FBSyxDQUFDRyxNQUFNO1FBRWhDLE9BQU9BO0lBQ1Q7SUFFQUMsU0FBU0MsS0FBSyxFQUFFO1FBQ2QsTUFBTUMsUUFBUSxJQUFJLENBQUNOLEtBQUssQ0FBQ0ssTUFBTSxJQUFJLE1BQU8sR0FBRztRQUU3QyxPQUFPQztJQUNUO0lBRUFDLFNBQVNELEtBQUssRUFBRTtRQUNkLElBQUksQ0FBQ04sS0FBSyxDQUFDUSxJQUFJLENBQUNGO0lBQ2xCO0lBRUFHLFNBQVNDLFFBQVEsRUFBRUMsT0FBTyxFQUFFQyxJQUFJLEVBQUU7UUFDaEMsT0FBT3JCLElBQUksSUFBSSxDQUFDUyxLQUFLLEVBQUVVLFVBQVVDLFNBQVNDO0lBQzVDO0lBRUFDLGFBQWFILFFBQVEsRUFBRTtRQUNyQixJQUFJLENBQUNWLEtBQUssQ0FBQ2MsT0FBTyxDQUFDSjtJQUNyQjtJQUVBSyxTQUFTbkIsT0FBTyxFQUFFZSxPQUFPLEVBQUVDLElBQUksRUFBRTtRQUMvQixPQUFPLElBQUksQ0FBQ0gsUUFBUSxDQUFDLENBQUNILE9BQU9LLFNBQVNDO1lBQ3BDLE9BQU9OLE1BQU1TLFFBQVEsQ0FBQ25CLFNBQVNlLFNBQVNDO1FBQzFDLEdBQUcsQ0FBQ1osT0FBT1k7WUFDVCxNQUFNSSxjQUFjaEIsT0FDZGlCLGVBQWVDLElBQUFBLG1DQUEyQixFQUFDRixjQUMzQ25CLFNBQVNvQixjQUNUbkIsT0FBTyxNQUNQQyxhQUFhO1lBRW5CSCxVQUFVO1lBRVYsTUFBTXVCLFNBQVMsSUFBSXpCLE9BQU9FLFNBQVNDLFFBQVFDLE1BQU1DLFlBQVlDO1lBRTdELE9BQU9XLFFBQVFRLFFBQVFQO1FBQ3pCLEdBQUdBO0lBQ0w7SUFFQVEsTUFBTUQsTUFBTSxFQUFFdkIsT0FBTyxFQUFFO1FBQ3JCLElBQUlJO1FBRUpBLFFBQVFtQixPQUFPbEIsUUFBUTtRQUV2QixNQUFNZSxjQUFjO2VBQ1QsSUFBSSxDQUFDaEIsS0FBSztlQUNWQTtTQUNKLEVBQ0RpQixlQUFlQyxJQUFBQSxtQ0FBMkIsRUFBQ0YsY0FDM0NuQixTQUFTb0IsY0FBYyxHQUFHO1FBRWhDakIsUUFBUWdCLGFBQWEsR0FBRztRQUV4QixNQUFNbEIsT0FBTyxNQUNQQyxhQUFhO1FBRW5CSCxVQUFVO1FBRVZ1QixTQUFTLElBQUl6QixPQUFPRSxTQUFTQyxRQUFRQyxNQUFNQyxZQUFZQztRQUV2RCxPQUFPbUI7SUFDVDtJQUVBLE9BQU9FLE9BQU8sU0FBUztJQUV2QixPQUFPQyxVQUFVaEIsS0FBSyxFQUFFVixPQUFPLEVBQUU7UUFDL0IsTUFBTW9CLGNBQWM7WUFDWlY7U0FDRCxFQUNEVyxlQUFlQyxJQUFBQSxtQ0FBMkIsRUFBQ0YsY0FDM0NuQixTQUFTb0IsY0FDVGpCLFFBQVFnQixhQUNSbEIsT0FBTyxNQUNQQyxhQUFhO1FBRW5CSCxVQUFVO1FBRVYsTUFBTXVCLFNBQVMsSUFBSXpCLE9BQU9FLFNBQVNDLFFBQVFDLE1BQU1DLFlBQVlDO1FBRTdELE9BQU9tQjtJQUNUO0FBQ0YifQ==
|
package/package.json
CHANGED
|
@@ -39,37 +39,6 @@ export default define(class NamedBindings extends Element {
|
|
|
39
39
|
return forEach(this.array, callback, forward, back);
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
compareTerms(terms, context, forward, back) {
|
|
43
|
-
const termsString = terms.getString(),
|
|
44
|
-
namedBindingsString = this.getString(); ///
|
|
45
|
-
|
|
46
|
-
context.trace(`Comparing the '${termsString}' terms with the '${namedBindingsString}' named bindings...`);
|
|
47
|
-
|
|
48
|
-
const termsLength = terms.getLength(),
|
|
49
|
-
namedBindingsLength = this.getLength();
|
|
50
|
-
|
|
51
|
-
if (termsLength !== namedBindingsLength) {
|
|
52
|
-
const message = `The '${termsString}' terms and '${namedBindingsString}' named bindings are not of the same length.`,
|
|
53
|
-
exception = Exception.fromMessage(message);
|
|
54
|
-
|
|
55
|
-
return back(exception);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
return this.forEachNamedBinding((namedBinding, forward, back, index) => {
|
|
59
|
-
if (namedBinding === null) {
|
|
60
|
-
return forward(back);
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
const term = terms.getTerm(index);
|
|
64
|
-
|
|
65
|
-
return namedBinding.compareTerm(term, context, forward, back);
|
|
66
|
-
}, (back) => {
|
|
67
|
-
context.debug(`...compared the '${termsString}' terms with the '${namedBindingsString}' named bindings.`);
|
|
68
|
-
|
|
69
|
-
return forward(back);
|
|
70
|
-
}, back);
|
|
71
|
-
}
|
|
72
|
-
|
|
73
42
|
compareNamedBinding(namedBinding, context, forward, back) {
|
|
74
43
|
const namedBindingString = namedBinding.getString(),
|
|
75
44
|
namedBindingsString = this.getString(); ///
|
package/src/element/bindings.js
CHANGED
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
import { Element, continuationUtilities } from "occam-languages";
|
|
4
4
|
|
|
5
|
-
import Exception from "../exception";
|
|
6
|
-
|
|
7
5
|
import { define } from "../elements";
|
|
8
6
|
|
|
9
7
|
const { forEach } = continuationUtilities;
|
|
@@ -35,36 +33,5 @@ export default define(class Bindings extends Element {
|
|
|
35
33
|
return forEach(this.array, callback, forward, back);
|
|
36
34
|
}
|
|
37
35
|
|
|
38
|
-
compareTerms(terms, context, forward, back) {
|
|
39
|
-
const termsString = terms.getString(),
|
|
40
|
-
bindingsString = this.getString(); ///
|
|
41
|
-
|
|
42
|
-
context.trace(`Comparing the '${termsString}' terms against the '${bindingsString}' bindings...`);
|
|
43
|
-
|
|
44
|
-
const termsLength = terms.getLength(),
|
|
45
|
-
bindingsLength = this.getLength();
|
|
46
|
-
|
|
47
|
-
if (termsLength !== bindingsLength) {
|
|
48
|
-
const message = `The '${termsString}' expressions and '${bindingsString}' bindings are not of the same length.`,
|
|
49
|
-
exception = Exception.fromMessage(message);
|
|
50
|
-
|
|
51
|
-
return back(exception);
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
return this.forEachBinding((binding, forward, back, index) => {
|
|
55
|
-
if (binding === null) {
|
|
56
|
-
return forward(back);
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
const term = terms.getTerm(index);
|
|
60
|
-
|
|
61
|
-
return binding.compareTerm(term, context, forward, back);
|
|
62
|
-
}, (back) => {
|
|
63
|
-
context.debug(`...compared the '${termsString}' terms against the '${bindingsString}' bindings.`);
|
|
64
|
-
|
|
65
|
-
return forward(back);
|
|
66
|
-
}, back);
|
|
67
|
-
}
|
|
68
|
-
|
|
69
36
|
static name = "Bindings";
|
|
70
37
|
});
|
package/src/element/every.js
CHANGED
|
@@ -59,7 +59,19 @@ export default define(class Every extends Element {
|
|
|
59
59
|
context.trace(`...evaluated the '${everyString}' function as '${valueString}'.`);
|
|
60
60
|
|
|
61
61
|
return forward(value, back);
|
|
62
|
-
},
|
|
62
|
+
}, (exception) => {
|
|
63
|
+
if (exception) {
|
|
64
|
+
return back(exception);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const boolean = false,
|
|
68
|
+
value = valueFromBoolean(boolean, context),
|
|
69
|
+
valueString = value.getString();
|
|
70
|
+
|
|
71
|
+
context.trace(`...evaluated the '${everyString}' function as '${valueString}'.`);
|
|
72
|
+
|
|
73
|
+
return forward(value, back);
|
|
74
|
+
});
|
|
63
75
|
}, back);
|
|
64
76
|
});
|
|
65
77
|
|
package/src/element/some.js
CHANGED
|
@@ -58,7 +58,19 @@ export default define(class Some extends Element {
|
|
|
58
58
|
context.trace(`...evaluated the '${someString}' function as '${valueString}'.`);
|
|
59
59
|
|
|
60
60
|
return forward(value, back);
|
|
61
|
-
},
|
|
61
|
+
}, (exception) => {
|
|
62
|
+
if (exception) {
|
|
63
|
+
return back(exception);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
const boolean = false,
|
|
67
|
+
value = valueFromBoolean(boolean, context),
|
|
68
|
+
valueString = value.getString();
|
|
69
|
+
|
|
70
|
+
context.trace(`...evaluated the '${someString}' function as '${valueString}'.`);
|
|
71
|
+
|
|
72
|
+
return forward(value, back);
|
|
73
|
+
});
|
|
62
74
|
}, back);
|
|
63
75
|
});
|
|
64
76
|
|
package/src/element/terms.js
CHANGED
|
@@ -43,10 +43,10 @@ export default define(class Terms extends Element {
|
|
|
43
43
|
evaluate(context, back, forward) {
|
|
44
44
|
return this.mapTerm((term, context, forward, back) => {
|
|
45
45
|
return term.evaluate(context, forward, back);
|
|
46
|
-
}, (
|
|
47
|
-
const
|
|
46
|
+
}, (array) => {
|
|
47
|
+
const valuesArray = array, ///
|
|
48
|
+
valuesString = valuesStringFromValuesArray(valuesArray),
|
|
48
49
|
string = valuesString, ///
|
|
49
|
-
array = valuesArray, ///
|
|
50
50
|
node = null,
|
|
51
51
|
breakPoint = null;
|
|
52
52
|
|
package/src/element/values.js
CHANGED
|
@@ -45,10 +45,10 @@ export default define(class Values extends Element {
|
|
|
45
45
|
evaluate(context, forward, back) {
|
|
46
46
|
return this.mapValue((value, forward, back) => {
|
|
47
47
|
return value.evaluate(context, forward, back);
|
|
48
|
-
}, (
|
|
49
|
-
const
|
|
48
|
+
}, (array, back) => {
|
|
49
|
+
const valuesArray = array, ///
|
|
50
|
+
valuesString = valuesStringFromValuesArray(valuesArray),
|
|
50
51
|
string = valuesString, ///
|
|
51
|
-
array = valuesArray, ///
|
|
52
52
|
node = null,
|
|
53
53
|
breakPoint = null;
|
|
54
54
|
|