occam-verify-cli 1.0.437 → 1.0.438

package/lib/utilities/statement.js

@@ -37,47 +37,42 @@ _export(exports, {
         return typeAssertionFromStatement;
     }
 });
-var _elements = /*#__PURE__*/ _interop_require_default(require("../elements"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+var _element = require("../utilities/element");
 function equalityFromStatement(statement, context) {
-    var Equality = _elements.default.Equality, statementNode = statement.getNode(), equality = Equality.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), equality = (0, _element.equalityFromStatementNode)(statementNode, context);
     return equality;
 }
 function judgementFromStatement(statement, context) {
-    var Judgement = _elements.default.Judgement, statementNode = statement.getNode(), judgement = Judgement.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), judgement = (0, _element.judgementFromStatementNode)(statementNode, context);
     return judgement;
 }
 function metavariableFromStatement(statement, context) {
-    var Metavariable = _elements.default.Metavariable, statementNode = statement.getNode(), metavariable = Metavariable.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), metavariable = (0, _element.metavariableFromStatementNode)(statementNode, context);
     return metavariable;
 }
 function typeAssertionFromStatement(statement, context) {
-    var TypeAssertion = _elements.default.TypeAssertion, statementNode = statement.getNode(), typeAssertion = TypeAssertion.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), typeAssertion = (0, _element.typeAssertionFromStatementNode)(statementNode, context);
     return typeAssertion;
 }
 function definedAssertionFromStatement(statement, context) {
-    var DefinedAssertion = _elements.default.DefinedAssertion, statementNode = statement.getNode(), definedAssertion = DefinedAssertion.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), definedAssertion = (0, _element.dDefinedAssertionFromStatementNode)(statementNode, context);
     return definedAssertion;
 }
 function propertyAssertionFromStatement(statement, context) {
-    var PropertyAssertion = _elements.default.PropertyAssertion, statementNode = statement.getNode(), propertyAssertion = PropertyAssertion.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), propertyAssertion = (0, _element.propertyAssertionFromStatementNode)(statementNode, context);
     return propertyAssertion;
 }
 function subproofAssertionFromStatement(statement, context) {
-    var SubproofAssertion = _elements.default.SubproofAssertion, statementNode = statement.getNode(), subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), subproofAssertion = (0, _element.subproofAssertionFromStatementNode)(statementNode, context);
     return subproofAssertion;
 }
 function containedAssertionFromStatement(statement, context) {
-    var ContainedAssertion = _elements.default.ContainedAssertion, statementNode = statement.getNode(), containedAssertion = ContainedAssertion.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), containedAssertion = (0, _element.containedAssertionFromStatementNode)(statementNode, context);
     return containedAssertion;
 }
 function satisfiesAssertionFromStatement(statement, context) {
-    var SatisfiesAssertion = _elements.default.SatisfiesAssertion, statementNode = statement.getNode(), satisfiesAssertion = SatisfiesAssertion.fromStatementNode(statementNode, context);
+    var statementNode = statement.getNode(), satisfiesAssertion = (0, _element.satisfiesAssertionFromStatementNode)(statementNode, context);
     return satisfiesAssertion;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgZWxlbWVudHMgZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBlcXVhbGl0eUZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgRXF1YWxpdHkgfSA9IGVsZW1lbnRzLFxuICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAgZXF1YWxpdHkgPSBFcXVhbGl0eS5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gZXF1YWxpdHk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBqdWRnZW1lbnRGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb25zdCB7IEp1ZGdlbWVudCB9ID0gZWxlbWVudHMsXG4gICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBqdWRnZW1lbnQgPSBKdWRnZW1lbnQuZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIGp1ZGdlbWVudDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1ldGF2YXJpYWJsZUZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgTWV0YXZhcmlhYmxlIH0gPSBlbGVtZW50cyxcbiAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgIG1ldGF2YXJpYWJsZSA9IE1ldGF2YXJpYWJsZS5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gbWV0YXZhcmlhYmxlO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdHlwZUFzc2VydGlvbkZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgVHlwZUFzc2VydGlvbiB9ID0gZWxlbWVudHMsXG4gICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICB0eXBlQXNzZXJ0aW9uID0gVHlwZUFzc2VydGlvbi5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gdHlwZUFzc2VydGlvbjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGRlZmluZWRBc3NlcnRpb25Gcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb25zdCB7IERlZmluZWRBc3NlcnRpb24gfSA9IGVsZW1lbnRzLFxuICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAgZGVmaW5lZEFzc2VydGlvbiA9IERlZmluZWRBc3NlcnRpb24uZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIGRlZmluZWRBc3NlcnRpb247XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBwcm9wZXJ0eUFzc2VydGlvbkZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgUHJvcGVydHlBc3NlcnRpb24gfSA9IGVsZW1lbnRzLFxuICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAgcHJvcGVydHlBc3NlcnRpb24gPSBQcm9wZXJ0eUFzc2VydGlvbi5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gcHJvcGVydHlBc3NlcnRpb247XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzdWJwcm9vZkFzc2VydGlvbkZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgU3VicHJvb2ZBc3NlcnRpb24gfSA9IGVsZW1lbnRzLFxuICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAgc3VicHJvb2ZBc3NlcnRpb24gPSBTdWJwcm9vZkFzc2VydGlvbi5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gc3VicHJvb2ZBc3NlcnRpb247XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb250YWluZWRBc3NlcnRpb25Gcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb25zdCB7IENvbnRhaW5lZEFzc2VydGlvbiB9ID0gZWxlbWVudHMsXG4gICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBjb250YWluZWRBc3NlcnRpb24gPSBDb250YWluZWRBc3NlcnRpb24uZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIGNvbnRhaW5lZEFzc2VydGlvbjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHNhdGlzZmllc0Fzc2VydGlvbkZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgU2F0aXNmaWVzQXNzZXJ0aW9uIH0gPSBlbGVtZW50cyxcbiAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgIHNhdGlzZmllc0Fzc2VydGlvbiA9IFNhdGlzZmllc0Fzc2VydGlvbi5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gc2F0aXNmaWVzQXNzZXJ0aW9uO1xufVxuIl0sIm5hbWVzIjpbImNvbnRhaW5lZEFzc2VydGlvbkZyb21TdGF0ZW1lbnQiLCJkZWZpbmVkQXNzZXJ0aW9uRnJvbVN0YXRlbWVudCIsImVxdWFsaXR5RnJvbVN0YXRlbWVudCIsImp1ZGdlbWVudEZyb21TdGF0ZW1lbnQiLCJtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50IiwicHJvcGVydHlBc3NlcnRpb25Gcm9tU3RhdGVtZW50Iiwic2F0aXNmaWVzQXNzZXJ0aW9uRnJvbVN0YXRlbWVudCIsInN1YnByb29mQXNzZXJ0aW9uRnJvbVN0YXRlbWVudCIsInR5cGVBc3NlcnRpb25Gcm9tU3RhdGVtZW50Iiwic3RhdGVtZW50IiwiY29udGV4dCIsIkVxdWFsaXR5IiwiZWxlbWVudHMiLCJzdGF0ZW1lbnROb2RlIiwiZ2V0Tm9kZSIsImVxdWFsaXR5IiwiZnJvbVN0YXRlbWVudE5vZGUiLCJKdWRnZW1lbnQiLCJqdWRnZW1lbnQiLCJNZXRhdmFyaWFibGUiLCJtZXRhdmFyaWFibGUiLCJUeXBlQXNzZXJ0aW9uIiwidHlwZUFzc2VydGlvbiIsIkRlZmluZWRBc3NlcnRpb24iLCJkZWZpbmVkQXNzZXJ0aW9uIiwiUHJvcGVydHlBc3NlcnRpb24iLCJwcm9wZXJ0eUFzc2VydGlvbiIsIlN1YnByb29mQXNzZXJ0aW9uIiwic3VicHJvb2ZBc3NlcnRpb24iLCJDb250YWluZWRBc3NlcnRpb24iLCJjb250YWluZWRBc3NlcnRpb24iLCJTYXRpc2ZpZXNBc3NlcnRpb24iLCJzYXRpc2ZpZXNBc3NlcnRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQTREZ0JBO2VBQUFBOztRQXhCQUM7ZUFBQUE7O1FBaENBQztlQUFBQTs7UUFRQUM7ZUFBQUE7O1FBUUFDO2VBQUFBOztRQXdCQUM7ZUFBQUE7O1FBd0JBQztlQUFBQTs7UUFoQkFDO2VBQUFBOztRQXhCQUM7ZUFBQUE7OzsrREExQks7Ozs7OztBQUVkLFNBQVNOLHNCQUFzQk8sU0FBUyxFQUFFQyxPQUFPO0lBQ3RELElBQU0sQUFBRUMsV0FBYUMsaUJBQVEsQ0FBckJELFVBQ0ZFLGdCQUFnQkosVUFBVUssT0FBTyxJQUNqQ0MsV0FBV0osU0FBU0ssaUJBQWlCLENBQUNILGVBQWVIO0lBRTNELE9BQU9LO0FBQ1Q7QUFFTyxTQUFTWix1QkFBdUJNLFNBQVMsRUFBRUMsT0FBTztJQUN2RCxJQUFNLEFBQUVPLFlBQWNMLGlCQUFRLENBQXRCSyxXQUNGSixnQkFBZ0JKLFVBQVVLLE9BQU8sSUFDakNJLFlBQVlELFVBQVVELGlCQUFpQixDQUFDSCxlQUFlSDtJQUU3RCxPQUFPUTtBQUNUO0FBRU8sU0FBU2QsMEJBQTBCSyxTQUFTLEVBQUVDLE9BQU87SUFDMUQsSUFBTSxBQUFFUyxlQUFpQlAsaUJBQVEsQ0FBekJPLGNBQ0ZOLGdCQUFnQkosVUFBVUssT0FBTyxJQUNqQ00sZUFBZUQsYUFBYUgsaUJBQWlCLENBQUNILGVBQWVIO0lBRW5FLE9BQU9VO0FBQ1Q7QUFFTyxTQUFTWiwyQkFBMkJDLFNBQVMsRUFBRUMsT0FBTztJQUMzRCxJQUFNLEFBQUVXLGdCQUFrQlQsaUJBQVEsQ0FBMUJTLGVBQ0ZSLGdCQUFnQkosVUFBVUssT0FBTyxJQUNqQ1EsZ0JBQWdCRCxjQUFjTCxpQkFBaUIsQ0FBQ0gsZUFBZUg7SUFFckUsT0FBT1k7QUFDVDtBQUVPLFNBQVNyQiw4QkFBOEJRLFNBQVMsRUFBRUMsT0FBTztJQUM5RCxJQUFNLEFBQUVhLG1CQUFxQlgsaUJBQVEsQ0FBN0JXLGtCQUNGVixnQkFBZ0JKLFVBQVVLLE9BQU8sSUFDakNVLG1CQUFtQkQsaUJBQWlCUCxpQkFBaUIsQ0FBQ0gsZUFBZUg7SUFFM0UsT0FBT2M7QUFDVDtBQUVPLFNBQVNuQiwrQkFBK0JJLFNBQVMsRUFBRUMsT0FBTztJQUMvRCxJQUFNLEFBQUVlLG9CQUFzQmIsaUJBQVEsQ0FBOUJhLG1CQUNGWixnQkFBZ0JKLFVBQVVLLE9BQU8sSUFDakNZLG9CQUFvQkQsa0JBQWtCVCxpQkFBaUIsQ0FBQ0gsZUFBZUg7SUFFN0UsT0FBT2dCO0FBQ1Q7QUFFTyxTQUFTbkIsK0JBQStCRSxTQUFTLEVBQUVDLE9BQU87SUFDL0QsSUFBTSxBQUFFaUIsb0JBQXNCZixpQkFBUSxDQUE5QmUsbUJBQ0ZkLGdCQUFnQkosVUFBVUssT0FBTyxJQUNqQ2Msb0JBQW9CRCxrQkFBa0JYLGlCQUFpQixDQUFDSCxlQUFlSDtJQUU3RSxPQUFPa0I7QUFDVDtBQUVPLFNBQVM1QixnQ0FBZ0NTLFNBQVMsRUFBRUMsT0FBTztJQUNoRSxJQUFNLEFBQUVtQixxQkFBdUJqQixpQkFBUSxDQUEvQmlCLG9CQUNGaEIsZ0JBQWdCSixVQUFVSyxPQUFPLElBQ2pDZ0IscUJBQXFCRCxtQkFBbUJiLGlCQUFpQixDQUFDSCxlQUFlSDtJQUUvRSxPQUFPb0I7QUFDVDtBQUVPLFNBQVN4QixnQ0FBZ0NHLFNBQVMsRUFBRUMsT0FBTztJQUNoRSxJQUFNLEFBQUVxQixxQkFBdUJuQixpQkFBUSxDQUEvQm1CLG9CQUNGbEIsZ0JBQWdCSixVQUFVSyxPQUFPLElBQ2pDa0IscUJBQXFCRCxtQkFBbUJmLGlCQUFpQixDQUFDSCxlQUFlSDtJQUUvRSxPQUFPc0I7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBlcXVhbGl0eUZyb21TdGF0ZW1lbnROb2RlLFxuICAgICAgICAganVkZ2VtZW50RnJvbVN0YXRlbWVudE5vZGUsXG4gICAgICAgICBtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50Tm9kZSxcbiAgICAgICAgIHR5cGVBc3NlcnRpb25Gcm9tU3RhdGVtZW50Tm9kZSxcbiAgICAgICAgIGREZWZpbmVkQXNzZXJ0aW9uRnJvbVN0YXRlbWVudE5vZGUsXG4gICAgICAgICBwcm9wZXJ0eUFzc2VydGlvbkZyb21TdGF0ZW1lbnROb2RlLFxuICAgICAgICAgc3VicHJvb2ZBc3NlcnRpb25Gcm9tU3RhdGVtZW50Tm9kZSxcbiAgICAgICAgIGNvbnRhaW5lZEFzc2VydGlvbkZyb21TdGF0ZW1lbnROb2RlLFxuICAgICAgICAgc2F0aXNmaWVzQXNzZXJ0aW9uRnJvbVN0YXRlbWVudE5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2VsZW1lbnRcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIGVxdWFsaXR5RnJvbVN0YXRlbWVudChzdGF0ZW1lbnQsIGNvbnRleHQpIHtcbiAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgIGVxdWFsaXR5ID0gZXF1YWxpdHlGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gZXF1YWxpdHk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBqdWRnZW1lbnRGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAganVkZ2VtZW50ID0ganVkZ2VtZW50RnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIGp1ZGdlbWVudDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1ldGF2YXJpYWJsZUZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBtZXRhdmFyaWFibGUgPSBtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gbWV0YXZhcmlhYmxlO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdHlwZUFzc2VydGlvbkZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICB0eXBlQXNzZXJ0aW9uID0gdHlwZUFzc2VydGlvbkZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGNvbnRleHQpO1xuXG4gIHJldHVybiB0eXBlQXNzZXJ0aW9uO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZGVmaW5lZEFzc2VydGlvbkZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBkZWZpbmVkQXNzZXJ0aW9uID0gZERlZmluZWRBc3NlcnRpb25Gcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gZGVmaW5lZEFzc2VydGlvbjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHByb3BlcnR5QXNzZXJ0aW9uRnJvbVN0YXRlbWVudChzdGF0ZW1lbnQsIGNvbnRleHQpIHtcbiAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgIHByb3BlcnR5QXNzZXJ0aW9uID0gcHJvcGVydHlBc3NlcnRpb25Gcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gcHJvcGVydHlBc3NlcnRpb247XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzdWJwcm9vZkFzc2VydGlvbkZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBzdWJwcm9vZkFzc2VydGlvbiA9IHN1YnByb29mQXNzZXJ0aW9uRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIHN1YnByb29mQXNzZXJ0aW9uO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29udGFpbmVkQXNzZXJ0aW9uRnJvbVN0YXRlbWVudChzdGF0ZW1lbnQsIGNvbnRleHQpIHtcbiAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgIGNvbnRhaW5lZEFzc2VydGlvbiA9IGNvbnRhaW5lZEFzc2VydGlvbkZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGNvbnRleHQpO1xuXG4gIHJldHVybiBjb250YWluZWRBc3NlcnRpb247XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzYXRpc2ZpZXNBc3NlcnRpb25Gcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAgc2F0aXNmaWVzQXNzZXJ0aW9uID0gc2F0aXNmaWVzQXNzZXJ0aW9uRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIHNhdGlzZmllc0Fzc2VydGlvbjtcbn1cbiJdLCJuYW1lcyI6WyJjb250YWluZWRBc3NlcnRpb25Gcm9tU3RhdGVtZW50IiwiZGVmaW5lZEFzc2VydGlvbkZyb21TdGF0ZW1lbnQiLCJlcXVhbGl0eUZyb21TdGF0ZW1lbnQiLCJqdWRnZW1lbnRGcm9tU3RhdGVtZW50IiwibWV0YXZhcmlhYmxlRnJvbVN0YXRlbWVudCIsInByb3BlcnR5QXNzZXJ0aW9uRnJvbVN0YXRlbWVudCIsInNhdGlzZmllc0Fzc2VydGlvbkZyb21TdGF0ZW1lbnQiLCJzdWJwcm9vZkFzc2VydGlvbkZyb21TdGF0ZW1lbnQiLCJ0eXBlQXNzZXJ0aW9uRnJvbVN0YXRlbWVudCIsInN0YXRlbWVudCIsImNvbnRleHQiLCJzdGF0ZW1lbnROb2RlIiwiZ2V0Tm9kZSIsImVxdWFsaXR5IiwiZXF1YWxpdHlGcm9tU3RhdGVtZW50Tm9kZSIsImp1ZGdlbWVudCIsImp1ZGdlbWVudEZyb21TdGF0ZW1lbnROb2RlIiwibWV0YXZhcmlhYmxlIiwibWV0YXZhcmlhYmxlRnJvbVN0YXRlbWVudE5vZGUiLCJ0eXBlQXNzZXJ0aW9uIiwidHlwZUFzc2VydGlvbkZyb21TdGF0ZW1lbnROb2RlIiwiZGVmaW5lZEFzc2VydGlvbiIsImREZWZpbmVkQXNzZXJ0aW9uRnJvbVN0YXRlbWVudE5vZGUiLCJwcm9wZXJ0eUFzc2VydGlvbiIsInByb3BlcnR5QXNzZXJ0aW9uRnJvbVN0YXRlbWVudE5vZGUiLCJzdWJwcm9vZkFzc2VydGlvbiIsInN1YnByb29mQXNzZXJ0aW9uRnJvbVN0YXRlbWVudE5vZGUiLCJjb250YWluZWRBc3NlcnRpb24iLCJjb250YWluZWRBc3NlcnRpb25Gcm9tU3RhdGVtZW50Tm9kZSIsInNhdGlzZmllc0Fzc2VydGlvbiIsInNhdGlzZmllc0Fzc2VydGlvbkZyb21TdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUE2RGdCQTtlQUFBQTs7UUFyQkFDO2VBQUFBOztRQTVCQUM7ZUFBQUE7O1FBT0FDO2VBQUFBOztRQU9BQztlQUFBQTs7UUFxQkFDO2VBQUFBOztRQXFCQUM7ZUFBQUE7O1FBZEFDO2VBQUFBOztRQXJCQUM7ZUFBQUE7Ozt1QkF2Qm9DO0FBRTdDLFNBQVNOLHNCQUFzQk8sU0FBUyxFQUFFQyxPQUFPO0lBQ3RELElBQU1DLGdCQUFnQkYsVUFBVUcsT0FBTyxJQUNqQ0MsV0FBV0MsSUFBQUEsa0NBQXlCLEVBQUNILGVBQWVEO0lBRTFELE9BQU9HO0FBQ1Q7QUFFTyxTQUFTVix1QkFBdUJNLFNBQVMsRUFBRUMsT0FBTztJQUN2RCxJQUFNQyxnQkFBZ0JGLFVBQVVHLE9BQU8sSUFDakNHLFlBQVlDLElBQUFBLG1DQUEwQixFQUFDTCxlQUFlRDtJQUU1RCxPQUFPSztBQUNUO0FBRU8sU0FBU1gsMEJBQTBCSyxTQUFTLEVBQUVDLE9BQU87SUFDMUQsSUFBTUMsZ0JBQWdCRixVQUFVRyxPQUFPLElBQ2pDSyxlQUFlQyxJQUFBQSxzQ0FBNkIsRUFBQ1AsZUFBZUQ7SUFFbEUsT0FBT087QUFDVDtBQUVPLFNBQVNULDJCQUEyQkMsU0FBUyxFQUFFQyxPQUFPO0lBQzNELElBQU1DLGdCQUFnQkYsVUFBVUcsT0FBTyxJQUNqQ08sZ0JBQWdCQyxJQUFBQSx1Q0FBOEIsRUFBQ1QsZUFBZUQ7SUFFcEUsT0FBT1M7QUFDVDtBQUVPLFNBQVNsQiw4QkFBOEJRLFNBQVMsRUFBRUMsT0FBTztJQUM5RCxJQUFNQyxnQkFBZ0JGLFVBQVVHLE9BQU8sSUFDakNTLG1CQUFtQkMsSUFBQUEsMkNBQWtDLEVBQUNYLGVBQWVEO0lBRTNFLE9BQU9XO0FBQ1Q7QUFFTyxTQUFTaEIsK0JBQStCSSxTQUFTLEVBQUVDLE9BQU87SUFDL0QsSUFBTUMsZ0JBQWdCRixVQUFVRyxPQUFPLElBQ2pDVyxvQkFBb0JDLElBQUFBLDJDQUFrQyxFQUFDYixlQUFlRDtJQUU1RSxPQUFPYTtBQUNUO0FBRU8sU0FBU2hCLCtCQUErQkUsU0FBUyxFQUFFQyxPQUFPO0lBQy9ELElBQU1DLGdCQUFnQkYsVUFBVUcsT0FBTyxJQUNqQ2Esb0JBQW9CQyxJQUFBQSwyQ0FBa0MsRUFBQ2YsZUFBZUQ7SUFFNUUsT0FBT2U7QUFDVDtBQUVPLFNBQVN6QixnQ0FBZ0NTLFNBQVMsRUFBRUMsT0FBTztJQUNoRSxJQUFNQyxnQkFBZ0JGLFVBQVVHLE9BQU8sSUFDakNlLHFCQUFxQkMsSUFBQUEsNENBQW1DLEVBQUNqQixlQUFlRDtJQUU5RSxPQUFPaUI7QUFDVDtBQUVPLFNBQVNyQixnQ0FBZ0NHLFNBQVMsRUFBRUMsT0FBTztJQUNoRSxJQUFNQyxnQkFBZ0JGLFVBQVVHLE9BQU8sSUFDakNpQixxQkFBcUJDLElBQUFBLDRDQUFtQyxFQUFDbkIsZUFBZUQ7SUFFOUUsT0FBT21CO0FBQ1QifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.437",
+  "version": "1.0.438",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,11 +12,11 @@
   "dependencies": {
     "argumentative": "^2.0.36",
     "necessary": "^17.0.9",
-    "occam-custom-grammars": "^5.0.1336",
-    "occam-entities": "^1.0.441",
-    "occam-file-system": "^6.0.456",
-    "occam-furtle": "^2.0.275",
-    "occam-grammars": "^1.3.430",
+    "occam-custom-grammars": "^5.0.1338",
+    "occam-entities": "^1.0.442",
+    "occam-file-system": "^6.0.457",
+    "occam-furtle": "^2.0.276",
+    "occam-grammars": "^1.3.433",
     "occam-lexers": "^23.1.34",
     "occam-parsers": "^23.1.37",
     "occam-query": "^4.1.142"

package/src/element/derivation.js

@@ -32,9 +32,9 @@ export default define(class Derivation extends Element {
 
     verifies = this.stepsOrSubproofs.every((stepOrSubproof) => { ///
       const assignments = [],
-            stepOrSubproofVerifies = stepOrSubproof.verify(substitutions, assignments, context);
+            stepOrSubproofValidates = stepOrSubproof.validate(substitutions, assignments, context);
 
-      if (stepOrSubproofVerifies) {
+      if (stepOrSubproofValidates) {
         const stepOrSubproofUnifies = stepOrSubproof.unify(substitutions, context);
 
         if (stepOrSubproofUnifies) {

package/src/element/label.js

@@ -16,17 +16,13 @@ export default define(class Label extends Element {
     return this.metavariable;
   }
 
-  getMetavariableName() {
-    const metavariableName = this.metavariable.getName();
+  getMetavariableName() { return this.metavariable.getName(); }
 
-    return metavariableName;
-  }
+  getMetavariableNode() { return this.metavariable.getNode(); }
 
-  getMetavariableNode() {
-    const metavariableNode = this.metavariable.getNode();
+  matchMetavariableName(metavariableName) { return this.metavariable.matchMetavariableName(metavariableName); }
 
-    return metavariableNode;
-  }
+  isMetavariableEqualToMetavariable(metavariable) { return this.metavariable.isEqualTo(metavariable); }
 
   matchReference(reference) {
     const metavariable = reference.getMetavariable(),
@@ -36,37 +32,34 @@ export default define(class Label extends Element {
     return referenceMatches;
   }
 
-  isMetavariableEqualToMetavariable(metavariable) { return this.metavariable.isEqualTo(metavariable); }
-
-  matchMetavariableName(metavariableName) { return this.metavariable.matchMetavariableName(metavariableName); }
-
   verify(nameOnly) {
     let verifies = false;
 
-    const labelString = this.getString(); ///
+    const context = this.getContext(),
+          labelString = this.getString(); ///
 
-    this.context.trace(`Verifying the '${labelString}' label...`);
+    context.trace(`Verifying the '${labelString}' label...`);
 
     let labelPresent;
 
     if (nameOnly) {
       const metavariableName = this.getMetavariableName();
 
-      labelPresent = this.context.isLabelPresentByMetavariableName(metavariableName);
+      labelPresent = context.isLabelPresentByMetavariableName(metavariableName);
     } else {
       const metavariable = this.getMetavariable();
 
-      labelPresent = this.context.isLabelPresentByMetavariable(metavariable);
+      labelPresent = context.isLabelPresentByMetavariable(metavariable);
     }
 
     if (labelPresent) {
-      this.context.debug(`The '${labelString}' label is already present.`);
+      context.debug(`The '${labelString}' label is already present.`);
     } else {
       verifies = true;
     }
 
     if (verifies) {
-      this.context.debug(`...verified the '${labelString}' label.`);
+      context.debug(`...verified the '${labelString}' label.`);
     }
 
     return verifies;

package/src/element/premise.js

@@ -25,25 +25,26 @@ export default define(class Premise extends Element {
     return this.procedureCall;
   }
 
-  verify(context) {
-    let verifies = false;
+  validate(context) {
+    let validates = false;
 
     const temporaryContext = TemporaryContext.fromNothing(context);
 
     context = temporaryContext; ///
 
-    const premiseString = this.string; ///
+    const node = this.getNode(),
+          premiseString = this.getString(); ///
 
-    context.trace(`Verifying the '${premiseString}' premise...`, this.node);
+    context.trace(`Validating the '${premiseString}' premise...`, node);
 
     if (false) {
       ///
     } else if (this.statement !== null) {
       const stated = true,
             assignments = [],
-            statementVerifies = this.statement.verify(assignments, stated, context);
+            statementValidates = this.statement.validate(assignments, stated, context);
 
-      if (statementVerifies) {
+      if (statementValidates) {
         const assignmentsAssigned = assignAssignments(assignments, context);
 
         if (assignmentsAssigned) {
@@ -53,7 +54,7 @@ export default define(class Premise extends Element {
 
           context.addStepOrSubproof(stepOrSubproof);
 
-          verifies = true;
+          validates = true;
         }
       }
     } else if (this.procedureCall !== null) {
@@ -62,29 +63,29 @@ export default define(class Premise extends Element {
             procedureCallVerifies = this.procedureCall.verify(assignments, stated, context);
 
       if (procedureCallVerifies) {
-        verifies = true;
+        validates = true;
       }
     } else {
-      context.debug(`Unable to verify the '${premiseString}' premise because it is nonsense.`, this.node);
+      context.debug(`Unable to validate the '${premiseString}' premise because it is nonsense.`, node);
     }
 
-    if (verifies) {
-      this.context = context;
+    if (validates) {
+      this.setContext(context);
 
-      context.debug(`...verified the '${premiseString}' premise.`, this.node);
+      context.debug(`...validated the '${premiseString}' premise.`, node);
     }
 
-    return verifies;
+    return validates;
   }
 
   unifyIndependently(substitutions, context) {
     let unifiesIndependently = false;
 
-    const premiseString = this.string,  ///
+    const premiseString = this.getString(),  ///
           generalContext = this.context,  ///
           specificContext = context;  ///
 
-    context.trace(`Unifying the '${premiseString}' premise independently...`, this.node);
+    context.trace(`Unifying the '${premiseString}' premise independently...`, node);
 
     if (this.statement !== null) {
       const statementUnifiesIndependently = this.statement.unifyIndependently(substitutions, generalContext, specificContext);
@@ -103,7 +104,7 @@ export default define(class Premise extends Element {
     }
 
     if (unifiesIndependently) {
-      context.debug(`...unified the '${premiseString}' premise independenly.`, this.node);
+      context.debug(`...unified the '${premiseString}' premise independenly.`, node);
     }
 
     return unifiesIndependently;

package/src/element/rule.js

@@ -17,13 +17,13 @@ import { labelsFromJSON,
 const { reverse, extract, backwardsEvery } = arrayUtilities;
 
 export default define(class Rule extends Element {
-  constructor(context, string, node, labels, premises, conclusion, proof) {
+  constructor(context, string, node, proof, labels, premises, conclusion) {
     super(context, string, node);
 
+    this.proof = proof;
     this.labels = labels;
     this.premises = premises;
     this.conclusion = conclusion;
-    this.proof = proof;
   }
 
   getLabels() {
@@ -34,14 +34,14 @@ export default define(class Rule extends Element {
     return this.premises;
   }
 
-  getConclusion() {
-    return this.conclusion;
-  }
-
   getProof() {
     return this.proof;
   }
 
+  getConclusion() {
+    return this.conclusion;
+  }
+
   matchMetavariableName(metavariableName) {
     const metavariableNameMatches = this.labels.some((label) => {
       const metavariableNameMatches = label.matchMetavariableName(metavariableName);
@@ -57,18 +57,26 @@ export default define(class Rule extends Element {
   verify() {
     let verifies = false;
 
-    const ruleString = this.string; ///
+    let context;
+
+    const node = this.getNode();
+
+    context = this.getContext();
 
-    this.context.trace(`Verifying the '${ruleString}' rule...`, this.node);
+    const ruleString = this.getString(); ///
+
+    context.trace(`Verifying the '${ruleString}' rule...`, node);
 
     const labelsVerify = this.verifyLabels();
 
     if (labelsVerify) {
-      const localContext = LocalContext.fromNothing(this.context),
-            context = localContext, ///
-            premisesVerify = this.verifyPremises(context);
+      const localContext = LocalContext.fromNothing(context);
+
+      context = localContext; ///
+
+      const premisesValidate = this.validatePremises(context);
 
-      if (premisesVerify) {
+      if (premisesValidate) {
         const conclusionVerifies = this.verifyConclusion(context);
 
         if (conclusionVerifies) {
@@ -77,7 +85,7 @@ export default define(class Rule extends Element {
           if (proofVerifies) {
             const rule = this;  ///
 
-            this.context.addRule(rule);
+            context.addRule(rule);
 
             verifies = true;
           }
@@ -86,7 +94,7 @@ export default define(class Rule extends Element {
     }
 
     if (verifies) {
-      this.context.debug(`...verified the '${ruleString}' rule.`, this.node);
+      context.debug(`...verified the '${ruleString}' rule.`, node);
     }
 
     return verifies;
@@ -105,22 +113,22 @@ export default define(class Rule extends Element {
     return labelsVerify;
   }
 
-  verifyPremises(context) {
-    const premisesVerify = this.premises.every((premise) => {
-      const premiseVerifies = this.verifyPremise(premise, context);
+  validatePremises(context) {
+    const premisesValidate = this.premises.every((premise) => {
+      const premiseValidates = this.validatePremise(premise, context);
 
-      if (premiseVerifies) {
+      if (premiseValidates) {
         return true;
       }
     });
 
-    return premisesVerify;
+    return premisesValidate;
   }
 
-  verifyPremise(premise, context) {
-    const premiseVerifies = premise.verify(context);
+  validatePremise(premise, context) {
+    const premiseValidates = premise.validate(context);
 
-    return premiseVerifies;
+    return premiseValidates;
   }
 
   verifyConclusion(context) {
@@ -252,57 +260,4 @@ export default define(class Rule extends Element {
 
     return rule;
   }
-
-  static fromRuleNode(ruleNode, context) {
-    const node = ruleNode,  ///
-          proof = proofFromRuleNode(ruleNode, context),
-          labels = labelsFromRuleNode(ruleNode, context),
-          premises = premisesFromRuleNode(ruleNode, context),
-          conclusion = conclusionFromRuleNode(ruleNode, context),
-          string = stringFromLabelsPremisesAndConclusion(labels, premises, conclusion),
-          rule = new Rule(context, string, node, labels, premises, conclusion, proof);
-
-    return rule;
-  }
 });
-
-function proofFromRuleNode(ruleNode, context) {
-  const { Proof } = elements,
-        proofNode = ruleNode.getProofNode(),
-        proof = Proof.fromProofNode(proofNode, context);
-
-  return proof;
-}
-
-function labelsFromRuleNode(ruleNode, context) {
-  const { Label } = elements,
-        labelNodes = ruleNode.getLabelNodes(),
-        labels = labelNodes.map((labelNode) => {
-          const label = Label.fromLabelNode(labelNode, context);
-
-          return label;
-        });
-
-  return labels;
-}
-
-function premisesFromRuleNode(ruleNode, context) {
-  const { Premise } = elements,
-        premiseNodes = ruleNode.getPremiseNodes(),
-        premises = premiseNodes.map((premiseNode) => {
-          const premise = Premise.fromPremiseNode(premiseNode, context);
-
-          return premise;
-        });
-
-  return premises;
-}
-
-function conclusionFromRuleNode(ruleNode, context) {
-  const { Conclusion } = elements,
-        conclusionNode = ruleNode.getConclusionNode(),
-        conclusion = Conclusion.fromConclusionNode(conclusionNode, context);
-
-  return conclusion;
-}
-