occam-verify-cli 0.0.490 → 0.0.491

package/lib/verify/statement/unqualified.js

@@ -18,16 +18,11 @@ function verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext) {
     if (statementNode !== null) {
         var statementString = (0, _string.nodeAsString)(statementNode);
         proofContext.debug("Verifying the ".concat(statementString, " unqualified statement..."));
-        var derived = proofContext.isDerived();
-        if (derived) {
-            var assertionMatches = proofContext.matchStatement(statementNode);
-            unqualifiedStatementVerified = assertionMatches; ///
-        } else {
-            unqualifiedStatementVerified = true;
-        }
+        var assertionMatches = proofContext.matchStatement(statementNode);
+        unqualifiedStatementVerified = assertionMatches; ///
     }
     unqualifiedStatementVerified ? proofContext.complete(unqualifiedStatementNode) : proofContext.halt(unqualifiedStatementNode);
     return unqualifiedStatementVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlLCBwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSBmYWxzZTtcblxuICBwcm9vZkNvbnRleHQuYmVnaW4odW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKTtcblxuICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZVF1ZXJ5KHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgaWYgKHN0YXRlbWVudE5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICBwcm9vZkNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJHtzdGF0ZW1lbnRTdHJpbmd9IHVucXVhbGlmaWVkIHN0YXRlbWVudC4uLmApO1xuXG4gICAgY29uc3QgZGVyaXZlZCA9IHByb29mQ29udGV4dC5pc0Rlcml2ZWQoKTtcblxuICAgIGlmIChkZXJpdmVkKSB7XG4gICAgICBjb25zdCBhc3NlcnRpb25NYXRjaGVzID0gcHJvb2ZDb250ZXh0Lm1hdGNoU3RhdGVtZW50KHN0YXRlbWVudE5vZGUpO1xuXG4gICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gYXNzZXJ0aW9uTWF0Y2hlczsgIC8vL1xuICAgIH0gZWxzZSB7XG4gICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9XG4gIH1cblxuICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKSA6XG4gICAgICBwcm9vZkNvbnRleHQuaGFsdCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlIiwicHJvb2ZDb250ZXh0IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCIsImJlZ2luIiwic3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwiZGVyaXZlZCIsImlzRGVyaXZlZCIsImFzc2VydGlvbk1hdGNoZXMiLCJtYXRjaFN0YXRlbWVudCIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBT0E7OztlQUF3QkE7OztxQkFMRTtzQkFDRztBQUU3QixJQUFNQyxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFdEIsU0FBU0YsMkJBQTJCRyx3QkFBd0IsRUFBRUMsWUFBWSxFQUFFO0lBQ3pGLElBQUlDLCtCQUErQixLQUFLO0lBRXhDRCxhQUFhRSxLQUFLLENBQUNIO0lBRW5CLElBQU1JLGdCQUFnQk4sbUJBQW1CRTtJQUV6QyxJQUFJSSxrQkFBa0IsSUFBSSxFQUFFO1FBQzFCLElBQU1DLGtCQUFrQkMsSUFBQUEsb0JBQVksRUFBQ0Y7UUFFckNILGFBQWFNLEtBQUssQ0FBQyxBQUFDLGlCQUFnQyxPQUFoQkYsaUJBQWdCO1FBRXBELElBQU1HLFVBQVVQLGFBQWFRLFNBQVM7UUFFdEMsSUFBSUQsU0FBUztZQUNYLElBQU1FLG1CQUFtQlQsYUFBYVUsY0FBYyxDQUFDUDtZQUVyREYsK0JBQStCUSxrQkFBbUIsR0FBRztRQUN2RCxPQUFPO1lBQ0xSLCtCQUErQixJQUFJO1FBQ3JDLENBQUM7SUFDSCxDQUFDO0lBRURBLCtCQUNFRCxhQUFhVyxRQUFRLENBQUNaLDRCQUNwQkMsYUFBYVksSUFBSSxDQUFDYix5QkFBeUI7SUFFL0MsT0FBT0U7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlLCBwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSBmYWxzZTtcblxuICBwcm9vZkNvbnRleHQuYmVnaW4odW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKTtcblxuICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZVF1ZXJ5KHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgaWYgKHN0YXRlbWVudE5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICBwcm9vZkNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJHtzdGF0ZW1lbnRTdHJpbmd9IHVucXVhbGlmaWVkIHN0YXRlbWVudC4uLmApO1xuXG4gICAgY29uc3QgYXNzZXJ0aW9uTWF0Y2hlcyA9IHByb29mQ29udGV4dC5tYXRjaFN0YXRlbWVudChzdGF0ZW1lbnROb2RlKTtcblxuICAgIHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSBhc3NlcnRpb25NYXRjaGVzOyAgLy8vXG4gIH1cblxuICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKSA6XG4gICAgICBwcm9vZkNvbnRleHQuaGFsdCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlIiwicHJvb2ZDb250ZXh0IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCIsImJlZ2luIiwic3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwiYXNzZXJ0aW9uTWF0Y2hlcyIsIm1hdGNoU3RhdGVtZW50IiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7O3FCQUxFO3NCQUNHO0FBRTdCLElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUV0QixTQUFTRiwyQkFBMkJHLHdCQUF3QixFQUFFQyxZQUFZLEVBQUU7SUFDekYsSUFBSUMsK0JBQStCLEtBQUs7SUFFeENELGFBQWFFLEtBQUssQ0FBQ0g7SUFFbkIsSUFBTUksZ0JBQWdCTixtQkFBbUJFO0lBRXpDLElBQUlJLGtCQUFrQixJQUFJLEVBQUU7UUFDMUIsSUFBTUMsa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDRjtRQUVyQ0gsYUFBYU0sS0FBSyxDQUFDLEFBQUMsaUJBQWdDLE9BQWhCRixpQkFBZ0I7UUFFcEQsSUFBTUcsbUJBQW1CUCxhQUFhUSxjQUFjLENBQUNMO1FBRXJERiwrQkFBK0JNLGtCQUFtQixHQUFHO0lBQ3ZELENBQUM7SUFFRE4sK0JBQ0VELGFBQWFTLFFBQVEsQ0FBQ1YsNEJBQ3BCQyxhQUFhVSxJQUFJLENBQUNYLHlCQUF5QjtJQUUvQyxPQUFPRTtBQUNUIn0=

package/lib/verify/statement.js

@@ -15,19 +15,19 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
-function verifyStatement(statementNode, proofContext) {
+function verifyStatement(statementNode, qualified, proofContext) {
     var statementVerified = false;
     proofContext.begin(statementNode);
     if (!statementVerified) {
-        var equalityVerifiedAsEquality = (0, _statementAsEquality.default)(statementNode, proofContext);
+        var equalityVerifiedAsEquality = (0, _statementAsEquality.default)(statementNode, qualified, proofContext);
         statementVerified = equalityVerifiedAsEquality; ///
     }
     if (!statementVerified) {
-        var statementTypeAssertionVerified = (0, _statementTypeAssertion.default)(statementNode, proofContext);
+        var statementTypeAssertionVerified = (0, _statementTypeAssertion.default)(statementNode, qualified, proofContext);
         statementVerified = statementTypeAssertionVerified; ///
     }
     statementVerified ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
     return statementVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50QXNFcXVhbGl0eSBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudEFzRXF1YWxpdHlcIjtcbmltcG9ydCB2ZXJpZnlTdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uIGZyb20gXCIuLi92ZXJpZnkvc3RhdGVtZW50VHlwZUFzc2VydGlvblwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KSB7XG4gIGxldCBzdGF0ZW1lbnRWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHByb29mQ29udGV4dC5iZWdpbihzdGF0ZW1lbnROb2RlKTtcblxuICBpZiAoIXN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgY29uc3QgZXF1YWxpdHlWZXJpZmllZEFzRXF1YWxpdHkgPSB2ZXJpZnlTdGF0ZW1lbnRBc0VxdWFsaXR5KHN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IGVxdWFsaXR5VmVyaWZpZWRBc0VxdWFsaXR5OyAvLy9cbiAgfVxuXG4gIGlmICghc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uVmVyaWZpZWQgPSB2ZXJpZnlTdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uKHN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IHN0YXRlbWVudFR5cGVBc3NlcnRpb25WZXJpZmllZDsgLy8vXG4gIH1cblxuICBzdGF0ZW1lbnRWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKHN0YXRlbWVudE5vZGUpIDpcbiAgICAgIHByb29mQ29udGV4dC5oYWx0KHN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwicHJvb2ZDb250ZXh0Iiwic3RhdGVtZW50VmVyaWZpZWQiLCJiZWdpbiIsImVxdWFsaXR5VmVyaWZpZWRBc0VxdWFsaXR5IiwidmVyaWZ5U3RhdGVtZW50QXNFcXVhbGl0eSIsInN0YXRlbWVudFR5cGVBc3NlcnRpb25WZXJpZmllZCIsInZlcmlmeVN0YXRlbWVudFR5cGVBc3NlcnRpb24iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUtBOzs7ZUFBd0JBOzs7d0VBSGM7MkVBQ0c7Ozs7OztBQUUxQixTQUFTQSxnQkFBZ0JDLGFBQWEsRUFBRUMsWUFBWSxFQUFFO0lBQ25FLElBQUlDLG9CQUFvQixLQUFLO0lBRTdCRCxhQUFhRSxLQUFLLENBQUNIO0lBRW5CLElBQUksQ0FBQ0UsbUJBQW1CO1FBQ3RCLElBQU1FLDZCQUE2QkMsSUFBQUEsNEJBQXlCLEVBQUNMLGVBQWVDO1FBRTVFQyxvQkFBb0JFLDRCQUE0QixHQUFHO0lBQ3JELENBQUM7SUFFRCxJQUFJLENBQUNGLG1CQUFtQjtRQUN0QixJQUFNSSxpQ0FBaUNDLElBQUFBLCtCQUE0QixFQUFDUCxlQUFlQztRQUVuRkMsb0JBQW9CSSxnQ0FBZ0MsR0FBRztJQUN6RCxDQUFDO0lBRURKLG9CQUNFRCxhQUFhTyxRQUFRLENBQUNSLGlCQUNwQkMsYUFBYVEsSUFBSSxDQUFDVCxjQUFjO0lBRXBDLE9BQU9FO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50QXNFcXVhbGl0eSBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudEFzRXF1YWxpdHlcIjtcbmltcG9ydCB2ZXJpZnlTdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uIGZyb20gXCIuLi92ZXJpZnkvc3RhdGVtZW50VHlwZUFzc2VydGlvblwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgcXVhbGlmaWVkLCBwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHN0YXRlbWVudFZlcmlmaWVkID0gZmFsc2U7XG5cbiAgcHJvb2ZDb250ZXh0LmJlZ2luKHN0YXRlbWVudE5vZGUpO1xuXG4gIGlmICghc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBlcXVhbGl0eVZlcmlmaWVkQXNFcXVhbGl0eSA9IHZlcmlmeVN0YXRlbWVudEFzRXF1YWxpdHkoc3RhdGVtZW50Tm9kZSwgcXVhbGlmaWVkLCBwcm9vZkNvbnRleHQpO1xuXG4gICAgc3RhdGVtZW50VmVyaWZpZWQgPSBlcXVhbGl0eVZlcmlmaWVkQXNFcXVhbGl0eTsgLy8vXG4gIH1cblxuICBpZiAoIXN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50VHlwZUFzc2VydGlvblZlcmlmaWVkID0gdmVyaWZ5U3RhdGVtZW50VHlwZUFzc2VydGlvbihzdGF0ZW1lbnROb2RlLCBxdWFsaWZpZWQsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IHN0YXRlbWVudFR5cGVBc3NlcnRpb25WZXJpZmllZDsgLy8vXG4gIH1cblxuICBzdGF0ZW1lbnRWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKHN0YXRlbWVudE5vZGUpIDpcbiAgICAgIHByb29mQ29udGV4dC5oYWx0KHN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwicXVhbGlmaWVkIiwicHJvb2ZDb250ZXh0Iiwic3RhdGVtZW50VmVyaWZpZWQiLCJiZWdpbiIsImVxdWFsaXR5VmVyaWZpZWRBc0VxdWFsaXR5IiwidmVyaWZ5U3RhdGVtZW50QXNFcXVhbGl0eSIsInN0YXRlbWVudFR5cGVBc3NlcnRpb25WZXJpZmllZCIsInZlcmlmeVN0YXRlbWVudFR5cGVBc3NlcnRpb24iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUtBOzs7ZUFBd0JBOzs7d0VBSGM7MkVBQ0c7Ozs7OztBQUUxQixTQUFTQSxnQkFBZ0JDLGFBQWEsRUFBRUMsU0FBUyxFQUFFQyxZQUFZLEVBQUU7SUFDOUUsSUFBSUMsb0JBQW9CLEtBQUs7SUFFN0JELGFBQWFFLEtBQUssQ0FBQ0o7SUFFbkIsSUFBSSxDQUFDRyxtQkFBbUI7UUFDdEIsSUFBTUUsNkJBQTZCQyxJQUFBQSw0QkFBeUIsRUFBQ04sZUFBZUMsV0FBV0M7UUFFdkZDLG9CQUFvQkUsNEJBQTRCLEdBQUc7SUFDckQsQ0FBQztJQUVELElBQUksQ0FBQ0YsbUJBQW1CO1FBQ3RCLElBQU1JLGlDQUFpQ0MsSUFBQUEsK0JBQTRCLEVBQUNSLGVBQWVDLFdBQVdDO1FBRTlGQyxvQkFBb0JJLGdDQUFnQyxHQUFHO0lBQ3pELENBQUM7SUFFREosb0JBQ0VELGFBQWFPLFFBQVEsQ0FBQ1QsaUJBQ3BCRSxhQUFhUSxJQUFJLENBQUNWLGNBQWM7SUFFcEMsT0FBT0c7QUFDVCJ9

package/lib/verify/statementAsEquality.js

@@ -9,8 +9,7 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _equality = /*#__PURE__*/ _interopRequireDefault(require("../equality"));
-var _variable = /*#__PURE__*/ _interopRequireDefault(require("../variable"));
-var _term = /*#__PURE__*/ _interopRequireWildcard(require("../verify/term"));
+var _term = /*#__PURE__*/ _interopRequireDefault(require("../verify/term"));
 var _query = require("../utilities/query");
 var _string = require("../utilities/string");
 var _array = require("../utilities/array");
@@ -20,47 +19,8 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interopRequireWildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {};
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
 var specialNodeQuery = (0, _query.nodeQuery)("/statement/@special!"), leftTermNodeQuery = (0, _query.nodeQuery)("/statement/term[0]"), rightTermNodeQuery = (0, _query.nodeQuery)("/statement/term[1]");
-function verifyStatementAsEquality(statementNode, proofContext) {
+function verifyStatementAsEquality(statementNode, qualified, proofContext) {
     var statementVerifiedAsEquality = false;
     proofContext.begin(statementNode);
     var statementString = (0, _string.nodeAsString)(statementNode);
@@ -75,26 +35,15 @@ function verifyStatementAsEquality(statementNode, proofContext) {
                 if (leftType === null && rightType === null) {
                     proofContext.error("The types of the '".concat(leftTermString, "' and '").concat(rightTermString, "' terms are both undefined and therefore the terms cannot be equated."));
                 } else if (rightType === null) {
-                    var type = leftType, termNode = rightTermNode, variable = addVariable(type, termNode, proofContext);
-                    if (variable !== null) {
-                        var leftTypeName = leftType.getName();
-                        proofContext.info("The '".concat(rightTermString, "' variable has been given the '").concat(leftTypeName, "' type."));
-                        statementVerifiedAsEquality = true;
-                    }
+                    proofContext.info("The type of the right '".concat(rightTermString, "' term is undefined and therefore the types cannot be equated."));
                 } else if (leftType === null) {
-                    var type1 = rightType, termNode1 = leftType, variable1 = addVariable(type1, termNode1, proofContext);
-                    if (variable1 !== null) {
-                        var rightTypeName = rightType.getName();
-                        proofContext.info("The '".concat(rightTermString, "' variable has been given the '").concat(rightTypeName, "' type."));
-                        statementVerifiedAsEquality = true;
-                    }
+                    proofContext.info("The type of the left '".concat(leftTermString, "' term is undefined and therefore the types cannot be equated."));
                 } else {
                     var leftTypeMatchesRightType = leftType.match(rightType);
                     if (!leftTypeMatchesRightType) {
                         proofContext.error("The types of the '".concat(leftTermString, "' and '").concat(rightTermString, "' terms do not match and therefore the terms cannot be equated."));
                     } else {
-                        var derived = proofContext.isDerived();
-                        if (!derived) {
+                        if (!qualified) {
                             statementVerifiedAsEquality = true;
                         } else {
                             var equality = _equality.default.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode), proofSteps = proofContext.getProofSteps(), equalities = equalitiesFromProofSteps(proofSteps), equalityEquates = equality.equate(equalities, proofContext);
@@ -123,17 +72,5 @@ function equalitiesFromProofSteps(proofSteps) {
     }, []);
     return equalities;
 }
-function addVariable(type, termNode, proofContext) {
-    var variable = null;
-    var variables = [], termVerifiedAsVariable = (0, _term.verifyTermAsVariable)(termNode, variables, proofContext);
-    if (termVerifiedAsVariable) {
-        var firstVariable = (0, _array.first)(variables);
-        variable = firstVariable; ///
-        var name = variable.getName();
-        variable = _variable.default.fromTypeAndName(type, name); ///
-        proofContext.addVariable(variable);
-    }
-    return variable;
-}
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementAsEquality.js"],"sourcesContent":["\"use strict\";\n\nimport Equality from \"../equality\";\nimport Variable from \"../variable\";\nimport verifyTerm from \"../verify/term\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { first, second } from \"../utilities/array\";\nimport { verifyTermAsVariable } from \"../verify/term\";\nimport { EQUALS_CHARACTER, MAXIMUM_INDEXES_LENGTH } from \"../constants\";\n\nconst specialNodeQuery = nodeQuery(\"/statement/@special!\"),\n      leftTermNodeQuery = nodeQuery(\"/statement/term[0]\"),\n      rightTermNodeQuery = nodeQuery(\"/statement/term[1]\");\n\nexport default function verifyStatementAsEquality(statementNode, proofContext) {\n  let statementVerifiedAsEquality = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement as an equality...`);\n\n  const specialNode = specialNodeQuery(statementNode);\n\n  if (specialNode !== null) {\n    const terminalNode = specialNode, ///\n          terminalNodeContent = terminalNode.getContent();\n\n    if (terminalNodeContent === EQUALS_CHARACTER) {\n      const types = [],\n            context = proofContext,  ///\n            leftTermNode = leftTermNodeQuery(statementNode),\n            rightTermNode = rightTermNodeQuery(statementNode),\n            leftTermVerified = verifyTerm(leftTermNode, types, context),\n            rightTermVerified = verifyTerm(rightTermNode, types, context);\n\n      if (leftTermVerified && rightTermVerified) {\n        const firstType = first(types),\n              secondType = second(types),\n              leftType = firstType, ///\n              rightType = secondType, ///\n              leftTermString = nodeAsString(leftTermNode),\n              rightTermString = nodeAsString(rightTermNode);\n\n        if ((leftType === null) && (rightType === null)) {\n          proofContext.error(`The types of the '${leftTermString}' and '${rightTermString}' terms are both undefined and therefore the terms cannot be equated.`);\n        } else if (rightType === null) {\n          const type = leftType,  ///\n                termNode = rightTermNode, ///\n                variable = addVariable(type, termNode, proofContext);\n\n          if (variable !== null) {\n            const leftTypeName = leftType.getName();\n\n            proofContext.info(`The '${rightTermString}' variable has been given the '${leftTypeName}' type.`);\n\n            statementVerifiedAsEquality = true;\n          }\n        } else if (leftType === null) {\n          const type = rightType,  ///\n                termNode = leftType, ///\n                variable = addVariable(type, termNode, proofContext);\n\n          if (variable !== null) {\n            const rightTypeName = rightType.getName();\n\n            proofContext.info(`The '${rightTermString}' variable has been given the '${rightTypeName}' type.`);\n\n            statementVerifiedAsEquality = true;\n          }\n        } else {\n          const leftTypeMatchesRightType = leftType.match(rightType);\n\n          if (!leftTypeMatchesRightType) {\n            proofContext.error(`The types of the '${leftTermString}' and '${rightTermString}' terms do not match and therefore the terms cannot be equated.`);\n          } else {\n            const derived = proofContext.isDerived();\n\n            if (!derived) {\n              statementVerifiedAsEquality = true;\n            } else {\n              const equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode),\n                    proofSteps = proofContext.getProofSteps(),\n                    equalities = equalitiesFromProofSteps(proofSteps),\n                    equalityEquates = equality.equate(equalities, proofContext);\n\n              statementVerifiedAsEquality = equalityEquates;  ///\n            }\n          }\n        }\n      }\n    }\n  }\n\n  if (statementVerifiedAsEquality) {\n    proofContext.info(`Verified the '${statementString}' equality.`);\n  }\n\n  statementVerifiedAsEquality ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return statementVerifiedAsEquality;\n}\n\nfunction equalitiesFromProofSteps(proofSteps) {\n  const start = -MAXIMUM_INDEXES_LENGTH;  ///\n\n  proofSteps = proofSteps.slice(start); ///\n\n  const equalities = proofSteps.reduce((equalities, proofStep, index) => {\n    const equality = Equality.fromProofStep(proofStep);\n\n    if (equality !== null) {\n      equalities.push(equality);\n    }\n\n    return equalities;\n  }, []);\n\n  return equalities;\n}\n\nfunction addVariable(type, termNode, proofContext) {\n  let variable = null;\n\n  const variables = [],\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, proofContext);\n\n  if (termVerifiedAsVariable) {\n    const firstVariable = first(variables);\n\n    variable = firstVariable;  ///\n\n    const name = variable.getName();\n\n    variable = Variable.fromTypeAndName(type, name);  ///\n\n    proofContext.addVariable(variable);\n  }\n\n  return variable;\n}\n"],"names":["verifyStatementAsEquality","specialNodeQuery","nodeQuery","leftTermNodeQuery","rightTermNodeQuery","statementNode","proofContext","statementVerifiedAsEquality","begin","statementString","nodeAsString","debug","specialNode","terminalNode","terminalNodeContent","getContent","EQUALS_CHARACTER","types","context","leftTermNode","rightTermNode","leftTermVerified","verifyTerm","rightTermVerified","firstType","first","secondType","second","leftType","rightType","leftTermString","rightTermString","error","type","termNode","variable","addVariable","leftTypeName","getName","info","rightTypeName","leftTypeMatchesRightType","match","derived","isDerived","equality","Equality","fromLeftTermNodeAndRightTermNode","proofSteps","getProofSteps","equalities","equalitiesFromProofSteps","equalityEquates","equate","complete","halt","start","MAXIMUM_INDEXES_LENGTH","slice","reduce","proofStep","index","fromProofStep","push","variables","termVerifiedAsVariable","verifyTermAsVariable","firstVariable","name","Variable","fromTypeAndName"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementAsEquality.js"],"sourcesContent":["\"use strict\";\n\nimport Equality from \"../equality\";\nimport verifyTerm from \"../verify/term\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { first, second } from \"../utilities/array\";\nimport { EQUALS_CHARACTER, MAXIMUM_INDEXES_LENGTH } from \"../constants\";\n\nconst specialNodeQuery = nodeQuery(\"/statement/@special!\"),\n      leftTermNodeQuery = nodeQuery(\"/statement/term[0]\"),\n      rightTermNodeQuery = nodeQuery(\"/statement/term[1]\");\n\nexport default function verifyStatementAsEquality(statementNode, qualified, proofContext) {\n  let statementVerifiedAsEquality = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement as an equality...`);\n\n  const specialNode = specialNodeQuery(statementNode);\n\n  if (specialNode !== null) {\n    const terminalNode = specialNode, ///\n          terminalNodeContent = terminalNode.getContent();\n\n    if (terminalNodeContent === EQUALS_CHARACTER) {\n      const types = [],\n            context = proofContext,  ///\n            leftTermNode = leftTermNodeQuery(statementNode),\n            rightTermNode = rightTermNodeQuery(statementNode),\n            leftTermVerified = verifyTerm(leftTermNode, types, context),\n            rightTermVerified = verifyTerm(rightTermNode, types, context);\n\n      if (leftTermVerified && rightTermVerified) {\n        const firstType = first(types),\n              secondType = second(types),\n              leftType = firstType, ///\n              rightType = secondType, ///\n              leftTermString = nodeAsString(leftTermNode),\n              rightTermString = nodeAsString(rightTermNode);\n\n        if ((leftType === null) && (rightType === null)) {\n          proofContext.error(`The types of the '${leftTermString}' and '${rightTermString}' terms are both undefined and therefore the terms cannot be equated.`);\n        } else if (rightType === null) {\n          proofContext.info(`The type of the right '${rightTermString}' term is undefined and therefore the types cannot be equated.`);\n        } else if (leftType === null) {\n          proofContext.info(`The type of the left '${leftTermString}' term is undefined and therefore the types cannot be equated.`);\n        } else {\n          const leftTypeMatchesRightType = leftType.match(rightType);\n\n          if (!leftTypeMatchesRightType) {\n            proofContext.error(`The types of the '${leftTermString}' and '${rightTermString}' terms do not match and therefore the terms cannot be equated.`);\n          } else {\n            if (!qualified) {\n              statementVerifiedAsEquality = true;\n            } else {\n              const equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode),\n                    proofSteps = proofContext.getProofSteps(),\n                    equalities = equalitiesFromProofSteps(proofSteps),\n                    equalityEquates = equality.equate(equalities, proofContext);\n\n              statementVerifiedAsEquality = equalityEquates;  ///\n            }\n          }\n        }\n      }\n    }\n  }\n\n  if (statementVerifiedAsEquality) {\n    proofContext.info(`Verified the '${statementString}' equality.`);\n  }\n\n  statementVerifiedAsEquality ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return statementVerifiedAsEquality;\n}\n\nfunction equalitiesFromProofSteps(proofSteps) {\n  const start = -MAXIMUM_INDEXES_LENGTH;  ///\n\n  proofSteps = proofSteps.slice(start); ///\n\n  const equalities = proofSteps.reduce((equalities, proofStep, index) => {\n    const equality = Equality.fromProofStep(proofStep);\n\n    if (equality !== null) {\n      equalities.push(equality);\n    }\n\n    return equalities;\n  }, []);\n\n  return equalities;\n}\n"],"names":["verifyStatementAsEquality","specialNodeQuery","nodeQuery","leftTermNodeQuery","rightTermNodeQuery","statementNode","qualified","proofContext","statementVerifiedAsEquality","begin","statementString","nodeAsString","debug","specialNode","terminalNode","terminalNodeContent","getContent","EQUALS_CHARACTER","types","context","leftTermNode","rightTermNode","leftTermVerified","verifyTerm","rightTermVerified","firstType","first","secondType","second","leftType","rightType","leftTermString","rightTermString","error","info","leftTypeMatchesRightType","match","equality","Equality","fromLeftTermNodeAndRightTermNode","proofSteps","getProofSteps","equalities","equalitiesFromProofSteps","equalityEquates","equate","complete","halt","start","MAXIMUM_INDEXES_LENGTH","slice","reduce","proofStep","index","fromProofStep","push"],"mappings":"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"}

package/lib/verify/statementTypeAssertion.js

@@ -19,7 +19,7 @@ function _interopRequireDefault(obj) {
     };
 }
 var termNodeQuery = (0, _query.nodeQuery)("/typeAssertion/term"), typeNodeQuery = (0, _query.nodeQuery)("/typeAssertion/type"), typeAssertionNodeQuery = (0, _query.nodeQuery)("/statement/typeAssertion!");
-function verifyStatementTypeAssertion(statementNode, proofContext) {
+function verifyStatementTypeAssertion(statementNode, qualified, proofContext) {
     var statementTypeAssertionVerified = false;
     proofContext.begin(statementNode);
     var statementString = (0, _string.nodeAsString)(statementNode);
@@ -30,12 +30,12 @@ function verifyStatementTypeAssertion(statementNode, proofContext) {
         if (!typePresent) {
             proofContext.error("The ".concat(typeName, " type is not present."));
         } else {
-            var context = proofContext, termNode = termNodeQuery(typeAssertionNode), variables = [], termVerifiedAsVariable = (0, _term.verifyTermAsVariable)(termNode, variables, context);
-            if (termVerifiedAsVariable) {
-                var variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);
+            if (!statementTypeAssertionVerified) {
+                var variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, qualified, proofContext);
                 statementTypeAssertionVerified = variableTypeAssertionVerified; ///
-            } else {
-                var termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);
+            }
+            if (!statementTypeAssertionVerified) {
+                var termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, qualified, proofContext);
                 statementTypeAssertionVerified = termTypeAssertionVerified; ///
             }
         }
@@ -46,37 +46,39 @@ function verifyStatementTypeAssertion(statementNode, proofContext) {
     statementTypeAssertionVerified ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
     return statementTypeAssertionVerified;
 }
-function verifyTermTypeAssertion(typeAssertionNode, proofContext) {
+function verifyVariableTypeAssertion(typeAssertionNode, qualified, proofContext) {
+    var variableTypeAssertionVerified = false;
+    var context = proofContext, variables = [], termNode = termNodeQuery(typeAssertionNode), termVerifiedAsVariable = (0, _term.verifyTermAsVariable)(termNode, variables, context);
+    if (termVerifiedAsVariable) {
+        var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), assertedTypeName = typeName, assertedType = proofContext.findTypeByTypeName(assertedTypeName), firstVariable = (0, _array.first)(variables), variable = firstVariable, variableName = variable.getName(), variableType = variable.getType();
+        var assertedTypeEqualToOrSubTypeOfVariableType = variableType === null ? true : assertedType.isEqualToOrSubTypeOf(variableType);
+        if (!assertedTypeEqualToOrSubTypeOfVariableType) {
+            proofContext.error("The asserted type is not equal to or a sub-type of the '".concat(variableName, "' variable type."));
+        } else {
+            if (!qualified) {
+                var type = assertedType, name = variableName, variable1 = _variable.default.fromTypeAndName(type, name);
+                proofContext.addVariable(variable1);
+            }
+            variableTypeAssertionVerified = true;
+        }
+    }
+    return variableTypeAssertionVerified;
+}
+function verifyTermTypeAssertion(typeAssertionNode, qualified, proofContext) {
     var termTypeAssertionVerified = false;
     var types = [], context = proofContext, termNode = termNodeQuery(typeAssertionNode), termVerifiedAgainstConstructors = (0, _term.verifyTermAgainstConstructors)(termNode, types, context);
     if (termVerifiedAgainstConstructors) {
-        var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), assertedTypeName = typeName, assertedType = proofContext.findTypeByTypeName(assertedTypeName), firstType = (0, _array.first)(types), termType = firstType, assertedTypeEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);
+        var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), assertedTypeName = typeName, assertedType = proofContext.findTypeByTypeName(assertedTypeName), firstType = (0, _array.first)(types), termType = firstType, termString = (0, _string.nodeAsString)(termNode), assertedTypeEqualToOrSubTypeOfTermType = termType === null ? true : assertedType.isEqualToOrSubTypeOf(termType);
         if (!assertedTypeEqualToOrSubTypeOfTermType) {
-            var termString = (0, _string.nodeAsString)(termNode);
             proofContext.error("The asserted type is not equal to or a sub-type of the '".concat(termString, "' term type."));
         } else {
+            if (!qualified) {
+                debugger;
+            }
             termTypeAssertionVerified = true;
         }
     }
     return termTypeAssertionVerified;
 }
-function verifyVariableTypeAssertion(typeAssertionNode, proofContext) {
-    var variableTypeAssertionVerified = false;
-    var context = proofContext, variables = [], termNode = termNodeQuery(typeAssertionNode);
-    (0, _term.verifyTermAsVariable)(termNode, variables, context);
-    var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), assertedTypeName = typeName, assertedType = proofContext.findTypeByTypeName(assertedTypeName), firstVariable = (0, _array.first)(variables), variable = firstVariable, variableName = variable.getName(), variableType = variable.getType();
-    var assertedTypeEqualToOrSubTypeOfVariableType = variableType === null ? true : assertedType.isEqualToOrSubTypeOf(variableType);
-    if (!assertedTypeEqualToOrSubTypeOfVariableType) {
-        proofContext.error("The asserted type is not equal to or a sub-type of the '".concat(variableName, "' variable type."));
-    } else {
-        var derived = proofContext.isDerived();
-        if (!derived) {
-            var type = assertedType, name = variableName, variable1 = _variable.default.fromTypeAndName(type, name);
-            proofContext.addVariable(variable1);
-        }
-        variableTypeAssertionVerified = true;
-    }
-    return variableTypeAssertionVerified;
-}
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementTypeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../variable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { verifyTermAsVariable, verifyTermAgainstConstructors } from \"../verify/term\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nexport default function verifyStatementTypeAssertion(statementNode, proofContext) {\n  let statementTypeAssertionVerified = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement type assertion...`);\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          typePresent = proofContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      proofContext.error(`The ${typeName} type is not present.`);\n    } else {\n      const context = proofContext, ///\n            termNode = termNodeQuery(typeAssertionNode),\n            variables = [],\n            termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context);\n\n      if (termVerifiedAsVariable) {\n        const variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);\n\n        statementTypeAssertionVerified = variableTypeAssertionVerified;  ///\n      } else {\n        const termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);\n\n        statementTypeAssertionVerified = termTypeAssertionVerified;  ///\n      }\n    }\n  }\n\n  if (statementTypeAssertionVerified) {\n    proofContext.info(`Verified the '${statementString}' statement type assertion.`);\n  }\n\n  statementTypeAssertionVerified ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return statementTypeAssertionVerified;\n}\n\nfunction verifyTermTypeAssertion(typeAssertionNode, proofContext) {\n  let termTypeAssertionVerified = false;\n\n  const types = [],\n        context = proofContext, ///\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAgainstConstructors = verifyTermAgainstConstructors(termNode, types, context);\n\n  if (termVerifiedAgainstConstructors) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          assertedTypeName = typeName,  ///\n          assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n          firstType = first(types),\n          termType = firstType,\n          assertedTypeEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);\n\n    if (!assertedTypeEqualToOrSubTypeOfTermType) {\n      const termString = nodeAsString(termNode);\n\n      proofContext.error(`The asserted type is not equal to or a sub-type of the '${termString}' term type.`);\n    } else {\n      termTypeAssertionVerified = true;\n    }\n  }\n\n  return termTypeAssertionVerified;\n}\n\nfunction verifyVariableTypeAssertion(typeAssertionNode, proofContext) {\n  let variableTypeAssertionVerified = false;\n\n  const context = proofContext, ///\n        variables = [],\n        termNode = termNodeQuery(typeAssertionNode);\n\n  verifyTermAsVariable(termNode, variables, context);\n\n  const typeNode = typeNodeQuery(typeAssertionNode),\n        typeName = typeNameFromTypeNode(typeNode),\n        assertedTypeName = typeName,  ///\n        assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n        firstVariable = first(variables),\n        variable = firstVariable, ///\n        variableName = variable.getName(),\n        variableType = variable.getType();\n\n  const assertedTypeEqualToOrSubTypeOfVariableType = (variableType === null) ?\n                                                        true :  ///\n                                                          assertedType.isEqualToOrSubTypeOf(variableType);\n\n  if (!assertedTypeEqualToOrSubTypeOfVariableType) {\n    proofContext.error(`The asserted type is not equal to or a sub-type of the '${variableName}' variable type.`);\n  } else {\n    const derived = proofContext.isDerived();\n\n    if (!derived) {\n      const type = assertedType,  ///\n            name = variableName,  ///\n            variable = Variable.fromTypeAndName(type, name);\n\n      proofContext.addVariable(variable);\n    }\n\n    variableTypeAssertionVerified = true;\n  }\n\n  return variableTypeAssertionVerified;\n}\n"],"names":["verifyStatementTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNodeQuery","statementNode","proofContext","statementTypeAssertionVerified","begin","statementString","nodeAsString","debug","typeAssertionNode","typeNode","typeName","typeNameFromTypeNode","typePresent","isTypePresentByTypeName","error","context","termNode","variables","termVerifiedAsVariable","verifyTermAsVariable","variableTypeAssertionVerified","verifyVariableTypeAssertion","termTypeAssertionVerified","verifyTermTypeAssertion","info","complete","halt","types","termVerifiedAgainstConstructors","verifyTermAgainstConstructors","assertedTypeName","assertedType","findTypeByTypeName","firstType","first","termType","assertedTypeEqualToOrSubTypeOfTermType","isEqualToOrSubTypeOf","termString","firstVariable","variable","variableName","getName","variableType","getType","assertedTypeEqualToOrSubTypeOfVariableType","derived","isDerived","type","name","Variable","fromTypeAndName","addVariable"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementTypeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../variable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { verifyTermAsVariable, verifyTermAgainstConstructors } from \"../verify/term\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nexport default function verifyStatementTypeAssertion(statementNode, qualified, proofContext) {\n  let statementTypeAssertionVerified = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement type assertion...`);\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          typePresent = proofContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      proofContext.error(`The ${typeName} type is not present.`);\n    } else {\n      if (!statementTypeAssertionVerified) {\n        const variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, qualified, proofContext);\n\n        statementTypeAssertionVerified = variableTypeAssertionVerified;  ///\n      }\n\n      if (!statementTypeAssertionVerified) {\n        const termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, qualified, proofContext);\n\n        statementTypeAssertionVerified = termTypeAssertionVerified;  ///\n      }\n    }\n  }\n\n  if (statementTypeAssertionVerified) {\n    proofContext.info(`Verified the '${statementString}' statement type assertion.`);\n  }\n\n  statementTypeAssertionVerified ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return statementTypeAssertionVerified;\n}\n\nfunction verifyVariableTypeAssertion(typeAssertionNode, qualified, proofContext) {\n  let variableTypeAssertionVerified = false;\n\n  const context = proofContext, ///\n        variables = [],\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context);\n\n  if (termVerifiedAsVariable) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          assertedTypeName = typeName,  ///\n          assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n          firstVariable = first(variables),\n          variable = firstVariable, ///\n          variableName = variable.getName(),\n          variableType = variable.getType();\n\n    const assertedTypeEqualToOrSubTypeOfVariableType = (variableType === null) ?\n                                                         true : ///\n                                                           assertedType.isEqualToOrSubTypeOf(variableType);\n\n    if (!assertedTypeEqualToOrSubTypeOfVariableType) {\n      proofContext.error(`The asserted type is not equal to or a sub-type of the '${variableName}' variable type.`);\n    } else {\n      if (!qualified) {\n        const type = assertedType,  ///\n              name = variableName,  ///\n              variable = Variable.fromTypeAndName(type, name);\n\n        proofContext.addVariable(variable);\n      }\n\n      variableTypeAssertionVerified = true;\n    }\n  }\n\n  return variableTypeAssertionVerified;\n}\n\nfunction verifyTermTypeAssertion(typeAssertionNode, qualified, proofContext) {\n  let termTypeAssertionVerified = false;\n\n  const types = [],\n        context = proofContext, ///\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAgainstConstructors = verifyTermAgainstConstructors(termNode, types, context);\n\n  if (termVerifiedAgainstConstructors) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          assertedTypeName = typeName,  ///\n          assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n          firstType = first(types),\n          termType = firstType,\n          termString = nodeAsString(termNode),\n          assertedTypeEqualToOrSubTypeOfTermType = (termType === null) ?\n                                                     true : ///\n                                                       assertedType.isEqualToOrSubTypeOf(termType);\n\n    if (!assertedTypeEqualToOrSubTypeOfTermType) {\n      proofContext.error(`The asserted type is not equal to or a sub-type of the '${termString}' term type.`);\n    } else {\n      if (!qualified) {\n        debugger\n      }\n\n      termTypeAssertionVerified = true;\n    }\n  }\n\n  return termTypeAssertionVerified;\n}\n\n"],"names":["verifyStatementTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNodeQuery","statementNode","qualified","proofContext","statementTypeAssertionVerified","begin","statementString","nodeAsString","debug","typeAssertionNode","typeNode","typeName","typeNameFromTypeNode","typePresent","isTypePresentByTypeName","error","variableTypeAssertionVerified","verifyVariableTypeAssertion","termTypeAssertionVerified","verifyTermTypeAssertion","info","complete","halt","context","variables","termNode","termVerifiedAsVariable","verifyTermAsVariable","assertedTypeName","assertedType","findTypeByTypeName","firstVariable","first","variable","variableName","getName","variableType","getType","assertedTypeEqualToOrSubTypeOfVariableType","isEqualToOrSubTypeOf","type","name","Variable","fromTypeAndName","addVariable","types","termVerifiedAgainstConstructors","verifyTermAgainstConstructors","firstType","termType","termString","assertedTypeEqualToOrSubTypeOfTermType"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.490",
+  "version": "0.0.491",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,9 +12,9 @@
   "dependencies": {
     "argumentative": "^2.0.21",
     "necessary": "^11.2.1",
-    "occam-custom-grammars": "^5.0.379",
+    "occam-custom-grammars": "^5.0.380",
     "occam-dom": "^3.1.1",
-    "occam-file-system": "^5.0.138",
+    "occam-file-system": "^5.0.139",
     "occam-grammar-utilities": "^7.0.66"
   },
   "devDependencies": {

package/src/context/metaproof.js

@@ -7,9 +7,8 @@ import callbacksMixins from "../mixins/callbacks";
 import { last } from "../utilities/array";
 
 class MetaproofContext {
-  constructor(context, derived, metaproofSteps) {
+  constructor(context, metaproofSteps) {
     this.context = context;
-    this.derived = derived;
     this.metaproofSteps = metaproofSteps;
   }
 
@@ -17,10 +16,6 @@ class MetaproofContext {
     return this.context;
   }
 
-  isDerived() {
-    return this.derived;
-  }
-
   getMetaproofSteps() {
     let metaproofSteps = this.context.getMetaproofSteps();
 
@@ -44,14 +39,6 @@ class MetaproofContext {
     return lastMetaproofStep;
   }
 
-  setDerived(derived = true) {
-    this.derived = derived;
-  }
-
-  resetDerived() {
-    this.derived = false;
-  }
-
   addMetaproofStep(metaproofStep) {
     this.metaproofSteps.push(metaproofStep);
   }
@@ -76,19 +63,17 @@ class MetaproofContext {
 
   static fromFileContext(fileContext) {
     const context = fileContext,  ///
-          derived = false,
           metaproofSteps = [],
-          metaproofContext = new MetaproofContext(context, derived, metaproofSteps);
+          metaproofContext = new MetaproofContext(context, metaproofSteps);
 
     return metaproofContext;
   }
 
   static fromMetaproofContext(metaproofContext) {
     const context = metaproofContext,  ///
-          derived = false,
           metaproofSteps = [];
 
-    metaproofContext = new MetaproofContext(context, derived, metaproofSteps);  ///
+    metaproofContext = new MetaproofContext(context, metaproofSteps);  ///
 
     return metaproofContext;
   }

package/src/context/proof.js

@@ -7,9 +7,8 @@ import callbacksMixins from "../mixins/callbacks";
 import { push, last } from "../utilities/array";
 
 class ProofContext {
-  constructor(context, derived, variables, proofSteps) {
+  constructor(context, variables, proofSteps) {
     this.context = context;
-    this.derived = derived;
     this.variables = variables;
     this.proofSteps = proofSteps;
   }
@@ -18,10 +17,6 @@ class ProofContext {
     return this.context;
   }
 
-  isDerived() {
-    return this.derived;
-  }
-
   getProofSteps() {
     let proofSteps = this.context.getProofSteps();
 
@@ -63,14 +58,6 @@ class ProofContext {
     return lastProofStep;
   }
 
-  setDerived(derived = true) {
-    this.derived = derived;
-  }
-
-  resetDerived() {
-    this.derived = false;
-  }
-
   addVariable(variable) {
     this.variables.push(variable);
   }
@@ -136,21 +123,19 @@ class ProofContext {
 
   static fromFileContext(fileContext) {
     const context = fileContext,  ///
-          derived = false,
           variables = [],
           proofSteps = [],
-          proofContext = new ProofContext(context, derived, variables, proofSteps);
+          proofContext = new ProofContext(context, variables, proofSteps);
 
     return proofContext;
   }
 
   static fromProofContext(proofContext) {
     const context = proofContext,  ///
-          derived = false,
           variables = [],
           proofSteps = [];
 
-    proofContext = new ProofContext(context, derived, variables, proofSteps);
+    proofContext = new ProofContext(context, variables, proofSteps);
 
     return proofContext;
   }

package/src/verify/antecedent.js

@@ -5,6 +5,7 @@ import Antecedent from "../antecedent";
 
 import { nodeQuery } from "../utilities/query";
 import { nodeAsString } from "../utilities/string";
+import verifyStatement from "./statement";
 
 const statementNodeQuery = nodeQuery("/antecedent/unqualifiedStatement!/statement!");
 
@@ -20,12 +21,17 @@ export default function verifyAntecedent(antecedentNode, antecedents, proofConte
   const statementNode = statementNodeQuery(antecedentNode);
 
   if (statementNode !== null) {
-    const proofStep = ProofStep.fromStatementNode(statementNode),
-          antecedent = Antecedent.fromStatementNode(statementNode);
+    const qualified = false,
+          statementVerified = verifyStatement(statementNode, qualified, proofContext);
 
-    antecedents.push(antecedent);
+    if (statementVerified) {
+      const proofStep = ProofStep.fromStatementNode(statementNode),
+            antecedent = Antecedent.fromStatementNode(statementNode);
 
-    proofContext.addProofStep(proofStep);
+      antecedents.push(antecedent);
+
+      proofContext.addProofStep(proofStep);
+    }
 
     antecedentVerified = true;
   }

package/src/verify/conditinalInference.js

@@ -1,7 +1,7 @@
 "use strict";
 
+import verifyPremise from "../verify/premise";
 import verifyConclusion from "../verify/conclusion";
-import verifyPrmise from "../verify/premise";
 
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
@@ -16,7 +16,7 @@ export default function verifyConditionalInference(conditionalInferenceNode, pre
   const conclusionNode = conclusionNodeQuery(conditionalInferenceNode),
         premiseNodes = premisesNodeQuery(conditionalInferenceNode),
         premisesVerified = premiseNodes.every((premiseNode) => {
-          const premiseVerified = verifyPrmise(premiseNode, premises, metaproofContext);
+          const premiseVerified = verifyPremise(premiseNode, premises, metaproofContext);
 
           if (premiseVerified) {
             return true;

package/src/verify/derivation.js

@@ -18,8 +18,6 @@ export default function verifyDerivation(derivationNode, proofContext) {
 
   proofContext.begin(derivationNode);
 
-  proofContext.setDerived();
-
   const childNodes = childNodesQuery(derivationNode);
 
   derivationVerified = childNodes.every((childNode) => {  ///
@@ -30,8 +28,6 @@ export default function verifyDerivation(derivationNode, proofContext) {
     }
   });
 
-  proofContext.resetDerived();
-
   derivationVerified ?
     proofContext.complete(derivationNode) :
       proofContext.halt(derivationNode);
@@ -44,8 +40,6 @@ function verifySubDerivation(subDerivationNode, proofContext) {
 
   proofContext.begin(subDerivationNode);
 
-  proofContext.setDerived();
-
   const childNodes = childNodesQuery(subDerivationNode);
 
   derivationVerified = childNodes.every((childNode) => {  ///
@@ -56,8 +50,6 @@ function verifySubDerivation(subDerivationNode, proofContext) {
     }
   });
 
-  proofContext.resetDerived();
-
   derivationVerified ?
     proofContext.complete(subDerivationNode) :
       proofContext.halt(subDerivationNode);

package/src/verify/metaDerivation.js

@@ -18,8 +18,6 @@ export default function verifyMetaDerivation(metaDerivationNode, metaproofContex
 
   metaproofContext.begin(metaDerivationNode);
 
-  metaproofContext.setDerived();
-
   const childNodes = childNodesQuery(metaDerivationNode);
 
   metaDerivationVerified = childNodes.every((childNode) => {  ///
@@ -30,8 +28,6 @@ export default function verifyMetaDerivation(metaDerivationNode, metaproofContex
     }
   });
 
-  metaproofContext.resetDerived();
-
   metaDerivationVerified ?
     metaproofContext.complete(metaDerivationNode) :
       metaproofContext.halt(metaDerivationNode);
@@ -44,8 +40,6 @@ function verifyMetaSubDerivation(metaSubDerivationNode, metaproofContext) {
 
   metaproofContext.begin(metaSubDerivationNode);
 
-  metaproofContext.setDerived();
-
   const childNodes = childNodesQuery(metaSubDerivationNode);
 
   metaDerivationVerified = childNodes.every((childNode) => {  ///
@@ -56,8 +50,6 @@ function verifyMetaSubDerivation(metaSubDerivationNode, metaproofContext) {
     }
   });
 
-  metaproofContext.resetDerived();
-
   metaDerivationVerified ?
     metaproofContext.complete(metaSubDerivationNode) :
       metaproofContext.halt(metaSubDerivationNode);
@@ -72,17 +64,17 @@ function verifyMetaSubproof(metaSubproofNode, metaproofContext) {
 
   const unqualifiedMetastatementNodes = unqualifiedMetastatementNodesQuery(metaSubproofNode),
         unqualifiedMetastatementsVerified = unqualifiedMetastatementNodes.every((unqualifiedMetastatementNode) => {
-      const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
+          const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
 
-      if (unqualifiedMetastatementVerified) {
-        return true;
-      }
-    });
+          if (unqualifiedMetastatementVerified) {
+            return true;
+          }
+        });
 
   if (unqualifiedMetastatementsVerified) {
     unqualifiedMetastatementNodes.forEach((unqualifiedMetastatementNode) => {
       const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
-        metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
+            metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
 
       metaproofContext.addMetaproofStep(metaproofStep);
     });