occam-verify-cli 0.0.914 → 0.0.916

package/src/verify/ruleProofStep.js

@@ -19,7 +19,7 @@ const statementNodeQuery = nodeQuery("/qualifiedStatement|unqualifiedStatement/s
       qualifiedMetastatementNodeQuery = nodeQuery("/ruleProofStep|lastRuleProofStep/qualifiedMetastatement!"),
       unqualifiedMetastatementNodeQuery = nodeQuery("/ruleProofStep|lastRuleProofStep/unqualifiedMetastatement!");
 
-export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext) {
+export default function verifyRuleProofStep(ruleProofStepNode, localContext) {
   let ruleProofStepVerified = false;
 
   const ruleSubproofNode = ruleSubproofNodeQuery(ruleProofStepNode),
@@ -33,20 +33,19 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
   } else if (ruleSubproofNode !== null) {
     let ruleSubproofVerified;
 
-    ruleSubproofVerified = verifyRuleSubproof(ruleSubproofNode, localMetaContext);
+    ruleSubproofVerified = verifyRuleSubproof(ruleSubproofNode, localContext);
 
     if (ruleSubproofVerified) {
       const metaproofStep = MetaproofStep.fromRuleSubproofNode(ruleSubproofNode);
 
-      localMetaContext.addMetaproofStep(metaproofStep);
+      localContext.addMetaproofStep(metaproofStep);
 
       ruleProofStepVerified = true;
     }
   } else if (qualifiedStatementNode !== null) {
     let qualifiedStatementVerified;
 
-    const assignments = [],
-          localContext = localMetaContext;  ///
+    const assignments = [];
 
     qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, assignments, localContext);
 
@@ -60,7 +59,7 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
       const statementNode = statementNodeQuery(qualifiedStatementNode),
             metaproofStep = MetaproofStep.fromStatementNode(statementNode);
 
-      localMetaContext.addMetaproofStep(metaproofStep);
+      localContext.addMetaproofStep(metaproofStep);
 
       ruleProofStepVerified = true;
     }
@@ -68,8 +67,7 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
     let unqualifiedStatementVerified;
 
     const derived = true,
-          assignments = [],
-          localContext = localMetaContext;
+          assignments = [];
 
     unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, assignments, derived, localContext);
 
@@ -83,7 +81,7 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
       const statementNode = statementNodeQuery(unqualifiedStatementNode),
             metaproofStep = MetaproofStep.fromStatementNode(statementNode);
 
-      localMetaContext.addMetaproofStep(metaproofStep);
+      localContext.addMetaproofStep(metaproofStep);
 
       ruleProofStepVerified = unqualifiedStatementVerified; ///
     }
@@ -93,11 +91,10 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
     const assignments = [],
           substitutions = null;
 
-    qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, substitutions, assignments, localMetaContext);
+    qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, substitutions, assignments, localContext);
 
     if (qualifiedMetastatementVerified) {
-      const localContext = localMetaContext,  ///
-            assignmentAssigned = assignAssignment(assignments, localContext);
+      const assignmentAssigned = assignAssignment(assignments, localContext);
 
       qualifiedMetastatementVerified = assignmentAssigned; ///
     }
@@ -106,7 +103,7 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
       const metastatementNode = metastatementNodeQuery(qualifiedMetastatementNode),
             metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
 
-      localMetaContext.addMetaproofStep(metaproofStep);
+      localContext.addMetaproofStep(metaproofStep);
 
       ruleProofStepVerified = qualifiedMetastatementVerified; ///
     }
@@ -116,11 +113,10 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
     const derived = true,
           assignments = [];
 
-    unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localMetaContext);
+    unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localContext);
 
     if (unqualifiedMetastatementVerified) {
-      const localContext = localMetaContext,  ///
-            assignmentAssigned = assignAssignment(assignments, localContext);
+      const assignmentAssigned = assignAssignment(assignments, localContext);
 
       unqualifiedMetastatementVerified = assignmentAssigned; ///
     }
@@ -129,7 +125,7 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
       const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
             metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
 
-      localMetaContext.addMetaproofStep(metaproofStep);
+      localContext.addMetaproofStep(metaproofStep);
 
       ruleProofStepVerified = true;
     }

package/src/verify/ruleSubDerivation.js

@@ -4,14 +4,14 @@ import { nodesQuery } from "../utilities/query";
 
 const ruleProofStepNodesQuery = nodesQuery("/ruleSubDerivation/ruleProofStep|lastRuleProofStep");
 
-export default function verifyRuleSubDerivation(ruleSubDerivationNode, localMetaContext) {
+export default function verifyRuleSubDerivation(ruleSubDerivationNode, localContext) {
   let ruleSubDerivationVerified;
 
   const ruleProofStepNodes = ruleProofStepNodesQuery(ruleSubDerivationNode);
 
   ruleSubDerivationVerified = ruleProofStepNodes.every((ruleProofStepNode) => {
     const { verifyRuleProofStep } = verifyRuleSubDerivation,
-          ruleProofStepVerified = verifyRuleProofStep(ruleProofStepNode, localMetaContext);
+          ruleProofStepVerified = verifyRuleProofStep(ruleProofStepNode, localContext);
 
     if (ruleProofStepVerified) {
       return true;

package/src/verify/ruleSubproof.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import verifyPremises from "../verify/premises";
-import LocalMetaContext from "../context/localMeta";
+import MetaLevelLocalContext from "../context/local/metaLevel";
 import verifyRuleSubDerivation from "../verify/ruleSubDerivation";
 
 import { nodeQuery, nodesQuery } from "../utilities/query";
@@ -9,18 +9,20 @@ import { nodeQuery, nodesQuery } from "../utilities/query";
 const premiseNodesQuery = nodesQuery("/ruleSubproof/premise"),
       ruleSubDerivationNodeQuery = nodeQuery("/ruleSubproof/ruleSubDerivation");
 
-export default function verifyRuleSubproof(ruleSubproofNode, localMetaContext) {
+export default function verifyRuleSubproof(ruleSubproofNode, localContext) {
   let ruleSubproofVerified = false;
 
-  localMetaContext = LocalMetaContext.fromLocalMetaContext(localMetaContext); ///
+  const metaLevelLocalContext = MetaLevelLocalContext.fromLocalContext(localContext);
+
+  localContext = metaLevelLocalContext; ///
 
   const premises = [],
         premiseNodes = premiseNodesQuery(ruleSubproofNode),
-        premisesVerified = verifyPremises(premiseNodes, premises, localMetaContext);
+        premisesVerified = verifyPremises(premiseNodes, premises, localContext);
 
   if (premisesVerified) {
     const ruleSubDerivationNode = ruleSubDerivationNodeQuery(ruleSubproofNode),
-          ruleSubDerivationVerified = verifyRuleSubDerivation(ruleSubDerivationNode, localMetaContext);
+          ruleSubDerivationVerified = verifyRuleSubDerivation(ruleSubDerivationNode, localContext);
 
     if (ruleSubDerivationVerified) {
       ruleSubproofVerified = true;

package/src/verify/statement.js

@@ -10,7 +10,6 @@ import statementAgainstCombinatorNodesVerifier from "../verifier/nodes/statement
 import { nodeQuery } from "../utilities/query";
 
 const equalityNodeQuery = nodeQuery("/statement/equality!"),
-      statementNodeQuery = nodeQuery("/containedAssertion/statement!"),
       typeAssertionNodeQuery = nodeQuery("/statement/typeAssertion!"),
       definedAssertionNodeQuery = nodeQuery("/statement/definedAssertion!"),
       containedAssertionNodeQuery = nodeQuery("/statement/containedAssertion!");
@@ -159,28 +158,9 @@ function verifyStatementAsContainedAssertion(statementNode, assignments, derived
 
     localContext.trace(`Verifying the '${statementString}' statement as a contained assertion...`, containedAssertionNode);
 
-    const containedVerified = verifyContainedAssertion(containedAssertionNode, assignments, derived, localContext);
+    const containedAssertionVerified = verifyContainedAssertion(containedAssertionNode, assignments, derived, localContext);
 
-    if (containedVerified) {
-      statementNode = statementNodeQuery(containedAssertionNode); ///
-
-      const verifyStatementFunctions = [
-        verifyStatementAsEquality,
-        verifyStatementAgainstCombinators
-      ];
-
-      const statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {
-        const derived = false,
-              assignments = [],
-              statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);
-
-        if (statementVerified) {
-          return true;
-        }
-      });
-
-      statementVerifiedAsContainedAssertion = statementVerified; ///
-    }
+    statementVerifiedAsContainedAssertion = containedAssertionVerified; ///
 
     if (statementVerifiedAsContainedAssertion) {
       localContext.debug(`...verified the '${statementString}' statement as a contained assertion.`, containedAssertionNode);

package/src/verify/subDerivation.js

@@ -4,14 +4,14 @@ import { nodesQuery } from "../utilities/query";
 
 const proofStepNodesQuery = nodesQuery("/subDerivation/proofStep|lastProofStep");
 
-export default function verifySubDerivation(subDerivationNode, localMetaContext) {
+export default function verifySubDerivation(subDerivationNode, localContext) {
   let subDerivationVerified;
 
   const proofStepNodes = proofStepNodesQuery(subDerivationNode);
 
   subDerivationVerified = proofStepNodes.every((proofStepNode) => {
     const { verifyProofStep } = verifySubDerivation,
-          proofStepVerified = verifyProofStep(proofStepNode, localMetaContext);
+          proofStepVerified = verifyProofStep(proofStepNode, localContext);
 
     if (proofStepVerified) {
       return true;

package/src/verify/subproof.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import LocalContext from "../context/local";
 import verifySuppositions from "../verify/suppositions";
 import verifySubDerivation from "../verify/subDerivation";
+import IntrinsicLevelLocalContext from "../context/local/intrinsicLevel";
 
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
@@ -12,7 +12,9 @@ const suppositionNodesQuery = nodesQuery("/subproof/supposition"),
 export default function verifySubproof(subproofNode, localContext) {
   let subproofVerified = false;
 
-  localContext = LocalContext.fromLocalContext(localContext); ///
+  const intrinsicLevelLocalContext = IntrinsicLevelLocalContext.fromLocalContext(localContext); ///
+
+  localContext = intrinsicLevelLocalContext;  ///
 
   const suppositions = [],
         suppositionNodes = suppositionNodesQuery(subproofNode),

package/src/verify/termAsConstructor.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import Constructor from "../constructor";
-import LocalContext from "../context/local";
+import IntrinsicLevelLocalContext from "../context/local/intrinsicLevel";
 import termAsConstructorNodeVerifier from "../verifier/node/termAsConstructor";
 
 export default function verifyTermAsConstructor(termNode, typeNode, fileContext) {
@@ -11,9 +11,10 @@ export default function verifyTermAsConstructor(termNode, typeNode, fileContext)
 
   fileContext.debug(`Verifying the '${termString}' term as a constructor...`, termNode);
 
-  const nonTerminalNode = termNode, ///
+  const intrinsicLevelLocalContext = IntrinsicLevelLocalContext.fromFileContext(fileContext),
+        nonTerminalNode = termNode, ///
         childNodes = nonTerminalNode.getChildNodes(),
-        localContext = LocalContext.fromFileContext(fileContext),
+        localContext = intrinsicLevelLocalContext,  ///
         childNodesVerified = termAsConstructorNodeVerifier.verifyChildNodes(childNodes, localContext, () => {
           const verifiedAhead = true;
 

package/src/verify/theorem.js

@@ -2,10 +2,10 @@
 
 import Theorem from "../theorem";
 import verifyProof from "../verify/proof";
-import LocalContext from "../context/local";
 import verifyLabels from "../verify/labels";
 import verifyConsequent from "../verify/consequent";
 import verifySuppositions from "../verify/suppositions";
+import IntrinsicLevelLocalContext from "../context/local/intrinsicLevel";
 
 import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
@@ -19,8 +19,7 @@ export default function verifyTheorem(theoremNode, fileContext) {
   let theoremVerified = false;
 
   const labelNodes = labelNodesQuery(theoremNode),
-        labelsString = fileContext.nodesAsString(labelNodes),
-        localContext = LocalContext.fromFileContext(fileContext);
+        labelsString = fileContext.nodesAsString(labelNodes);
 
   fileContext.trace(`Verifying the '${labelsString}' theorem...`, theoremNode);
 
@@ -28,8 +27,10 @@ export default function verifyTheorem(theoremNode, fileContext) {
         labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
-    const suppositions = [],
+    const intrinsicLevelLocalContext = IntrinsicLevelLocalContext.fromFileContext(fileContext),
           suppositionNodes = suppositionsNodeQuery(theoremNode),
+          suppositions = [],
+          localContext = intrinsicLevelLocalContext,
           suppositionsVerified = verifySuppositions(suppositionNodes, suppositions, localContext);
 
     if (suppositionsVerified) {

package/lib/assignment/frameAssertion.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return FrameAssertionAssignment;
-    }
-});
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-var FrameAssertionAssignment = /*#__PURE__*/ function() {
-    function FrameAssertionAssignment(frameAssertion) {
-        _class_call_check(this, FrameAssertionAssignment);
-        this.frameAssertion = frameAssertion;
-    }
-    _create_class(FrameAssertionAssignment, [
-        {
-            key: "getFrameAssertion",
-            value: function getFrameAssertion() {
-                return this.frameAssertion;
-            }
-        },
-        {
-            key: "assign",
-            value: function assign(localMetaContext) {
-                var frameAssertionAdded = localMetaContext.addFrameAssertion(this.frameAssertion), frameAssertionNode = this.frameAssertion.getNode(), frameAssertionString = localMetaContext.nodeAsString(frameAssertionNode), frameAssertionAssigned = frameAssertionAdded; ///
-                frameAssertionAssigned ? localMetaContext.trace("Assigned the '".concat(frameAssertionString, "' frame assertion."), frameAssertionNode) : localMetaContext.debug("Unable to assign the '".concat(frameAssertionString, "' frame assertion."), frameAssertionNode);
-                return frameAssertionAssigned;
-            }
-        }
-    ], [
-        {
-            key: "fromFrameAssertion",
-            value: function fromFrameAssertion(frameAssertion) {
-                var frameAssertionAssignment = new FrameAssertionAssignment(frameAssertion);
-                return frameAssertionAssignment;
-            }
-        }
-    ]);
-    return FrameAssertionAssignment;
-}();
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hc3NpZ25tZW50L2ZyYW1lQXNzZXJ0aW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBGcmFtZUFzc2VydGlvbkFzc2lnbm1lbnQge1xuICBjb25zdHJ1Y3RvcihmcmFtZUFzc2VydGlvbikge1xuICAgIHRoaXMuZnJhbWVBc3NlcnRpb24gPSBmcmFtZUFzc2VydGlvbjtcbiAgfVxuXG4gIGdldEZyYW1lQXNzZXJ0aW9uKCkge1xuICAgIHJldHVybiB0aGlzLmZyYW1lQXNzZXJ0aW9uO1xuICB9XG5cbiAgYXNzaWduKGxvY2FsTWV0YUNvbnRleHQpIHtcbiAgICBjb25zdCBmcmFtZUFzc2VydGlvbkFkZGVkID0gbG9jYWxNZXRhQ29udGV4dC5hZGRGcmFtZUFzc2VydGlvbih0aGlzLmZyYW1lQXNzZXJ0aW9uKSxcbiAgICAgICAgICBmcmFtZUFzc2VydGlvbk5vZGUgPSB0aGlzLmZyYW1lQXNzZXJ0aW9uLmdldE5vZGUoKSxcbiAgICAgICAgICBmcmFtZUFzc2VydGlvblN0cmluZyA9IGxvY2FsTWV0YUNvbnRleHQubm9kZUFzU3RyaW5nKGZyYW1lQXNzZXJ0aW9uTm9kZSksXG4gICAgICAgICAgZnJhbWVBc3NlcnRpb25Bc3NpZ25lZCA9IGZyYW1lQXNzZXJ0aW9uQWRkZWQ7IC8vL1xuXG4gICAgZnJhbWVBc3NlcnRpb25Bc3NpZ25lZCA/XG4gICAgICBsb2NhbE1ldGFDb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7ZnJhbWVBc3NlcnRpb25TdHJpbmd9JyBmcmFtZSBhc3NlcnRpb24uYCwgZnJhbWVBc3NlcnRpb25Ob2RlKSA6XG4gICAgICAgIGxvY2FsTWV0YUNvbnRleHQuZGVidWcoYFVuYWJsZSB0byBhc3NpZ24gdGhlICcke2ZyYW1lQXNzZXJ0aW9uU3RyaW5nfScgZnJhbWUgYXNzZXJ0aW9uLmAsIGZyYW1lQXNzZXJ0aW9uTm9kZSk7XG5cbiAgICByZXR1cm4gZnJhbWVBc3NlcnRpb25Bc3NpZ25lZDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tRnJhbWVBc3NlcnRpb24oZnJhbWVBc3NlcnRpb24pIHtcbiAgICBjb25zdCBmcmFtZUFzc2VydGlvbkFzc2lnbm1lbnQgPSBuZXcgRnJhbWVBc3NlcnRpb25Bc3NpZ25tZW50KGZyYW1lQXNzZXJ0aW9uKTtcblxuICAgIHJldHVybiBmcmFtZUFzc2VydGlvbkFzc2lnbm1lbnQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJGcmFtZUFzc2VydGlvbkFzc2lnbm1lbnQiLCJmcmFtZUFzc2VydGlvbiIsImdldEZyYW1lQXNzZXJ0aW9uIiwiYXNzaWduIiwibG9jYWxNZXRhQ29udGV4dCIsImZyYW1lQXNzZXJ0aW9uQWRkZWQiLCJhZGRGcmFtZUFzc2VydGlvbiIsImZyYW1lQXNzZXJ0aW9uTm9kZSIsImdldE5vZGUiLCJmcmFtZUFzc2VydGlvblN0cmluZyIsIm5vZGVBc1N0cmluZyIsImZyYW1lQXNzZXJ0aW9uQXNzaWduZWQiLCJ0cmFjZSIsImRlYnVnIiwiZnJvbUZyYW1lQXNzZXJ0aW9uIiwiZnJhbWVBc3NlcnRpb25Bc3NpZ25tZW50Il0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQUVxQkE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBTixJQUFBLEFBQU1BLHlDQUFELEFBQUw7YUFBTUEseUJBQ1BDLGNBQWM7Z0NBRFBEO1FBRWpCLElBQUksQ0FBQ0MsY0FBYyxHQUFHQTs7a0JBRkxEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxjQUFjO1lBQzVCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9DLGdCQUFnQjtnQkFDckIsSUFBTUMsc0JBQXNCRCxpQkFBaUJFLGlCQUFpQixDQUFDLElBQUksQ0FBQ0wsY0FBYyxHQUM1RU0scUJBQXFCLElBQUksQ0FBQ04sY0FBYyxDQUFDTyxPQUFPLElBQ2hEQyx1QkFBdUJMLGlCQUFpQk0sWUFBWSxDQUFDSCxxQkFDckRJLHlCQUF5Qk4scUJBQXFCLEdBQUc7Z0JBRXZETSx5QkFDRVAsaUJBQWlCUSxLQUFLLENBQUMsQUFBQyxpQkFBcUMsT0FBckJILHNCQUFxQix1QkFBcUJGLHNCQUNoRkgsaUJBQWlCUyxLQUFLLENBQUMsQUFBQyx5QkFBNkMsT0FBckJKLHNCQUFxQix1QkFBcUJGO2dCQUU5RixPQUFPSTtZQUNUOzs7O1lBRU9HLEtBQUFBO21CQUFQLFNBQU9BLG1CQUFtQmIsY0FBYztnQkFDdEMsSUFBTWMsMkJBQTJCLElBdkJoQmYseUJBdUI2Q0M7Z0JBRTlELE9BQU9jO1lBQ1Q7OztXQTFCbUJmIn0=