occam-verify-cli 0.0.698 → 0.0.702
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/assignment/equality.js +4 -4
- package/lib/assignment/metavariable.js +4 -4
- package/lib/assignment/variable.js +4 -4
- package/lib/collection.js +44 -6
- package/lib/conclusion.js +6 -6
- package/lib/consequent.js +4 -4
- package/lib/constructor.js +3 -10
- package/lib/context/file.js +12 -73
- package/lib/context/local.js +31 -70
- package/lib/context/localMeta.js +12 -9
- package/lib/context/release.js +2 -4
- package/lib/equality.js +22 -6
- package/lib/metaType.js +10 -10
- package/lib/metavariable.js +3 -10
- package/lib/mixins/context.js +107 -0
- package/lib/premise.js +9 -9
- package/lib/ruleNames.js +9 -1
- package/lib/supposition.js +4 -4
- package/lib/type.js +23 -27
- package/lib/utilities/collection.js +27 -13
- package/lib/utilities/node.js +3 -73
- package/lib/utilities/tokens.js +1 -8
- package/lib/variable.js +11 -10
- package/lib/verifier/node/statementAsCombinator.js +4 -1
- package/lib/verifier/node/termAsConstructor.js +4 -20
- package/lib/verifier/nodes/equality.js +169 -0
- package/lib/verifier/nodes/metastatementForMetavariable.js +6 -7
- package/lib/verifier/nodes/statement.js +12 -4
- package/lib/verifier/nodes/statementForMetavariable.js +6 -7
- package/lib/verifier/nodes/termForVariable.js +19 -20
- package/lib/verify/axiom.js +3 -8
- package/lib/verify/conclusion.js +2 -2
- package/lib/verify/conjecture.js +4 -9
- package/lib/verify/consequent.js +3 -3
- package/lib/verify/derivation.js +30 -13
- package/lib/verify/equality.js +17 -12
- package/lib/verify/givenType.js +32 -0
- package/lib/verify/lemma.js +4 -9
- package/lib/verify/metastatement.js +3 -3
- package/lib/verify/premises.js +28 -0
- package/lib/verify/rule.js +3 -8
- package/lib/verify/ruleDerivation.js +6 -8
- package/lib/verify/statement/qualified.js +135 -37
- package/lib/verify/statement.js +34 -42
- package/lib/verify/supposition.js +6 -7
- package/lib/verify/suppositions.js +28 -0
- package/lib/verify/term.js +25 -60
- package/lib/verify/termAndGivenType.js +39 -0
- package/lib/verify/termAsGivenVariable.js +36 -0
- package/lib/verify/theorem.js +3 -8
- package/lib/verify/typeAssertion.js +44 -27
- package/package.json +1 -1
- package/src/assignment/equality.js +5 -5
- package/src/assignment/metavariable.js +5 -5
- package/src/assignment/variable.js +7 -5
- package/src/collection.js +55 -5
- package/src/conclusion.js +6 -6
- package/src/consequent.js +4 -4
- package/src/constructor.js +2 -7
- package/src/context/file.js +16 -13
- package/src/context/local.js +39 -86
- package/src/context/localMeta.js +11 -7
- package/src/context/release.js +6 -9
- package/src/equality.js +25 -4
- package/src/metaType.js +10 -10
- package/src/metavariable.js +2 -7
- package/src/mixins/{file.js → context.js} +20 -2
- package/src/premise.js +10 -10
- package/src/ruleNames.js +2 -0
- package/src/supposition.js +3 -3
- package/src/type.js +27 -39
- package/src/utilities/collection.js +31 -11
- package/src/utilities/node.js +3 -81
- package/src/utilities/tokens.js +0 -8
- package/src/variable.js +9 -6
- package/src/verifier/node/statementAsCombinator.js +7 -1
- package/src/verifier/node/termAsConstructor.js +5 -26
- package/src/verifier/nodes/equality.js +47 -0
- package/src/verifier/nodes/metastatementForMetavariable.js +10 -10
- package/src/verifier/nodes/statement.js +1 -1
- package/src/verifier/nodes/statementForMetavariable.js +10 -10
- package/src/verifier/nodes/termForVariable.js +30 -30
- package/src/verify/axiom.js +2 -8
- package/src/verify/conclusion.js +1 -1
- package/src/verify/conjecture.js +3 -9
- package/src/verify/consequent.js +4 -4
- package/src/verify/derivation.js +39 -16
- package/src/verify/equality.js +20 -11
- package/src/verify/{standaloneType.js → givenType.js} +7 -7
- package/src/verify/lemma.js +3 -9
- package/src/verify/metastatement.js +2 -2
- package/src/verify/premises.js +17 -0
- package/src/verify/rule.js +2 -8
- package/src/verify/ruleDerivation.js +5 -7
- package/src/verify/statement/qualified.js +194 -39
- package/src/verify/statement.js +47 -47
- package/src/verify/supposition.js +10 -12
- package/src/verify/suppositions.js +17 -0
- package/src/verify/term.js +26 -64
- package/src/verify/termAndGivenType.js +37 -0
- package/src/verify/termAsGivenVariable.js +39 -0
- package/src/verify/theorem.js +2 -8
- package/src/verify/typeAssertion.js +59 -32
- package/lib/mixins/file.js +0 -83
- package/lib/mixins/logging.js +0 -39
- package/lib/verifier/nodes/metastatementForMetavariable/conclusion.js +0 -114
- package/lib/verifier/nodes/metastatementForMetavariable/premise.js +0 -114
- package/lib/verifier/nodes/statementForMetavariable/conclusion.js +0 -114
- package/lib/verifier/nodes/statementForMetavariable/premise.js +0 -114
- package/lib/verifier/nodes/termForVariable/consequent.js +0 -114
- package/lib/verifier/nodes/termForVariable/supposition.js +0 -114
- package/lib/verify/standaloneType.js +0 -32
- package/lib/verify/termAndStandaloneType.js +0 -39
- package/lib/verify/termAsVariableAndStandaloneType.js +0 -39
- package/src/mixins/logging.js +0 -24
- package/src/verifier/nodes/metastatementForMetavariable/conclusion.js +0 -11
- package/src/verifier/nodes/metastatementForMetavariable/premise.js +0 -11
- package/src/verifier/nodes/statementForMetavariable/conclusion.js +0 -11
- package/src/verifier/nodes/statementForMetavariable/premise.js +0 -11
- package/src/verifier/nodes/termForVariable/consequent.js +0 -11
- package/src/verifier/nodes/termForVariable/supposition.js +0 -11
- package/src/verify/termAndStandaloneType.js +0 -37
- package/src/verify/termAsVariableAndStandaloneType.js +0 -38
|
@@ -41,9 +41,9 @@ var EqualityAssignment = /*#__PURE__*/ function() {
|
|
|
41
41
|
},
|
|
42
42
|
{
|
|
43
43
|
key: "assign",
|
|
44
|
-
value: function assign(
|
|
45
|
-
var equalityAdded =
|
|
46
|
-
equalityAssigned ?
|
|
44
|
+
value: function assign(context) {
|
|
45
|
+
var equalityAdded = context.addEquality(this.equality), equalityNode = this.equality.getNode(), equalityString = context.nodeAsString(equalityNode), equalityAssigned = equalityAdded; ///
|
|
46
|
+
equalityAssigned ? context.trace("Assigned the '".concat(equalityString, "' equality."), equalityNode) : context.debug("Unable to assign the '".concat(equalityString, "' equality."), equalityNode);
|
|
47
47
|
return equalityAssigned;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
@@ -59,4 +59,4 @@ var EqualityAssignment = /*#__PURE__*/ function() {
|
|
|
59
59
|
return EqualityAssignment;
|
|
60
60
|
}();
|
|
61
61
|
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hc3NpZ25tZW50L2VxdWFsaXR5LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBFcXVhbGl0eUFzc2lnbm1lbnQge1xuICBjb25zdHJ1Y3RvcihlcXVhbGl0eSkge1xuICAgIHRoaXMuZXF1YWxpdHkgPSBlcXVhbGl0eTtcbiAgfVxuXG4gIGdldEVxdWFsaXR5KCkge1xuICAgIHJldHVybiB0aGlzLmVxdWFsaXR5O1xuICB9XG5cbiAgYXNzaWduKGNvbnRleHQpIHtcbiAgICBjb25zdCBlcXVhbGl0eUFkZGVkID0gY29udGV4dC5hZGRFcXVhbGl0eSh0aGlzLmVxdWFsaXR5KSxcbiAgICAgICAgICBlcXVhbGl0eU5vZGUgPSB0aGlzLmVxdWFsaXR5LmdldE5vZGUoKSxcbiAgICAgICAgICBlcXVhbGl0eVN0cmluZyA9IGNvbnRleHQubm9kZUFzU3RyaW5nKGVxdWFsaXR5Tm9kZSksXG4gICAgICAgICAgZXF1YWxpdHlBc3NpZ25lZCA9IGVxdWFsaXR5QWRkZWQ7IC8vL1xuXG4gICAgZXF1YWxpdHlBc3NpZ25lZCA/XG4gICAgICBjb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7ZXF1YWxpdHlTdHJpbmd9JyBlcXVhbGl0eS5gLCBlcXVhbGl0eU5vZGUpIDpcbiAgICAgICAgY29udGV4dC5kZWJ1ZyhgVW5hYmxlIHRvIGFzc2lnbiB0aGUgJyR7ZXF1YWxpdHlTdHJpbmd9JyBlcXVhbGl0eS5gLCBlcXVhbGl0eU5vZGUpO1xuXG4gICAgcmV0dXJuIGVxdWFsaXR5QXNzaWduZWQ7XG4gIH1cblxuICBzdGF0aWMgZnJvbUVxdWFsaXR5KGVxdWFsaXR5KSB7XG4gICAgY29uc3QgZXF1YWxpdHlBc3NpZ25tZW50ID0gbmV3IEVxdWFsaXR5QXNzaWdubWVudChlcXVhbGl0eSk7XG5cbiAgICByZXR1cm4gZXF1YWxpdHlBc3NpZ25tZW50O1xuICB9XG59XG4iXSwibmFtZXMiOlsiRXF1YWxpdHlBc3NpZ25tZW50IiwiZXF1YWxpdHkiLCJnZXRFcXVhbGl0eSIsImFzc2lnbiIsImNvbnRleHQiLCJlcXVhbGl0eUFkZGVkIiwiYWRkRXF1YWxpdHkiLCJlcXVhbGl0eU5vZGUiLCJnZXROb2RlIiwiZXF1YWxpdHlTdHJpbmciLCJub2RlQXNTdHJpbmciLCJlcXVhbGl0eUFzc2lnbmVkIiwidHJhY2UiLCJkZWJ1ZyIsImZyb21FcXVhbGl0eSIsImVxdWFsaXR5QXNzaWdubWVudCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFFcUJBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQU4sSUFBQSxBQUFNQSxtQ0FBRCxBQUFMO2FBQU1BLG1CQUNQQyxRQUFRO2dDQURERDtRQUVqQixJQUFJLENBQUNDLFFBQVEsR0FBR0E7O2tCQUZDRDs7WUFLbkJFLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0QsUUFBUTtZQUN0Qjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxPQUFPO2dCQUNaLElBQU1DLGdCQUFnQkQsUUFBUUUsV0FBVyxDQUFDLElBQUksQ0FBQ0wsUUFBUSxHQUNqRE0sZUFBZSxJQUFJLENBQUNOLFFBQVEsQ0FBQ08sT0FBTyxJQUNwQ0MsaUJBQWlCTCxRQUFRTSxZQUFZLENBQUNILGVBQ3RDSSxtQkFBbUJOLGVBQWUsR0FBRztnQkFFM0NNLG1CQUNFUCxRQUFRUSxLQUFLLENBQUMsQUFBQyxpQkFBK0IsT0FBZkgsZ0JBQWUsZ0JBQWNGLGdCQUMxREgsUUFBUVMsS0FBSyxDQUFDLEFBQUMseUJBQXVDLE9BQWZKLGdCQUFlLGdCQUFjRjtnQkFFeEUsT0FBT0k7WUFDVDs7OztZQUVPRyxLQUFBQTttQkFBUCxTQUFPQSxhQUFhYixRQUFRO2dCQUMxQixJQUFNYyxxQkFBcUIsSUF2QlZmLG1CQXVCaUNDO2dCQUVsRCxPQUFPYztZQUNUOzs7V0ExQm1CZiJ9
|
|
@@ -41,9 +41,9 @@ var MetavariableAssignment = /*#__PURE__*/ function() {
|
|
|
41
41
|
},
|
|
42
42
|
{
|
|
43
43
|
key: "assign",
|
|
44
|
-
value: function assign(
|
|
45
|
-
var metavariableAdded =
|
|
46
|
-
metavariableAssigned ?
|
|
44
|
+
value: function assign(fileContext) {
|
|
45
|
+
var metavariableAdded = fileContext.addMetavariable(this.metavariable), metavariableNode = this.metavariable.getNode(), metavariableString = fileContext.nodeAsString(metavariableNode), metavariableAssigned = metavariableAdded; ///
|
|
46
|
+
metavariableAssigned ? fileContext.trace("Assigned the '".concat(metavariableString, "' metavariable."), metavariableNode) : fileContext.debug("Unable to assign the '".concat(metavariableString, "' metavariable."), metavariableNode);
|
|
47
47
|
return metavariableAssigned;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
@@ -59,4 +59,4 @@ var MetavariableAssignment = /*#__PURE__*/ function() {
|
|
|
59
59
|
return MetavariableAssignment;
|
|
60
60
|
}();
|
|
61
61
|
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hc3NpZ25tZW50L21ldGF2YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgTWV0YXZhcmlhYmxlQXNzaWdubWVudCB7XG4gIGNvbnN0cnVjdG9yKG1ldGF2YXJpYWJsZSkge1xuICAgIHRoaXMubWV0YXZhcmlhYmxlID0gbWV0YXZhcmlhYmxlO1xuICB9XG5cbiAgZ2V0TWV0YXZhcmlhYmxlKCkge1xuICAgIHJldHVybiB0aGlzLm1ldGF2YXJpYWJsZTtcbiAgfVxuXG4gIGFzc2lnbihmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUFkZGVkID0gZmlsZUNvbnRleHQuYWRkTWV0YXZhcmlhYmxlKHRoaXMubWV0YXZhcmlhYmxlKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVOb2RlID0gdGhpcy5tZXRhdmFyaWFibGUuZ2V0Tm9kZSgpLFxuICAgICAgICAgIG1ldGF2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyhtZXRhdmFyaWFibGVOb2RlKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVBc3NpZ25lZCA9IG1ldGF2YXJpYWJsZUFkZGVkOyAvLy9cblxuICAgIG1ldGF2YXJpYWJsZUFzc2lnbmVkID9cbiAgICAgIGZpbGVDb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7bWV0YXZhcmlhYmxlU3RyaW5nfScgbWV0YXZhcmlhYmxlLmAsIG1ldGF2YXJpYWJsZU5vZGUpIDpcbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFVuYWJsZSB0byBhc3NpZ24gdGhlICcke21ldGF2YXJpYWJsZVN0cmluZ30nIG1ldGF2YXJpYWJsZS5gLCBtZXRhdmFyaWFibGVOb2RlKTtcblxuICAgIHJldHVybiBtZXRhdmFyaWFibGVBc3NpZ25lZDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tTWV0YXZhcmlhYmxlKG1ldGF2YXJpYWJsZSkge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUFzc2lnbm1lbnQgPSBuZXcgTWV0YXZhcmlhYmxlQXNzaWdubWVudChtZXRhdmFyaWFibGUpO1xuXG4gICAgcmV0dXJuIG1ldGF2YXJpYWJsZUFzc2lnbm1lbnQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJNZXRhdmFyaWFibGVBc3NpZ25tZW50IiwibWV0YXZhcmlhYmxlIiwiZ2V0TWV0YXZhcmlhYmxlIiwiYXNzaWduIiwiZmlsZUNvbnRleHQiLCJtZXRhdmFyaWFibGVBZGRlZCIsImFkZE1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZU5vZGUiLCJnZXROb2RlIiwibWV0YXZhcmlhYmxlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibWV0YXZhcmlhYmxlQXNzaWduZWQiLCJ0cmFjZSIsImRlYnVnIiwiZnJvbU1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZUFzc2lnbm1lbnQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBRXFCQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFOLElBQUEsQUFBTUEsdUNBQUQsQUFBTDthQUFNQSx1QkFDUEMsWUFBWTtnQ0FETEQ7UUFFakIsSUFBSSxDQUFDQyxZQUFZLEdBQUdBOztrQkFGSEQ7O1lBS25CRSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNELFlBQVk7WUFDMUI7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsV0FBVztnQkFDaEIsSUFBTUMsb0JBQW9CRCxZQUFZRSxlQUFlLENBQUMsSUFBSSxDQUFDTCxZQUFZLEdBQ2pFTSxtQkFBbUIsSUFBSSxDQUFDTixZQUFZLENBQUNPLE9BQU8sSUFDNUNDLHFCQUFxQkwsWUFBWU0sWUFBWSxDQUFDSCxtQkFDOUNJLHVCQUF1Qk4sbUJBQW1CLEdBQUc7Z0JBRW5ETSx1QkFDRVAsWUFBWVEsS0FBSyxDQUFDLEFBQUMsaUJBQW1DLE9BQW5CSCxvQkFBbUIsb0JBQWtCRixvQkFDdEVILFlBQVlTLEtBQUssQ0FBQyxBQUFDLHlCQUEyQyxPQUFuQkosb0JBQW1CLG9CQUFrQkY7Z0JBRXBGLE9BQU9JO1lBQ1Q7Ozs7WUFFT0csS0FBQUE7bUJBQVAsU0FBT0EsaUJBQWlCYixZQUFZO2dCQUNsQyxJQUFNYyx5QkFBeUIsSUF2QmRmLHVCQXVCeUNDO2dCQUUxRCxPQUFPYztZQUNUOzs7V0ExQm1CZiJ9
|
|
@@ -41,9 +41,9 @@ var VariableAssignment = /*#__PURE__*/ function() {
|
|
|
41
41
|
},
|
|
42
42
|
{
|
|
43
43
|
key: "assign",
|
|
44
|
-
value: function assign(
|
|
45
|
-
var variableAdded =
|
|
46
|
-
variableAssigned ?
|
|
44
|
+
value: function assign(context) {
|
|
45
|
+
var variableAdded = context.addVariable(this.variable), variableNode = this.variable.getNode(), variableType = this.variable.getType(), variableString = context.nodeAsString(variableNode), variableTypeName = variableType.getName(), variableAssigned = variableAdded; ///
|
|
46
|
+
variableAssigned ? context.trace("Assigned the '".concat(variableString, "' variable with type '").concat(variableTypeName, "'."), variableNode) : context.debug("Unable to assign the '".concat(variableString, "' variable with type '").concat(variableTypeName, "'."), variableNode);
|
|
47
47
|
return variableAssigned;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
@@ -59,4 +59,4 @@ var VariableAssignment = /*#__PURE__*/ function() {
|
|
|
59
59
|
return VariableAssignment;
|
|
60
60
|
}();
|
|
61
61
|
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hc3NpZ25tZW50L3ZhcmlhYmxlLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBWYXJpYWJsZUFzc2lnbm1lbnQge1xuICBjb25zdHJ1Y3Rvcih2YXJpYWJsZSkge1xuICAgIHRoaXMudmFyaWFibGUgPSB2YXJpYWJsZTtcbiAgfVxuXG4gIGdldFZhcmlhYmxlKCkge1xuICAgIHJldHVybiB0aGlzLnZhcmlhYmxlO1xuICB9XG5cbiAgYXNzaWduKGNvbnRleHQpIHtcbiAgICBjb25zdCB2YXJpYWJsZUFkZGVkID0gY29udGV4dC5hZGRWYXJpYWJsZSh0aGlzLnZhcmlhYmxlKSxcbiAgICAgICAgICB2YXJpYWJsZU5vZGUgPSB0aGlzLnZhcmlhYmxlLmdldE5vZGUoKSxcbiAgICAgICAgICB2YXJpYWJsZVR5cGUgPSB0aGlzLnZhcmlhYmxlLmdldFR5cGUoKSxcbiAgICAgICAgICB2YXJpYWJsZVN0cmluZyA9IGNvbnRleHQubm9kZUFzU3RyaW5nKHZhcmlhYmxlTm9kZSksXG4gICAgICAgICAgdmFyaWFibGVUeXBlTmFtZSA9IHZhcmlhYmxlVHlwZS5nZXROYW1lKCksXG4gICAgICAgICAgdmFyaWFibGVBc3NpZ25lZCA9IHZhcmlhYmxlQWRkZWQ7IC8vL1xuXG4gICAgdmFyaWFibGVBc3NpZ25lZCA/XG4gICAgICBjb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSB3aXRoIHR5cGUgJyR7dmFyaWFibGVUeXBlTmFtZX0nLmAsIHZhcmlhYmxlTm9kZSkgOlxuICAgICAgICBjb250ZXh0LmRlYnVnKGBVbmFibGUgdG8gYXNzaWduIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlIHdpdGggdHlwZSAnJHt2YXJpYWJsZVR5cGVOYW1lfScuYCwgdmFyaWFibGVOb2RlKTtcblxuICAgIHJldHVybiB2YXJpYWJsZUFzc2lnbmVkO1xuICB9XG5cbiAgc3RhdGljIGZyb21WYXJpYWJsZSh2YXJpYWJsZSkge1xuICAgIGNvbnN0IHZhcmlhYmxlQXNzaWdubWVudCA9IG5ldyBWYXJpYWJsZUFzc2lnbm1lbnQodmFyaWFibGUpO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlQXNzaWdubWVudDtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIlZhcmlhYmxlQXNzaWdubWVudCIsInZhcmlhYmxlIiwiZ2V0VmFyaWFibGUiLCJhc3NpZ24iLCJjb250ZXh0IiwidmFyaWFibGVBZGRlZCIsImFkZFZhcmlhYmxlIiwidmFyaWFibGVOb2RlIiwiZ2V0Tm9kZSIsInZhcmlhYmxlVHlwZSIsImdldFR5cGUiLCJ2YXJpYWJsZVN0cmluZyIsIm5vZGVBc1N0cmluZyIsInZhcmlhYmxlVHlwZU5hbWUiLCJnZXROYW1lIiwidmFyaWFibGVBc3NpZ25lZCIsInRyYWNlIiwiZGVidWciLCJmcm9tVmFyaWFibGUiLCJ2YXJpYWJsZUFzc2lnbm1lbnQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBRXFCQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFOLElBQUEsQUFBTUEsbUNBQUQsQUFBTDthQUFNQSxtQkFDUEMsUUFBUTtnQ0FEREQ7UUFFakIsSUFBSSxDQUFDQyxRQUFRLEdBQUdBOztrQkFGQ0Q7O1lBS25CRSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNELFFBQVE7WUFDdEI7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsT0FBTztnQkFDWixJQUFNQyxnQkFBZ0JELFFBQVFFLFdBQVcsQ0FBQyxJQUFJLENBQUNMLFFBQVEsR0FDakRNLGVBQWUsSUFBSSxDQUFDTixRQUFRLENBQUNPLE9BQU8sSUFDcENDLGVBQWUsSUFBSSxDQUFDUixRQUFRLENBQUNTLE9BQU8sSUFDcENDLGlCQUFpQlAsUUFBUVEsWUFBWSxDQUFDTCxlQUN0Q00sbUJBQW1CSixhQUFhSyxPQUFPLElBQ3ZDQyxtQkFBbUJWLGVBQWUsR0FBRztnQkFFM0NVLG1CQUNFWCxRQUFRWSxLQUFLLENBQUMsQUFBQyxpQkFBdURILE9BQXZDRixnQkFBZSwwQkFBeUMsT0FBakJFLGtCQUFpQixPQUFLTixnQkFDMUZILFFBQVFhLEtBQUssQ0FBQyxBQUFDLHlCQUErREosT0FBdkNGLGdCQUFlLDBCQUF5QyxPQUFqQkUsa0JBQWlCLE9BQUtOO2dCQUV4RyxPQUFPUTtZQUNUOzs7O1lBRU9HLEtBQUFBO21CQUFQLFNBQU9BLGFBQWFqQixRQUFRO2dCQUMxQixJQUFNa0IscUJBQXFCLElBekJWbkIsbUJBeUJpQ0M7Z0JBRWxELE9BQU9rQjtZQUNUOzs7V0E1Qm1CbkIifQ==
|
package/lib/collection.js
CHANGED
|
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Collection;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
var _query = require("./utilities/query");
|
|
11
12
|
function _array_like_to_array(arr, len) {
|
|
12
13
|
if (len == null || len > arr.length) len = arr.length;
|
|
13
14
|
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
|
@@ -52,6 +53,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
52
53
|
if (n === "Map" || n === "Set") return Array.from(n);
|
|
53
54
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
54
55
|
}
|
|
56
|
+
var variableNodeQuery = (0, _query.nodeQuery)("/term/variable!");
|
|
55
57
|
var Collection = /*#__PURE__*/ function() {
|
|
56
58
|
function Collection(terms) {
|
|
57
59
|
_class_call_check(this, Collection);
|
|
@@ -78,9 +80,9 @@ var Collection = /*#__PURE__*/ function() {
|
|
|
78
80
|
},
|
|
79
81
|
{
|
|
80
82
|
key: "getType",
|
|
81
|
-
value: function getType() {
|
|
83
|
+
value: function getType(context) {
|
|
82
84
|
var type = this.terms.reduce(function(type, term) {
|
|
83
|
-
var termType = term
|
|
85
|
+
var termType = termTypeFromTerm(term, context);
|
|
84
86
|
if (type === null) {
|
|
85
87
|
type = termType; ///
|
|
86
88
|
} else {
|
|
@@ -96,11 +98,11 @@ var Collection = /*#__PURE__*/ function() {
|
|
|
96
98
|
},
|
|
97
99
|
{
|
|
98
100
|
key: "matchType",
|
|
99
|
-
value: function matchType(type) {
|
|
101
|
+
value: function matchType(type, context) {
|
|
100
102
|
var typeA = type; ///
|
|
101
|
-
type = this.getType();
|
|
103
|
+
type = this.getType(context);
|
|
102
104
|
var typeB = type; ///
|
|
103
|
-
var
|
|
105
|
+
var typeAEqualToTypeB = typeA.isEqualTo(typeB), typeMatches = typeAEqualToTypeB; ///
|
|
104
106
|
return typeMatches;
|
|
105
107
|
}
|
|
106
108
|
},
|
|
@@ -116,6 +118,18 @@ var Collection = /*#__PURE__*/ function() {
|
|
|
116
118
|
return termMatches;
|
|
117
119
|
}
|
|
118
120
|
},
|
|
121
|
+
{
|
|
122
|
+
key: "matchTermNode",
|
|
123
|
+
value: function matchTermNode(termNode) {
|
|
124
|
+
var termNodeA = termNode, termNodeMatches = this.terms.some(function(term) {
|
|
125
|
+
var _$termNode = term.getNode(), termNodeB = _$termNode, termNodeAMatchesTermB = termNodeA.match(termNodeB);
|
|
126
|
+
if (termNodeAMatchesTermB) {
|
|
127
|
+
return true;
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
return termNodeMatches;
|
|
131
|
+
}
|
|
132
|
+
},
|
|
119
133
|
{
|
|
120
134
|
key: "matchTerms",
|
|
121
135
|
value: function matchTerms(terms) {
|
|
@@ -128,6 +142,19 @@ var Collection = /*#__PURE__*/ function() {
|
|
|
128
142
|
});
|
|
129
143
|
return termsMatch;
|
|
130
144
|
}
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
key: "matchTermNodes",
|
|
148
|
+
value: function matchTermNodes(termNodes) {
|
|
149
|
+
var _this = this;
|
|
150
|
+
var termNodesMatch = termNodes.every(function(termNode) {
|
|
151
|
+
var termNodeMatches = _this.matchTermNode(termNode);
|
|
152
|
+
if (termNodeMatches) {
|
|
153
|
+
return true;
|
|
154
|
+
}
|
|
155
|
+
});
|
|
156
|
+
return termNodesMatch;
|
|
157
|
+
}
|
|
131
158
|
}
|
|
132
159
|
], [
|
|
133
160
|
{
|
|
@@ -150,5 +177,16 @@ var Collection = /*#__PURE__*/ function() {
|
|
|
150
177
|
]);
|
|
151
178
|
return Collection;
|
|
152
179
|
}();
|
|
180
|
+
function termTypeFromTerm(term, context) {
|
|
181
|
+
var termType;
|
|
182
|
+
var termNode = term.getNode(), variableNode = variableNodeQuery(termNode);
|
|
183
|
+
if (variableNode !== null) {
|
|
184
|
+
var variable = context.findVariableByVariableNode(variableNode), variableType = variable.getType();
|
|
185
|
+
termType = variableType; ///
|
|
186
|
+
} else {
|
|
187
|
+
termType = term.getType();
|
|
188
|
+
}
|
|
189
|
+
return termType;
|
|
190
|
+
}
|
|
153
191
|
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/collection.js"],"sourcesContent":["\"use strict\";\n\nimport { nodeQuery } from \"./utilities/query\";\n\nconst variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nexport default class Collection {\n  constructor(terms) {\n    this.terms = terms;\n  }\n\n  getTerms() {\n    return this.terms;\n  }\n\n  setTerms(terms) {\n    this.terms = terms;\n  }\n\n  addTerm(term) {\n    this.terms.push(term);\n  }\n\n  getType(context) {\n    const type = this.terms.reduce((type, term) => {\n      const termType = termTypeFromTerm(term, context);\n\n      if (type === null) {\n        type = termType;  ///\n      } else {\n        const termTypeSubTypeOfType = termType.isSubTypeOf(type);\n\n        if (termTypeSubTypeOfType) {\n          type = termType;  ///\n        }\n      }\n\n      return type;\n    }, null);\n\n    return type;\n  }\n\n  matchType(type, context) {\n    const typeA = type; ///\n\n    type = this.getType(context);\n\n    const typeB = type; ///\n\n    const typeAEqualToTypeB = typeA.isEqualTo(typeB),\n          typeMatches = typeAEqualToTypeB;  ///\n\n    return typeMatches;\n  }\n\n  matchTerm(term) {\n    const termA = term, ///\n          termMatches = this.terms.some((term) => {\n            const termB = term, ///\n                  termAMatchesTermB = termA.match(termB);\n\n            if (termAMatchesTermB) {\n              return true;\n            }\n          });\n\n    return termMatches;\n  }\n\n  matchTermNode(termNode) {\n    const termNodeA = termNode, ///\n          termNodeMatches = this.terms.some((term) => {\n            const termNode = term.getNode(),\n                  termNodeB = termNode, ///\n                  termNodeAMatchesTermB = termNodeA.match(termNodeB);\n\n            if (termNodeAMatchesTermB) {\n              return true;\n            }\n          });\n\n    return termNodeMatches;\n  }\n\n  matchTerms(terms) {\n    const termsMatch = terms.every((term) => {\n      const termMatches = this.matchTerm(term);\n\n      if (termMatches) {\n        return true;\n      }\n    })\n\n    return termsMatch;\n  }\n\n  matchTermNodes(termNodes) {\n    const termNodesMatch = termNodes.every((termNode) => {\n      const termNodeMatches = this.matchTermNode(termNode);\n\n      if (termNodeMatches) {\n        return true;\n      }\n    })\n\n    return termNodesMatch;\n  }\n\n  static fromEquality(equality) {\n    const leftTerm = equality.getLeftTerm(),\n          rightTerm = equality.getRightTerm(),\n          terms = [\n            leftTerm,\n            rightTerm\n          ],\n          collection = new Collection(terms);\n\n    return collection;\n  }\n\n  static fromCollections(collectionA, collectionB) {\n    const collectionATerms = collectionA.getTerms(),\n          collectionBTerms = collectionB.getTerms(),\n          terms = [\n            ...collectionATerms,\n            ...collectionBTerms\n          ],\n          collection = new Collection(terms);\n\n    return collection;\n  }\n}\n\nfunction termTypeFromTerm(term, context) {\n  let termType;\n\n  const termNode = term.getNode(),\n        variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const variable = context.findVariableByVariableNode(variableNode),\n          variableType = variable.getType();\n\n    termType = variableType;  ///\n  } else {\n    termType = term.getType();\n  }\n\n  return termType;\n}"],"names":["Collection","variableNodeQuery","nodeQuery","terms","getTerms","setTerms","addTerm","term","push","getType","context","type","reduce","termType","termTypeFromTerm","termTypeSubTypeOfType","isSubTypeOf","matchType","typeA","typeB","typeAEqualToTypeB","isEqualTo","typeMatches","matchTerm","termA","termMatches","some","termB","termAMatchesTermB","match","matchTermNode","termNode","termNodeA","termNodeMatches","getNode","termNodeB","termNodeAMatchesTermB","matchTerms","termsMatch","every","matchTermNodes","termNodes","termNodesMatch","fromEquality","equality","leftTerm","getLeftTerm","rightTerm","getRightTerm","collection","fromCollections","collectionA","collectionB","collectionATerms","collectionBTerms","variableNode","variable","findVariableByVariableNode","variableType"],"mappings":"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"}
|
package/lib/conclusion.js
CHANGED
|
@@ -8,8 +8,8 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Conclusion;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var
|
|
12
|
-
var
|
|
11
|
+
var _statementForMetavariable = /*#__PURE__*/ _interop_require_default(require("./verifier/nodes/statementForMetavariable"));
|
|
12
|
+
var _metastatementForMetavariable = /*#__PURE__*/ _interop_require_default(require("./verifier/nodes/metastatementForMetavariable"));
|
|
13
13
|
var _string = require("./utilities/string");
|
|
14
14
|
var _node = require("./utilities/node");
|
|
15
15
|
function _class_call_check(instance, Constructor) {
|
|
@@ -51,7 +51,7 @@ var Conclusion = /*#__PURE__*/ function() {
|
|
|
51
51
|
{
|
|
52
52
|
key: "matchStatementNode",
|
|
53
53
|
value: function matchStatementNode(statementNode, substitutions, fileContext, statementLocalContext) {
|
|
54
|
-
var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = statementNode, fileContextA = fileContext, localContextB = statementLocalContext, nonTerminalNodeVerified =
|
|
54
|
+
var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = statementNode, fileContextA = fileContext, localContextB = statementLocalContext, nonTerminalNodeVerified = _statementForMetavariable.default.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, localContextB, function() {
|
|
55
55
|
var verifyAhead = true;
|
|
56
56
|
return verifyAhead;
|
|
57
57
|
}), statementNodeMatches = nonTerminalNodeVerified; ///
|
|
@@ -60,8 +60,8 @@ var Conclusion = /*#__PURE__*/ function() {
|
|
|
60
60
|
},
|
|
61
61
|
{
|
|
62
62
|
key: "matchMetastatementNode",
|
|
63
|
-
value: function matchMetastatementNode(metastatementNode, substitutions, fileContext,
|
|
64
|
-
var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = metastatementNode, fileContextA = fileContext,
|
|
63
|
+
value: function matchMetastatementNode(metastatementNode, substitutions, fileContext, metastatementLocalMetaContext) {
|
|
64
|
+
var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = metastatementNode, fileContextA = fileContext, localMetaContextB = metastatementLocalMetaContext, nonTerminalNodeVerified = _metastatementForMetavariable.default.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, localMetaContextB, function() {
|
|
65
65
|
var verifiedAhead = true;
|
|
66
66
|
return verifiedAhead;
|
|
67
67
|
}), metastatementNodeMatches = nonTerminalNodeVerified; ///
|
|
@@ -96,4 +96,4 @@ var Conclusion = /*#__PURE__*/ function() {
|
|
|
96
96
|
return Conclusion;
|
|
97
97
|
}();
|
|
98
98
|
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25jbHVzaW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlTm9kZXNWZXJpZmllciBmcm9tIFwiLi92ZXJpZmllci9ub2Rlcy9zdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVcIjtcbmltcG9ydCBtZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlTm9kZXNWZXJpZmllciBmcm9tIFwiLi92ZXJpZmllci9ub2Rlcy9tZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlXCI7XG5cbmltcG9ydCB7IG5vZGVBc1N0cmluZyB9IGZyb20gXCIuL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IG1ldGFzdGF0ZW1lbnROb2RlRnJvbU1ldGFzdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25jbHVzaW9uIHtcbiAgY29uc3RydWN0b3IobWV0YXN0YXRlbWVudE5vZGUpIHtcbiAgICB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBnZXRNZXRhc3RhdGVtZW50Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5tZXRhc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIG1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBzdWJzdGl0dXRpb25zLCBmaWxlQ29udGV4dCwgc3RhdGVtZW50TG9jYWxDb250ZXh0KSB7XG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlQSA9IHRoaXMubWV0YXN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVCID0gc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIGZpbGVDb250ZXh0QSA9IGZpbGVDb250ZXh0LCAvLy9cbiAgICAgICAgICBsb2NhbENvbnRleHRCID0gc3RhdGVtZW50TG9jYWxDb250ZXh0LCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVmVyaWZpZWQgPSBzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVOb2Rlc1ZlcmlmaWVyLnZlcmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBzdWJzdGl0dXRpb25zLCBmaWxlQ29udGV4dEEsIGxvY2FsQ29udGV4dEIsICgpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHZlcmlmeUFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgICAgcmV0dXJuIHZlcmlmeUFoZWFkO1xuICAgICAgICAgIH0pLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9uVGVybWluYWxOb2RlVmVyaWZpZWQ7IC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgbWF0Y2hNZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSwgc3Vic3RpdHV0aW9ucywgZmlsZUNvbnRleHQsIG1ldGFzdGF0ZW1lbnRMb2NhbE1ldGFDb250ZXh0KSB7XG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlQSA9IHRoaXMubWV0YXN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVCID0gbWV0YXN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBmaWxlQ29udGV4dEEgPSBmaWxlQ29udGV4dCwgLy8vXG4gICAgICAgICAgbG9jYWxNZXRhQ29udGV4dEIgPSBtZXRhc3RhdGVtZW50TG9jYWxNZXRhQ29udGV4dCwgIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gbWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZU5vZGVzVmVyaWZpZXIudmVyaWZ5Tm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZUEsIG5vblRlcm1pbmFsTm9kZUIsIHN1YnN0aXR1dGlvbnMsIGZpbGVDb250ZXh0QSwgbG9jYWxNZXRhQ29udGV4dEIsICgpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgICB9KSxcbiAgICAgICAgICBtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXMgPSBub25UZXJtaW5hbE5vZGVWZXJpZmllZDsgLy8vXG5cbiAgICByZXR1cm4gbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgdG9KU09OKHRva2Vucykge1xuICAgIGNvbnN0IG1ldGFzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBtZXRhc3RhdGVtZW50ID0gbWV0YXN0YXRlbWVudFN0cmluZywgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBtZXRhc3RhdGVtZW50XG4gICAgICAgICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIGZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIGNvbnN0IGNvbmNsdXNpb24gPSBuZXcgQ29uY2x1c2lvbihtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uY2x1c2lvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTkFuZEZpbGVDb250ZXh0KGpzb24sIGZpbGVDb250ZXh0KSB7XG4gICAgY29uc3QgeyBtZXRhc3RhdGVtZW50IH0gPSBqc29uLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnRTdHJpbmcgPSBtZXRhc3RhdGVtZW50LCAgLy8vXG4gICAgICAgICAgbGV4ZXIgPSBmaWxlQ29udGV4dC5nZXRMZXhlcigpLFxuICAgICAgICAgIHBhcnNlciA9IGZpbGVDb250ZXh0LmdldFBhcnNlcigpLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudFN0cmluZyhtZXRhc3RhdGVtZW50U3RyaW5nLCBsZXhlciwgcGFyc2VyKSxcbiAgICAgICAgICBjb25jbHVzaW9uID0gbmV3IENvbmNsdXNpb24obWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbmNsdXNpb247XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJDb25jbHVzaW9uIiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsIm1hdGNoU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwiZmlsZUNvbnRleHQiLCJzdGF0ZW1lbnRMb2NhbENvbnRleHQiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsImZpbGVDb250ZXh0QSIsImxvY2FsQ29udGV4dEIiLCJub25UZXJtaW5hbE5vZGVWZXJpZmllZCIsInN0YXRlbWVudEZvck1ldGF2YXJpYWJsZU5vZGVzVmVyaWZpZXIiLCJ2ZXJpZnlOb25UZXJtaW5hbE5vZGUiLCJ2ZXJpZnlBaGVhZCIsInN0YXRlbWVudE5vZGVNYXRjaGVzIiwibWF0Y2hNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFzdGF0ZW1lbnRMb2NhbE1ldGFDb250ZXh0IiwibG9jYWxNZXRhQ29udGV4dEIiLCJtZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlTm9kZXNWZXJpZmllciIsInZlcmlmaWVkQWhlYWQiLCJtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJ0b0pTT04iLCJ0b2tlbnMiLCJtZXRhc3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibWV0YXN0YXRlbWVudCIsImpzb24iLCJmcm9tTWV0YXN0YXRlbWVudE5vZGUiLCJjb25jbHVzaW9uIiwiZnJvbUpTT05BbmRGaWxlQ29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJtZXRhc3RhdGVtZW50Tm9kZUZyb21NZXRhc3RhdGVtZW50U3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVFxQkE7OzsrRUFONkI7bUZBQ0k7c0JBRXpCO29CQUM0Qjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQyxJQUFBLEFBQU1BLDJCQUFELEFBQUw7YUFBTUEsV0FDUEMsaUJBQWlCO2dDQURWRDtRQUVqQixJQUFJLENBQUNDLGlCQUFpQixHQUFHQTs7a0JBRlJEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxpQkFBaUI7WUFDL0I7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CQyxhQUFhLEVBQUVDLGFBQWEsRUFBRUMsV0FBVyxFQUFFQyxxQkFBcUI7Z0JBQ2pGLElBQU1DLG1CQUFtQixJQUFJLENBQUNQLGlCQUFpQixFQUN6Q1EsbUJBQW1CTCxlQUNuQk0sZUFBZUosYUFDZkssZ0JBQWdCSix1QkFDaEJLLDBCQUEwQkMsaUNBQXFDLENBQUNDLHFCQUFxQixDQUFDTixrQkFBa0JDLGtCQUFrQkosZUFBZUssY0FBY0MsZUFBZTtvQkFDcEssSUFBTUksY0FBYztvQkFFcEIsT0FBT0E7Z0JBQ1QsSUFDQUMsdUJBQXVCSix5QkFBeUIsR0FBRztnQkFFekQsT0FBT0k7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSx1QkFBdUJoQixpQkFBaUIsRUFBRUksYUFBYSxFQUFFQyxXQUFXLEVBQUVZLDZCQUE2QjtnQkFDakcsSUFBTVYsbUJBQW1CLElBQUksQ0FBQ1AsaUJBQWlCLEVBQ3pDUSxtQkFBbUJSLG1CQUNuQlMsZUFBZUosYUFDZmEsb0JBQW9CRCwrQkFDcEJOLDBCQUEwQlEscUNBQXlDLENBQUNOLHFCQUFxQixDQUFDTixrQkFBa0JDLGtCQUFrQkosZUFBZUssY0FBY1MsbUJBQW1CO29CQUM1SyxJQUFNRSxnQkFBZ0I7b0JBRXRCLE9BQU9BO2dCQUNULElBQ0FDLDJCQUEyQlYseUJBQXlCLEdBQUc7Z0JBRTdELE9BQU9VO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTTtnQkFDWCxJQUFNQyxzQkFBc0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDekIsaUJBQWlCLEVBQUV1QixTQUMzREcsZ0JBQWdCRixxQkFDaEJHLE9BQU87b0JBQ0xELGVBQUFBO2dCQUNGO2dCQUVOLE9BQU9DO1lBQ1Q7Ozs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0Esc0JBQXNCNUIsaUJBQWlCO2dCQUM1QyxJQUFNNkIsYUFBYSxJQWxERjlCLFdBa0RpQkM7Z0JBRWxDLE9BQU82QjtZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0EsdUJBQXVCSCxJQUFJLEVBQUV0QixXQUFXO2dCQUM3QyxJQUFNLEFBQUVxQixnQkFBa0JDLEtBQWxCRCxlQUNGRixzQkFBc0JFLGVBQ3RCSyxRQUFRMUIsWUFBWTJCLFFBQVEsSUFDNUJDLFNBQVM1QixZQUFZNkIsU0FBUyxJQUM5QmxDLG9CQUFvQm1DLElBQUFBLDhDQUF3QyxFQUFDWCxxQkFBcUJPLE9BQU9FLFNBQ3pGSixhQUFhLElBN0RGOUIsV0E2RGlCQztnQkFFbEMsT0FBTzZCO1lBQ1Q7OztXQWhFbUI5QiJ9
|
package/lib/consequent.js
CHANGED
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Consequent;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var
|
|
11
|
+
var _termForVariable = /*#__PURE__*/ _interop_require_default(require("./verifier/nodes/termForVariable"));
|
|
12
12
|
var _string = require("./utilities/string");
|
|
13
13
|
var _node = require("./utilities/node");
|
|
14
14
|
function _class_call_check(instance, Constructor) {
|
|
@@ -49,8 +49,8 @@ var Consequent = /*#__PURE__*/ function() {
|
|
|
49
49
|
},
|
|
50
50
|
{
|
|
51
51
|
key: "matchStatementNode",
|
|
52
|
-
value: function matchStatementNode(statementNode, substitutions, localContext) {
|
|
53
|
-
var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, localContextA = localContext, localContextB =
|
|
52
|
+
value: function matchStatementNode(statementNode, substitutions, localContext, statementLocalContext) {
|
|
53
|
+
var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, localContextA = localContext, localContextB = statementLocalContext, nonTerminalNodeVerified = _termForVariable.default.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, function() {
|
|
54
54
|
var verifiedAhead = true;
|
|
55
55
|
return verifiedAhead;
|
|
56
56
|
}), statementNodeMatches = nonTerminalNodeVerified; ///
|
|
@@ -85,4 +85,4 @@ var Consequent = /*#__PURE__*/ function() {
|
|
|
85
85
|
return Consequent;
|
|
86
86
|
}();
|
|
87
87
|
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zZXF1ZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdGVybUZvclZhcmlhYmxlTm9kZXNWZXJpZmllciBmcm9tIFwiLi92ZXJpZmllci9ub2Rlcy90ZXJtRm9yVmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25zZXF1ZW50IHtcbiAgY29uc3RydWN0b3Ioc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMuc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBtYXRjaFN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0LCBzdGF0ZW1lbnRMb2NhbENvbnRleHQpIHtcbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5zdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IHN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBsb2NhbENvbnRleHRBID0gbG9jYWxDb250ZXh0LCAvLy9cbiAgICAgICAgICBsb2NhbENvbnRleHRCID0gc3RhdGVtZW50TG9jYWxDb250ZXh0LCAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVWZXJpZmllZCA9IHRlcm1Gb3JWYXJpYWJsZU5vZGVzVmVyaWZpZXIudmVyaWZ5Tm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZUEsIG5vblRlcm1pbmFsTm9kZUIsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIsICgpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgICB9KSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAvLy9cblxuICAgIHJldHVybiBzdGF0ZW1lbnROb2RlTWF0Y2hlcztcbiAgfVxuXG4gIHRvSlNPTih0b2tlbnMpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5zdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIHN0YXRlbWVudCA9IHN0YXRlbWVudFN0cmluZywgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSkge1xuICAgIGNvbnN0IGNvbnNlcXVlbnQgPSBuZXcgQ29uc2VxdWVudChzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25zZXF1ZW50O1xuICB9XG5cbiAgc3RhdGljIGZyb21KU09OQW5kRmlsZUNvbnRleHQoanNvbiwgZmlsZUNvbnRleHQpIHtcbiAgICBjb25zdCB7IHN0YXRlbWVudCB9ID0ganNvbixcbiAgICAgICAgICBzdGF0ZW1lbnRTdHJpbmcgPSBzdGF0ZW1lbnQsICAvLy9cbiAgICAgICAgICBsZXhlciA9IGZpbGVDb250ZXh0LmdldExleGVyKCksXG4gICAgICAgICAgcGFyc2VyID0gZmlsZUNvbnRleHQuZ2V0UGFyc2VyKCksXG4gICAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nKHN0YXRlbWVudFN0cmluZywgbGV4ZXIsIHBhcnNlciksXG4gICAgICAgICAgY29uc2VxdWVudCA9IG5ldyBDb25zZXF1ZW50KHN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbnNlcXVlbnQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJDb25zZXF1ZW50Iiwic3RhdGVtZW50Tm9kZSIsImdldFN0YXRlbWVudE5vZGUiLCJtYXRjaFN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0Iiwic3RhdGVtZW50TG9jYWxDb250ZXh0Iiwibm9uVGVybWluYWxOb2RlQSIsIm5vblRlcm1pbmFsTm9kZUIiLCJsb2NhbENvbnRleHRBIiwibG9jYWxDb250ZXh0QiIsIm5vblRlcm1pbmFsTm9kZVZlcmlmaWVkIiwidGVybUZvclZhcmlhYmxlTm9kZXNWZXJpZmllciIsInZlcmlmeU5vblRlcm1pbmFsTm9kZSIsInZlcmlmaWVkQWhlYWQiLCJzdGF0ZW1lbnROb2RlTWF0Y2hlcyIsInRvSlNPTiIsInRva2VucyIsInN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsInN0YXRlbWVudCIsImpzb24iLCJmcm9tU3RhdGVtZW50Tm9kZSIsImNvbnNlcXVlbnQiLCJmcm9tSlNPTkFuZEZpbGVDb250ZXh0IiwiZmlsZUNvbnRleHQiLCJsZXhlciIsImdldExleGVyIiwicGFyc2VyIiwiZ2V0UGFyc2VyIiwic3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBT3FCQTs7O3NFQUxvQjtzQkFFWjtvQkFDb0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFbEMsSUFBQSxBQUFNQSwyQkFBRCxBQUFMO2FBQU1BLFdBQ1BDLGFBQWE7Z0NBRE5EO1FBRWpCLElBQUksQ0FBQ0MsYUFBYSxHQUFHQTs7a0JBRkpEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxhQUFhO1lBQzNCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQkYsYUFBYSxFQUFFRyxhQUFhLEVBQUVDLFlBQVksRUFBRUMscUJBQXFCO2dCQUNsRixJQUFNQyxtQkFBbUIsSUFBSSxDQUFDTixhQUFhLEVBQ3JDTyxtQkFBbUJQLGVBQ25CUSxnQkFBZ0JKLGNBQ2hCSyxnQkFBZ0JKLHVCQUNoQkssMEJBQTBCQyx3QkFBNEIsQ0FBQ0MscUJBQXFCLENBQUNOLGtCQUFrQkMsa0JBQWtCSixlQUFlSyxlQUFlQyxlQUFlO29CQUM1SixJQUFNSSxnQkFBZ0I7b0JBRXRCLE9BQU9BO2dCQUNULElBQ0FDLHVCQUF1QkoseUJBQXlCLEdBQUc7Z0JBRXpELE9BQU9JO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTTtnQkFDWCxJQUFNQyxrQkFBa0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDbEIsYUFBYSxFQUFFZ0IsU0FDbkRHLFlBQVlGLGlCQUNaRyxPQUFPO29CQUNMRCxXQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQnJCLGFBQWE7Z0JBQ3BDLElBQU1zQixhQUFhLElBbkNGdkIsV0FtQ2lCQztnQkFFbEMsT0FBT3NCO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSx1QkFBdUJILElBQUksRUFBRUksV0FBVztnQkFDN0MsSUFBTSxBQUFFTCxZQUFjQyxLQUFkRCxXQUNGRixrQkFBa0JFLFdBQ2xCTSxRQUFRRCxZQUFZRSxRQUFRLElBQzVCQyxTQUFTSCxZQUFZSSxTQUFTLElBQzlCNUIsZ0JBQWdCNkIsSUFBQUEsc0NBQWdDLEVBQUNaLGlCQUFpQlEsT0FBT0UsU0FDekVMLGFBQWEsSUE5Q0Z2QixXQThDaUJDO2dCQUVsQyxPQUFPc0I7WUFDVDs7O1dBakRtQnZCIn0=
|
package/lib/constructor.js
CHANGED
|
@@ -8,8 +8,8 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Constructor;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var _type = /*#__PURE__*/ _interop_require_default(require("./type"));
|
|
12
11
|
var _string = require("./utilities/string");
|
|
12
|
+
var _type = require("./type");
|
|
13
13
|
var _node = require("./utilities/node");
|
|
14
14
|
var _tokens = require("./utilities/tokens");
|
|
15
15
|
function _class_call_check(instance, Constructor) {
|
|
@@ -31,11 +31,6 @@ function _create_class(Constructor, protoProps, staticProps) {
|
|
|
31
31
|
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
32
32
|
return Constructor;
|
|
33
33
|
}
|
|
34
|
-
function _interop_require_default(obj) {
|
|
35
|
-
return obj && obj.__esModule ? obj : {
|
|
36
|
-
default: obj
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
34
|
var Constructor = /*#__PURE__*/ function() {
|
|
40
35
|
function Constructor(termNode, string, type) {
|
|
41
36
|
_class_call_check(this, Constructor);
|
|
@@ -88,9 +83,7 @@ var Constructor = /*#__PURE__*/ function() {
|
|
|
88
83
|
if (type !== null) {
|
|
89
84
|
var typeJSON = type; ///
|
|
90
85
|
json = typeJSON; ///
|
|
91
|
-
type = _type.
|
|
92
|
-
var typeName = type.getName();
|
|
93
|
-
type = fileContext.findTypeByTypeName(typeName); ///
|
|
86
|
+
type = (0, _type.typeFromJSONAndFileContext)(json, fileContext);
|
|
94
87
|
}
|
|
95
88
|
var tokens = constructorDeclarationTokens, string = stringFromTermNodeTypeAndTokens(termNode, type, tokens), constructor = new Constructor(termNode, string, type);
|
|
96
89
|
return constructor;
|
|
@@ -111,4 +104,4 @@ function stringFromTermNodeTypeAndTokens(termNode, type, tokens) {
|
|
|
111
104
|
return string;
|
|
112
105
|
}
|
|
113
106
|
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdHJ1Y3Rvci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgdHlwZUZyb21KU09OQW5kRmlsZUNvbnRleHQgfSBmcm9tIFwiLi90eXBlXCI7XG5pbXBvcnQgeyB0ZXJtTm9kZUZyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zIH0gZnJvbSBcIi4vdXRpbGl0aWVzL25vZGVcIjtcbmltcG9ydCB7IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tVGVybVN0cmluZyB9IGZyb20gXCIuL3V0aWxpdGllcy90b2tlbnNcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQ29uc3RydWN0b3Ige1xuICBjb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgc3RyaW5nLCB0eXBlKSB7XG4gICAgdGhpcy50ZXJtTm9kZSA9IHRlcm1Ob2RlO1xuICAgIHRoaXMuc3RyaW5nID0gc3RyaW5nO1xuICAgIHRoaXMudHlwZSA9IHR5cGU7XG4gIH1cblxuICBnZXRUZXJtTm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy50ZXJtTm9kZTtcbiAgfVxuXG4gIGdldFN0cmluZygpIHtcbiAgICByZXR1cm4gdGhpcy5zdHJpbmc7XG4gIH1cblxuICBnZXRUeXBlKCkge1xuICAgIHJldHVybiB0aGlzLnR5cGU7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3QgdGVybVN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLnRlcm1Ob2RlLCB0b2tlbnMpLFxuICAgICAgICAgIHR5cGVKU09OID0gKHRoaXMudHlwZSA9PT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgICAgICAgbnVsbCA6XG4gICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMudHlwZS50b0pTT04odG9rZW5zKSxcbiAgICAgICAgICB0ZXJtID0gdGVybVN0cmluZywgIC8vL1xuICAgICAgICAgIHR5cGUgPSB0eXBlSlNPTiwgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICB0ZXJtLFxuICAgICAgICAgICAgdHlwZVxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpIHtcbiAgICBjb25zdCBzdHJpbmcgPSBzdHJpbmdGcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpLFxuICAgICAgICAgIGNvbnN0cnVjdG9yID0gbmV3IENvbnN0cnVjdG9yKHRlcm1Ob2RlLCBzdHJpbmcsIHR5cGUpO1xuXG4gICAgcmV0dXJuIGNvbnN0cnVjdG9yO1xuICB9XG5cbiAgc3RhdGljIGZyb21KU09OQW5kRmlsZUNvbnRleHQoanNvbiwgZmlsZUNvbnRleHQpIHtcbiAgICBjb25zdCB7IHRlcm0gfSA9IGpzb24sXG4gICAgICAgICAgdGVybVN0cmluZyA9IHRlcm0sICAvLy9cbiAgICAgICAgICBsZXhlciA9IGZpbGVDb250ZXh0LmdldExleGVyKCksXG4gICAgICAgICAgcGFyc2VyID0gZmlsZUNvbnRleHQuZ2V0UGFyc2VyKCksXG4gICAgICAgICAgY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyA9IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tVGVybVN0cmluZyh0ZXJtU3RyaW5nLCBsZXhlciksXG4gICAgICAgICAgdGVybU5vZGUgPSB0ZXJtTm9kZUZyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zKGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMsIHBhcnNlcik7XG5cbiAgICBsZXQgeyB0eXBlIH0gPSBqc29uO1xuXG4gICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHR5cGVKU09OID0gdHlwZTsgIC8vL1xuXG4gICAgICBqc29uID0gdHlwZUpTT047ICAvLy9cblxuICAgICAgdHlwZSA9IHR5cGVGcm9tSlNPTkFuZEZpbGVDb250ZXh0KGpzb24sIGZpbGVDb250ZXh0KTtcbiAgICB9XG5cbiAgICBjb25zdCB0b2tlbnMgPSBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zLCAgLy8vXG4gICAgICAgICAgc3RyaW5nID0gc3RyaW5nRnJvbVRlcm1Ob2RlVHlwZUFuZFRva2Vucyh0ZXJtTm9kZSwgdHlwZSwgdG9rZW5zKSxcbiAgICAgICAgICBjb25zdHJ1Y3RvciA9IG5ldyBDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgc3RyaW5nLCB0eXBlKTtcblxuICAgIHJldHVybiBjb25zdHJ1Y3RvcjtcbiAgfVxufVxuXG5mdW5jdGlvbiBzdHJpbmdGcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpIHtcbiAgbGV0IHN0cmluZztcblxuICBjb25zdCB0ZXJtU3RyaW5nID0gbm9kZUFzU3RyaW5nKHRlcm1Ob2RlLCB0b2tlbnMpO1xuXG4gIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgc3RyaW5nID0gYCR7dGVybVN0cmluZ31gO1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IG5vU3VwZXJUeXBlID0gdHJ1ZSxcbiAgICAgICAgICB0eXBlU3RyaW5nID0gdHlwZS5hc1N0cmluZyh0b2tlbnMsIG5vU3VwZXJUeXBlKTtcblxuICAgIHN0cmluZyA9IGAke3Rlcm1TdHJpbmd9OiR7dHlwZVN0cmluZ31gO1xuICB9XG5cbiAgcmV0dXJuIHN0cmluZztcbn1cbiJdLCJuYW1lcyI6WyJDb25zdHJ1Y3RvciIsInRlcm1Ob2RlIiwic3RyaW5nIiwidHlwZSIsImdldFRlcm1Ob2RlIiwiZ2V0U3RyaW5nIiwiZ2V0VHlwZSIsInRvSlNPTiIsInRva2VucyIsInRlcm1TdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0eXBlSlNPTiIsInRlcm0iLCJqc29uIiwiZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2VucyIsInN0cmluZ0Zyb21UZXJtTm9kZVR5cGVBbmRUb2tlbnMiLCJjb25zdHJ1Y3RvciIsImZyb21KU09OQW5kRmlsZUNvbnRleHQiLCJmaWxlQ29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2Vuc0Zyb21UZXJtU3RyaW5nIiwidGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyIsInR5cGVGcm9tSlNPTkFuZEZpbGVDb250ZXh0Iiwibm9TdXBlclR5cGUiLCJ0eXBlU3RyaW5nIiwiYXNTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBT3FCQTs7O3NCQUxRO29CQUNjO29CQUNjO3NCQUNFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUU1QyxJQUFBLEFBQU1BLDRCQUFELEFBQUw7YUFBTUEsWUFDUEMsUUFBUSxFQUFFQyxNQUFNLEVBQUVDLElBQUk7Z0NBRGZIO1FBRWpCLElBQUksQ0FBQ0MsUUFBUSxHQUFHQTtRQUNoQixJQUFJLENBQUNDLE1BQU0sR0FBR0E7UUFDZCxJQUFJLENBQUNDLElBQUksR0FBR0E7O2tCQUpLSDs7WUFPbkJJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsUUFBUTtZQUN0Qjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsTUFBTTtZQUNwQjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsSUFBSTtZQUNsQjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxNQUFNO2dCQUNYLElBQU1DLGFBQWFDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDVCxRQUFRLEVBQUVPLFNBQ3pDRyxXQUFXLEFBQUMsSUFBSSxDQUFDUixJQUFJLEtBQUssT0FDWixPQUNFLElBQUksQ0FBQ0EsSUFBSSxDQUFDSSxNQUFNLENBQUNDLFNBQ2pDSSxPQUFPSCxZQUNQTixPQUFPUSxVQUNQRSxPQUFPO29CQUNMRCxNQUFBQTtvQkFDQVQsTUFBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT1U7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSwwQkFBMEJiLFFBQVEsRUFBRUUsSUFBSSxFQUFFSyxNQUFNO2dCQUNyRCxJQUFNTixTQUFTYSxnQ0FBZ0NkLFVBQVVFLE1BQU1LLFNBQ3pEUSxjQUFjLElBcENIaEIsWUFvQ21CQyxVQUFVQyxRQUFRQztnQkFFdEQsT0FBT2E7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLHVCQUF1QkosSUFBSSxFQUFFSyxXQUFXO2dCQUM3QyxJQUFNLEFBQUVOLE9BQVNDLEtBQVRELE1BQ0ZILGFBQWFHLE1BQ2JPLFFBQVFELFlBQVlFLFFBQVEsSUFDNUJDLFNBQVNILFlBQVlJLFNBQVMsSUFDOUJDLCtCQUErQkMsSUFBQUEsa0RBQTBDLEVBQUNmLFlBQVlVLFFBQ3RGbEIsV0FBV3dCLElBQUFBLDhDQUF3QyxFQUFDRiw4QkFBOEJGO2dCQUV4RixJQUFJLEFBQUVsQixPQUFTVSxLQUFUVjtnQkFFTixJQUFJQSxTQUFTLE1BQU07b0JBQ2pCLElBQU1RLFdBQVdSLE1BQU8sR0FBRztvQkFFM0JVLE9BQU9GLFVBQVcsR0FBRztvQkFFckJSLE9BQU91QixJQUFBQSxnQ0FBMEIsRUFBQ2IsTUFBTUs7Z0JBQzFDO2dCQUVBLElBQU1WLFNBQVNlLDhCQUNUckIsU0FBU2EsZ0NBQWdDZCxVQUFVRSxNQUFNSyxTQUN6RFEsY0FBYyxJQTdESGhCLFlBNkRtQkMsVUFBVUMsUUFBUUM7Z0JBRXRELE9BQU9hO1lBQ1Q7OztXQWhFbUJoQjs7QUFtRXJCLFNBQVNlLGdDQUFnQ2QsUUFBUSxFQUFFRSxJQUFJLEVBQUVLLE1BQU07SUFDN0QsSUFBSU47SUFFSixJQUFNTyxhQUFhQyxJQUFBQSxvQkFBWSxFQUFDVCxVQUFVTztJQUUxQyxJQUFJTCxTQUFTLE1BQU07UUFDakJELFNBQVMsQUFBQyxHQUFhLE9BQVhPO0lBQ2QsT0FBTztRQUNMLElBQU1rQixjQUFjLE1BQ2RDLGFBQWF6QixLQUFLMEIsUUFBUSxDQUFDckIsUUFBUW1CO1FBRXpDekIsU0FBUyxBQUFDLEdBQWdCMEIsT0FBZG5CLFlBQVcsS0FBYyxPQUFYbUI7SUFDNUI7SUFFQSxPQUFPMUI7QUFDVCJ9
|