occam-verify-cli 0.0.1035 → 0.0.1037

package/lib/verify/assertion/subproof.js

@@ -2,12 +2,6 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifySubproofAssertion;
-    }
-});
 var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../../verifier/metaLevel"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -18,47 +12,5 @@ var verifySubproofAssertionFunctions = [
     verifyDerivedSubproofAssertion,
     verifyStatedSubproofAssertion
 ];
-function verifySubproofAssertion(subproofAssertionNode, assignments, stated, localContext) {
-    var subproofAssertionVerified = false;
-    var subproofAssertionString = localContext.nodeAsString(subproofAssertionNode);
-    assignments = null; ///
-    stated = true; ///
-    localContext.trace("Verifying the '".concat(subproofAssertionString, "' subproof assertion..."), subproofAssertionNode);
-    var verified = _metaLevel.default.verify(subproofAssertionNode, assignments, stated, localContext);
-    if (verified) {
-        subproofAssertionVerified = verifySubproofAssertionFunctions.some(function(verifySubproofAssertionFunction) {
-            var subproofAssertionVerified = verifySubproofAssertionFunction(subproofAssertionNode, assignments, stated, localContext);
-            if (subproofAssertionVerified) {
-                return true;
-            }
-        });
-    }
-    if (subproofAssertionVerified) {
-        localContext.debug("...verified the '".concat(subproofAssertionString, "' subproof assertion."), subproofAssertionNode);
-    }
-    return subproofAssertionVerified;
-}
-function verifyDerivedSubproofAssertion(subproofAssertionNode, assignments, stated, localContext) {
-    var derivedSubproofAssertionVerified;
-    if (!stated) {
-        var subproofAssertionString = localContext.nodeAsString(subproofAssertionNode);
-        localContext.trace("Verifying the '".concat(subproofAssertionString, "' derived subproof assertion..."), subproofAssertionNode);
-        derivedSubproofAssertionVerified = false;
-        localContext.debug("The '".concat(subproofAssertionString, "' derived subproof assertion cannot be verified."), subproofAssertionNode);
-    }
-    return derivedSubproofAssertionVerified;
-}
-function verifyStatedSubproofAssertion(subproofAssertionNode, assignments, stated, localContext) {
-    var statedSubproofAssertionVerified;
-    if (stated) {
-        var subproofAssertionString = localContext.nodeAsString(subproofAssertionNode);
-        localContext.trace("Verifying the '".concat(subproofAssertionString, "' stated subproof assertion..."), subproofAssertionNode);
-        statedSubproofAssertionVerified = true;
-        if (statedSubproofAssertionVerified) {
-            localContext.debug("...verified the '".concat(subproofAssertionString, "' stated subproof assertion."), subproofAssertionNode);
-        }
-    }
-    return statedSubproofAssertionVerified;
-}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvYXNzZXJ0aW9uL3N1YnByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWV0YUxldmVsVmVyaWZpZXIgZnJvbSBcIi4uLy4uL3ZlcmlmaWVyL21ldGFMZXZlbFwiO1xuXG5jb25zdCB2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbkZ1bmN0aW9ucyA9IFtcbiAgdmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uLFxuICB2ZXJpZnlTdGF0ZWRTdWJwcm9vZkFzc2VydGlvblxuXTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5U3VicHJvb2ZBc3NlcnRpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IHN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBzdWJwcm9vZkFzc2VydGlvblN0cmluZyA9IGxvY2FsQ29udGV4dC5ub2RlQXNTdHJpbmcoc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcblxuICBhc3NpZ25tZW50cyA9IG51bGw7IC8vL1xuXG4gIHN0YXRlZCA9IHRydWU7ICAvLy9cblxuICBsb2NhbENvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBzdWJwcm9vZiBhc3NlcnRpb24uLi5gLCBzdWJwcm9vZkFzc2VydGlvbk5vZGUpO1xuXG4gIGNvbnN0IHZlcmlmaWVkID0gbWV0YUxldmVsVmVyaWZpZXIudmVyaWZ5KHN1YnByb29mQXNzZXJ0aW9uTm9kZSwgYXNzaWdubWVudHMsIHN0YXRlZCwgbG9jYWxDb250ZXh0KTtcblxuICBpZiAodmVyaWZpZWQpIHtcbiAgICBzdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkID0gdmVyaWZ5U3VicHJvb2ZBc3NlcnRpb25GdW5jdGlvbnMuc29tZSgodmVyaWZ5U3VicHJvb2ZBc3NlcnRpb25GdW5jdGlvbikgPT4ge1xuICAgICAgY29uc3Qgc3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCA9IHZlcmlmeVN1YnByb29mQXNzZXJ0aW9uRnVuY3Rpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICBpZiAoc3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCkge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cbiAgICB9KTtcbiAgfVxuXG4gIGlmIChzdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkKSB7XG4gICAgbG9jYWxDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBzdWJwcm9vZiBhc3NlcnRpb24uYCwgc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiBzdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkO1xufVxuXG5mdW5jdGlvbiB2ZXJpZnlEZXJpdmVkU3VicHJvb2ZBc3NlcnRpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IGRlcml2ZWRTdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkO1xuXG4gIGlmICghc3RhdGVkKSB7XG4gICAgY29uc3Qgc3VicHJvb2ZBc3NlcnRpb25TdHJpbmcgPSBsb2NhbENvbnRleHQubm9kZUFzU3RyaW5nKHN1YnByb29mQXNzZXJ0aW9uTm9kZSk7XG5cbiAgICBsb2NhbENvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBkZXJpdmVkIHN1YnByb29mIGFzc2VydGlvbi4uLmAsIHN1YnByb29mQXNzZXJ0aW9uTm9kZSk7XG5cbiAgICBkZXJpdmVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCA9IGZhbHNlO1xuXG4gICAgbG9jYWxDb250ZXh0LmRlYnVnKGBUaGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBkZXJpdmVkIHN1YnByb29mIGFzc2VydGlvbiBjYW5ub3QgYmUgdmVyaWZpZWQuYCwgc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiBkZXJpdmVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZDtcbn1cblxuZnVuY3Rpb24gdmVyaWZ5U3RhdGVkU3VicHJvb2ZBc3NlcnRpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IHN0YXRlZFN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQ7XG5cbiAgaWYgKHN0YXRlZCkge1xuICAgIGNvbnN0IHN1YnByb29mQXNzZXJ0aW9uU3RyaW5nID0gbG9jYWxDb250ZXh0Lm5vZGVBc1N0cmluZyhzdWJwcm9vZkFzc2VydGlvbk5vZGUpO1xuXG4gICAgbG9jYWxDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3N1YnByb29mQXNzZXJ0aW9uU3RyaW5nfScgc3RhdGVkIHN1YnByb29mIGFzc2VydGlvbi4uLmAsIHN1YnByb29mQXNzZXJ0aW9uTm9kZSk7XG5cbiAgICBzdGF0ZWRTdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkID0gdHJ1ZTtcblxuICAgIGlmIChzdGF0ZWRTdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkKSB7XG4gICAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHtzdWJwcm9vZkFzc2VydGlvblN0cmluZ30nIHN0YXRlZCBzdWJwcm9vZiBhc3NlcnRpb24uYCwgc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gc3RhdGVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbiIsInZlcmlmeVN1YnByb29mQXNzZXJ0aW9uRnVuY3Rpb25zIiwidmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uIiwidmVyaWZ5U3RhdGVkU3VicHJvb2ZBc3NlcnRpb24iLCJzdWJwcm9vZkFzc2VydGlvbk5vZGUiLCJhc3NpZ25tZW50cyIsInN0YXRlZCIsImxvY2FsQ29udGV4dCIsInN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQiLCJzdWJwcm9vZkFzc2VydGlvblN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwidmVyaWZpZWQiLCJtZXRhTGV2ZWxWZXJpZmllciIsInZlcmlmeSIsInNvbWUiLCJ2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbkZ1bmN0aW9uIiwiZGVidWciLCJkZXJpdmVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCIsInN0YXRlZFN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBd0JBOzs7Z0VBUE07Ozs7OztBQUU5QixJQUFNQyxtQ0FBbUM7SUFDdkNDO0lBQ0FDO0NBQ0Q7QUFFYyxTQUFTSCx3QkFBd0JJLHFCQUFxQixFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtJQUN0RyxJQUFJQyw0QkFBNEI7SUFFaEMsSUFBTUMsMEJBQTBCRixhQUFhRyxZQUFZLENBQUNOO0lBRTFEQyxjQUFjLE1BQU0sR0FBRztJQUV2QkMsU0FBUyxNQUFPLEdBQUc7SUFFbkJDLGFBQWFJLEtBQUssQ0FBQyxBQUFDLGtCQUF5QyxPQUF4QkYseUJBQXdCLDRCQUEwQkw7SUFFdkYsSUFBTVEsV0FBV0Msa0JBQWlCLENBQUNDLE1BQU0sQ0FBQ1YsdUJBQXVCQyxhQUFhQyxRQUFRQztJQUV0RixJQUFJSyxVQUFVO1FBQ1pKLDRCQUE0QlAsaUNBQWlDYyxJQUFJLENBQUMsU0FBQ0M7WUFDakUsSUFBTVIsNEJBQTRCUSxnQ0FBZ0NaLHVCQUF1QkMsYUFBYUMsUUFBUUM7WUFFOUcsSUFBSUMsMkJBQTJCO2dCQUM3QixPQUFPO1lBQ1Q7UUFDRjtJQUNGO0lBRUEsSUFBSUEsMkJBQTJCO1FBQzdCRCxhQUFhVSxLQUFLLENBQUMsQUFBQyxvQkFBMkMsT0FBeEJSLHlCQUF3QiwwQkFBd0JMO0lBQ3pGO0lBRUEsT0FBT0k7QUFDVDtBQUVBLFNBQVNOLCtCQUErQkUscUJBQXFCLEVBQUVDLFdBQVcsRUFBRUMsTUFBTSxFQUFFQyxZQUFZO0lBQzlGLElBQUlXO0lBRUosSUFBSSxDQUFDWixRQUFRO1FBQ1gsSUFBTUcsMEJBQTBCRixhQUFhRyxZQUFZLENBQUNOO1FBRTFERyxhQUFhSSxLQUFLLENBQUMsQUFBQyxrQkFBeUMsT0FBeEJGLHlCQUF3QixvQ0FBa0NMO1FBRS9GYyxtQ0FBbUM7UUFFbkNYLGFBQWFVLEtBQUssQ0FBQyxBQUFDLFFBQStCLE9BQXhCUix5QkFBd0IscURBQW1ETDtJQUN4RztJQUVBLE9BQU9jO0FBQ1Q7QUFFQSxTQUFTZiw4QkFBOEJDLHFCQUFxQixFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtJQUM3RixJQUFJWTtJQUVKLElBQUliLFFBQVE7UUFDVixJQUFNRywwQkFBMEJGLGFBQWFHLFlBQVksQ0FBQ047UUFFMURHLGFBQWFJLEtBQUssQ0FBQyxBQUFDLGtCQUF5QyxPQUF4QkYseUJBQXdCLG1DQUFpQ0w7UUFFOUZlLGtDQUFrQztRQUVsQyxJQUFJQSxpQ0FBaUM7WUFDbkNaLGFBQWFVLEtBQUssQ0FBQyxBQUFDLG9CQUEyQyxPQUF4QlIseUJBQXdCLGlDQUErQkw7UUFDaEc7SUFDRjtJQUVBLE9BQU9lO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvYXNzZXJ0aW9uL3N1YnByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWV0YUxldmVsVmVyaWZpZXIgZnJvbSBcIi4uLy4uL3ZlcmlmaWVyL21ldGFMZXZlbFwiO1xuXG5jb25zdCB2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbkZ1bmN0aW9ucyA9IFtcbiAgdmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uLFxuICB2ZXJpZnlTdGF0ZWRTdWJwcm9vZkFzc2VydGlvblxuXTtcblxuIl0sIm5hbWVzIjpbInZlcmlmeVN1YnByb29mQXNzZXJ0aW9uRnVuY3Rpb25zIiwidmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uIiwidmVyaWZ5U3RhdGVkU3VicHJvb2ZBc3NlcnRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7O2dFQUU4Qjs7Ozs7O0FBRTlCLElBQU1BLG1DQUFtQztJQUN2Q0M7SUFDQUM7Q0FDRCJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.1035",
+  "version": "0.0.1037",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/assertion/subproof.js

@@ -3,25 +3,20 @@
 import shim from "../shim";
 import LocalContext from "../context/local";
 import metaLevelUnifier from "../unifier/metaLevel";
+import metaLevelVerifier from "../verifier/metaLevel";
 
 import { front, last, match } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement"),
-      statementNodesQuery = nodesQuery("/subproofAssertion/statement"),
+const statementNodesQuery = nodesQuery("/subproofAssertion/statement"),
       subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion");
 
 export default class SubproofAssertion {
-  constructor(fileContext, string, statements) {
-    this.fileContext = fileContext;
+  constructor(string, statements) {
     this.string = string;
     this.statements = statements;
   }
 
-  getFileContext() {
-    return this.fileContext;
-  }
-
   getString() {
     return this.string;
   }
@@ -30,7 +25,70 @@ export default class SubproofAssertion {
     return this.statements;
   }
 
-  unifySubproof(subproof, substitutions, localContext) {
+  verify(assignments, stated, localContext) {
+    let verified;
+
+    const subproofAssertionString = this.string;  ///
+
+    localContext.trace(`Verifying the '${subproofAssertionString}' subproof assertion...`);
+
+    let verifiedWhenStated = false,
+        verifiedWhenDerived = false;
+
+    if (stated) {
+      verifiedWhenStated = this.verifyWhenStated(assignments, localContext);
+    } else {
+      verifiedWhenDerived = this.verifyWhenDerived(localContext);
+    }
+
+    if (verifiedWhenStated || verifiedWhenDerived) {
+      assignments = null; ///
+
+      stated = true;  ///
+
+      const subproofAssertionNode = this.node;  ///
+
+      verified = metaLevelVerifier.verify(subproofAssertionNode, assignments, stated, localContext);
+    }
+
+    if (verified) {
+      localContext.debug(`...verified the '${subproofAssertionString}' subproof assertion.`);
+    }
+
+    return verified;
+  }
+
+  verifyWhenStated(localContext) {
+    let verifiedWhenStated;
+
+    const subproofAssertionString = this.string;  ///
+
+    localContext.trace(`Verifying the '${subproofAssertionString}' stated subproof assertion...`);
+
+    verifiedWhenStated = true;
+
+    if (verifiedWhenStated) {
+      localContext.debug(`...verified the '${subproofAssertionString}' stated subproof assertion.`);
+    }
+
+    return verifiedWhenStated;
+  }
+
+  verifyWhenDerived(localContext) {
+    let derivedSubproofAssertionVerified;
+
+    const subproofAssertionString = this.string;  ///
+
+    localContext.trace(`Verifying the '${subproofAssertionString}' derived subproof assertion...`);
+
+    derivedSubproofAssertionVerified = false;
+
+    localContext.debug(`The '${subproofAssertionString}' derived subproof assertion cannot be verified.`);
+
+    return derivedSubproofAssertionVerified;
+  }
+
+  unifySubproof(subproof, substitutions, fileContext, localContext) {
     let subproofUnified;
 
     const subproofString = subproof.getString(),
@@ -44,7 +102,7 @@ export default class SubproofAssertion {
             subproofStatementNode = subproofStatement.getNode(),
             nodeA = statementNode,  ///
             nodeB = subproofStatementNode,  ///
-            fileContextA = this.fileContext,  ///
+            fileContextA = fileContext,  ///
             localContextA = LocalContext.fromFileContext(fileContextA),
             localContextB = localContext, ///
             unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
@@ -61,59 +119,40 @@ export default class SubproofAssertion {
     return subproofUnified;
   }
 
-  toJSON() {
-    const statementStings = this.statements.map((statement) => {
-            const statementString = statement.getString();
-
-            return statementString;
-          }),
-          statements = statementStings, ///
-          json = {
-            statements
-          };
-
-    return json;
-  }
-
-  static fromJSON(json, fileContext) {
-    let { statements } = json;
+  static fromStatement(statement, fileContext) {
+    let subproofAssertion = null;
 
-    const statementsJSON = statements;  ///
+    const statementNode = statement.getNode(),
+          subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
 
-    statements = statementsJSON.map((statementJSON) => {
-      const json = statementJSON,
-            statement = Statement.fromJSON(json, fileContext);
+    if (subproofAssertionNode !== null) {
+      const { Statement } = shim,
+            statementNodes = statementNodesQuery(subproofAssertionNode),
+            statementString = statement.getString(),
+            localContext = LocalContext.fromFileContext(fileContext),
+            statements = statementNodes.map((statementNode) => {
+              const statement = Statement.fromStatementNode(statementNode, localContext);
 
-      return statement;
-    });
+              return statement;
+            }),
+            string = statementString; ///
 
-    const string = stringFromStatements(statements),
-          subproofAssertion = new SubproofAssertion(fileContext, string, statements);
+      subproofAssertion = new SubproofAssertion(string, statements);
+    }
 
     return subproofAssertion;
   }
 
-  static fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext) {
-    let subproofAssertion = null;
-
-    if (unqualifiedStatementNode !== null) {
-      const statementNode = statementNodeQuery(unqualifiedStatementNode),
-            subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
+  static fromSubproofAssertionNode(subproofAssertionNode, localContext) {
+    const { Statement } = shim,
+          statementNodes = statementNodesQuery(subproofAssertionNode),
+          statements = statementNodes.map((statementNode) => {
+            const statement = Statement.fromStatementNode(statementNode, localContext);
 
-      if (subproofAssertionNode !== null) {
-        const { Statement } = shim,
-              localContext = LocalContext.fromFileContext(fileContext),
-              statementNodes = statementNodesQuery(subproofAssertionNode),
-              statements = statementNodes.map((statementNode) => {
-                const statement = Statement.fromStatementNode(statementNode, localContext);
-
-                return statement;
-              }),
-              string = stringFromStatements(statements);
-
-        subproofAssertion = new SubproofAssertion(fileContext, string, statements);
-      }
-    }
+            return statement;
+          }),
+          string = stringFromStatements(statements),
+          subproofAssertion = new SubproofAssertion(string, statements);
 
     return subproofAssertion;
   }
@@ -122,14 +161,14 @@ export default class SubproofAssertion {
 function stringFromStatements(statements) {
   const frontStatements = front(statements),
         lastStatement = last(statements),
-        frontStatementsString = statementsStringtatements(frontStatements),
+        frontStatementsString = statementsStringFromStatements(frontStatements),
         lastStatementString = lastStatement.getString(),
         string = `[${frontStatementsString}] ... ${lastStatementString}`;
 
   return string;
 }
 
-function statementsStringtatements(statements) {
+function statementsStringFromStatements(statements) {
   const statementsString = statements.reduce((statementsString, statement) => {
     const statementString = statement.getString();
 

package/src/assertion/type.js

@@ -84,7 +84,7 @@ export default class TypeAssertion {
 
     const typeAssertionString = this.string; ///
 
-    localContext.trace(`Verifying the stated '${typeAssertionString}' type assertion...`);
+    localContext.trace(`Verifying the '${typeAssertionString}' stated type assertion...`);
 
     const typeVerified = this.verifyType(localContext);
 
@@ -115,7 +115,7 @@ export default class TypeAssertion {
     }
 
     if (verifiedWhenStated) {
-      localContext.debug(`...verified the stated '${typeAssertionString}' type assertion.`);
+      localContext.debug(`...verified the '${typeAssertionString}' stated type assertion.`);
     }
 
     return verifiedWhenStated;
@@ -126,7 +126,7 @@ export default class TypeAssertion {
 
     const typeAssertionString = this.string; ///
 
-    localContext.trace(`Verifying the derived '${typeAssertionString}' type assertion...`);
+    localContext.trace(`Verifying the '${typeAssertionString}' derived type assertion...`);
 
     const typeVerified = this.verifyType(localContext);
 
@@ -146,7 +146,7 @@ export default class TypeAssertion {
     }
 
     if (verifiedWhenDerived) {
-      localContext.debug(`...verified the derived '${typeAssertionString}' type assertion.`);
+      localContext.debug(`...verified the '${typeAssertionString}' derived type assertion.`);
     }
 
     return verifiedWhenDerived;

package/src/context/file.js

@@ -54,7 +54,7 @@ export default class FileContext {
     return this.node;
   }
 
-  getFile(filePath) { return this.releaseContext.getFile(filePath); }
+  findFile(filePath) { return this.releaseContext.findFile(filePath); }
 
   getLexer() { return this.releaseContext.getLexer(); }
 
@@ -877,28 +877,7 @@ export default class FileContext {
     });
   }
 
-  static fromJSONAndReleaseContext(json, releaseContext) {
-    const { filePath } = json,
-          tokens = null,
-          node = null,
-          types = [],
-          rules = [],
-          axioms = [],
-          lemmas = [],
-          theorems = [],
-          variables = [],
-          metaLemmas = [],
-          conjectures = [],
-          combinators = [],
-          constructors = [],
-          metatheorems = [],
-          metavariables = [],
-          fileContext = new FileContext(releaseContext, filePath, tokens, node, types, rules, axioms, lemmas, variables, metaLemmas, theorems, conjectures, combinators, constructors, metatheorems, metavariables);
-
-    return fileContext;
-  }
-
-  static fromFileAndReleaseContext(file, releaseContext) {
+  static fromFile(file, releaseContext) {
     const lexer = releaseContext.getLexer(),
           parser = releaseContext.getParser(),
           filePath = file.getPath(),
@@ -922,29 +901,4 @@ export default class FileContext {
 
     return fileContext;
   }
-
-  static fromFilePathAndReleaseContext(filePath, releaseContext) {
-    const file = releaseContext.getFile(filePath),
-          lexer = releaseContext.getLexer(),
-          parser = releaseContext.getParser(),
-          fileContent = file.getContent(),
-          content = fileContent,  ////
-          tokens = lexer.tokenise(content),
-          node = parser.parse(tokens),
-          types = [],
-          rules = [],
-          axioms = [],
-          lemmas = [],
-          theorems = [],
-          variables = [],
-          metaLemmas = [],
-          conjectures = [],
-          combinators = [],
-          constructors = [],
-          metatheorems = [],
-          metavariables = [],
-          fileContext = new FileContext(releaseContext, filePath, tokens, node, types, rules, axioms, lemmas, variables, metaLemmas, theorems, conjectures, combinators, constructors, metatheorems, metavariables);
-
-    return fileContext;
-  }
 }

package/src/context/release.js

@@ -15,7 +15,7 @@ const { isFilePathNominalFilePath } = filePathUtilities,
       { nominalParserFromCombinedCustomGrammar } = parsersUtilities;
 
 export default class ReleaseContext {
-  constructor(log, name, json, entries, lexer, parser, verified, initialised, fileContexts, customGrammar, verifiedFileContexts, dependencyReleaseContexts) {
+  constructor(log, name, json, entries, lexer, parser, verified, initialised, fileContexts, customGrammar, dependencyReleaseContexts) {
     this.log = log;
     this.name = name;
     this.json = json;
@@ -26,7 +26,6 @@ export default class ReleaseContext {
     this.initialised = initialised;
     this.fileContexts = fileContexts;
     this.customGrammar = customGrammar;
-    this.verifiedFileContexts = verifiedFileContexts;
     this.dependencyReleaseContexts = dependencyReleaseContexts;
   }
 
@@ -70,52 +69,20 @@ export default class ReleaseContext {
     return this.customGrammar;
   }
 
-  getVerifiedFileContexts() {
-    return this.verifiedFileContexts;
-  }
-
   getDependencyReleaseContexts() {
     return this.dependencyReleaseContexts;
   }
 
-  setLog(log) {
-    this.log = log;
-  }
-
-  setName(name) {
-    this.name = name;
-  }
-
-  setEntries(entries) {
-    this.entries = entries;
-  }
-
-  setLexer(lexer) {
-    this.lexer = lexer;
-  }
-
-  setParser(parser) {
-    this.parser = parser;
-  }
-
-  setVerified(verified) {
-    this.verified = verified;
-  }
-
-  setInitialised(initialised) {
-    return this.initialised = initialised;
-  }
+  isReleased() {
+    const released = (this.json !== null);
 
-  setFileContexts(fileContexts) {
-    this.fileContexts = fileContexts;
+    return released;
   }
 
-  setCustomGrammar(customGrammar) {
-    this.customGrammar = customGrammar;
-  }
+  findFile(filePath) {
+    const file = this.entries.getFile(filePath);
 
-  setDependencyReleaseContexts(dependencyReleaseContexts) {
-    this.dependencyReleaseContexts = dependencyReleaseContexts;
+    return file;
   }
 
   findFileContext(filePath) {
@@ -130,12 +97,6 @@ export default class ReleaseContext {
     return fileContext;
   }
 
-  isReleased() {
-    const released = (this.json !== null);
-
-    return released;
-  }
-
   getLabels(includeDependencies = true) {
     const labels = [];
 
@@ -438,9 +399,11 @@ export default class ReleaseContext {
 
     this.parser = nominalParser; ///
 
+    clear(this.fileContexts);
+
     released ?
-       fileContextsFromJSONAndReleaseContext(this.json, this.fileContexts, releaseContext) :
-         fileContextsFromEntriesAndReleaseContext(this.entries, this.fileContexts, releaseContext);
+      fileContextsFromJSONAndEntries(this.json, this.entries, this.fileContexts, releaseContext) :
+        fileContextsFromEntries(this.entries, this.fileContexts, releaseContext);
 
     this.initialised = true;
   }
@@ -448,11 +411,12 @@ export default class ReleaseContext {
   verify() {
     let verified = false;
 
-    clear(this.verifiedFileContexts);
-
-    const fileContextsVerified = verifyFileContexts(this.fileContexts, this.verifiedFileContexts);
+    const verifiedFileContexts = [],
+          fileContextsVerified = verifyFileContexts(this.fileContexts, verifiedFileContexts);
 
     if (fileContextsVerified) {
+      this.fileContexts = verifiedFileContexts; ///
+
       this.verified = true;
 
       verified = true;
@@ -462,12 +426,12 @@ export default class ReleaseContext {
   }
 
   toJSON() {
-    const verifiedFileContextsJSON = this.verifiedFileContexts.map((verifiedFileContext) => {
-            const verifiedFileContextJSON = verifiedFileContext.toJSON();
+    const fileContextsJSON = this.fileContexts.map((fileContext) => {
+            const fileContextJSON = fileContext.toJSON();
 
-            return verifiedFileContextJSON;
+            return fileContextJSON;
           }),
-          json = verifiedFileContextsJSON;  ///
+          json = fileContextsJSON;  ///
 
     return json;
   }
@@ -479,20 +443,20 @@ export default class ReleaseContext {
           initialised = false,
           fileContexts = [],
           customGrammar = customGrammarFromNameAndEntries(name, entries),
-          verifiedFileContexts = [],
           dependencyReleaseContexts = null,
-          releaseContext = new ReleaseContext(log, name, json, entries, lexer, parser, verified, initialised, fileContexts, customGrammar, verifiedFileContexts, dependencyReleaseContexts);
+          releaseContext = new ReleaseContext(log, name, json, entries, lexer, parser, verified, initialised, fileContexts, customGrammar, dependencyReleaseContexts);
 
     return releaseContext;
   }
 }
 
-function fileContextsFromJSONAndReleaseContext(json, fileContexts, releaseContext) {
+function fileContextsFromJSONAndEntries(json, entries, fileContexts, releaseContext) {
   const fileContextsJSON = json;  ///
 
   fileContextsJSON.forEach((fileContextJSON) => {
-    const json = fileContextJSON,
-          fileContext = FileContext.fromJSONAndReleaseContext(json, releaseContext);
+    const { filePath } = fileContextJSON,
+          file = entries.getFile(filePath),
+          fileContext = FileContext.fromFile(file, releaseContext);
 
     fileContext.initialise(fileContextJSON);
 
@@ -500,19 +464,17 @@ function fileContextsFromJSONAndReleaseContext(json, fileContexts, releaseContex
   });
 }
 
-function fileContextsFromEntriesAndReleaseContext(entries, fileContexts, releaseContext) {
+function fileContextsFromEntries(entries, fileContexts, releaseContext) {
   entries.forEachFile((file) => {
     const filePath = file.getPath(),
           filePathNominalFilePath = isFilePathNominalFilePath(filePath);
 
     if (filePathNominalFilePath) {
-      const fileContext = FileContext.fromFileAndReleaseContext(file, releaseContext);
+      const fileContext = FileContext.fromFile(file, releaseContext);
 
       fileContexts.push(fileContext);
     }
   });
-
-  return fileContexts;
 }
 
 function verifyFileContexts(fileContexts, verifiedFileContexts) {
@@ -562,7 +524,7 @@ function verifyFileContext(fileContext) {
 
   if (tokens === null) {
     const filePath = fileContext.getFilePath(),
-          file = fileContext.getFile(filePath),
+          file = fileContext.findFile(filePath),
           lexer = fileContext.getLexer(),
           parser = fileContext.getParser(),
           content = file.getContent(),

package/src/equality.js

@@ -121,14 +121,14 @@ export default class Equality {
 
     const equalityString = this.string; ///
 
-    localContext.trace(`Verifying the stated '${equalityString}' equality...`);
+    localContext.trace(`Verifying the '${equalityString}' stated equality...`);
 
     const termsVerified = this.verifyTerms(localContext);
 
     verifiedWhenStated = termsVerified; ///
 
     if (verifiedWhenStated) {
-      localContext.debug(`...verified the stated '${equalityString}' equality.`);
+      localContext.debug(`...verified the '${equalityString}' stated equality.`);
     }
 
     return verifiedWhenStated;
@@ -139,7 +139,7 @@ export default class Equality {
 
     const equalityString = this.string; ///
 
-    localContext.trace(`Verifying the derived '${equalityString}' equality...`);
+    localContext.trace(`Verifying the '${equalityString}' derived equality...`);
 
     const termsVerified = this.verifyTerms(localContext);
 
@@ -150,7 +150,7 @@ export default class Equality {
     }
 
     if (verifiedWhenDerived) {
-      localContext.debug(`...verified the derived '${equalityString}' equality.`);
+      localContext.debug(`...verified the '${equalityString}' derived equality.`);
     }
 
     return verifiedWhenDerived;