occam-verify-cli 0.0.958 → 0.0.960

package/lib/verify/term.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "default", {
 var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _term = /*#__PURE__*/ _interop_require_default(require("../term"));
 var _bracketed = /*#__PURE__*/ _interop_require_default(require("../constructor/bracketed"));
-var _termAgainstConstructor = /*#__PURE__*/ _interop_require_default(require("../unifier/termAgainstConstructor"));
+var _termWithConstructor = /*#__PURE__*/ _interop_require_default(require("../unifier/termWithConstructor"));
 var _query = require("../utilities/query");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -25,8 +25,8 @@ function verifyTerm(termNode, terms, localContext, verifyAhead) {
     localContext.trace("Verifying the '".concat(termString, "' term..."), termNode);
     var verifyTermFunctions = [
         verifyTermAsVariable,
-        unifyTermAgainstConstructors,
-        unifyTermAgainstBracketedConstructor
+        unifyTermWithConstructors,
+        unifyTermWithBracketedConstructor
     ];
     termVerified = verifyTermFunctions.some(function(verifyTermFunction) {
         var termVerified = verifyTermFunction(termNode, terms, localContext, verifyAhead);
@@ -64,25 +64,25 @@ function verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {
     }
     return termVerifiedAsVariable;
 }
-function unifyTermAgainstConstructors(termNode, terms, localContext, verifyAhead) {
-    var termUnifiedAgainstConstructors = false;
+function unifyTermWithConstructors(termNode, terms, localContext, verifyAhead) {
+    var termUnifiedWithConstructors = false;
     var variableNode = variableNodeQuery(termNode);
     if (variableNode === null) {
         var constructors = localContext.getConstructors();
-        termUnifiedAgainstConstructors = constructors.some(function(constructor) {
-            var termUnifiedAgainstConstructor = unifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead);
-            if (termUnifiedAgainstConstructor) {
+        termUnifiedWithConstructors = constructors.some(function(constructor) {
+            var termUnifiedWithConstructor = unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead);
+            if (termUnifiedWithConstructor) {
                 return true;
             }
         });
     }
-    return termUnifiedAgainstConstructors;
+    return termUnifiedWithConstructors;
 }
-function unifyTermAgainstBracketedConstructor(termNode, terms, localContext, verifyAhead) {
-    var termUnifiedAgainstBracketedConstructor;
+function unifyTermWithBracketedConstructor(termNode, terms, localContext, verifyAhead) {
+    var termUnifiedWithBracketedConstructor;
     var termString = localContext.nodeAsString(termNode), bracketedTerms = [];
-    localContext.trace("Unifying the '".concat(termString, "' term against the bracketed constructor..."), termNode);
-    termUnifiedAgainstBracketedConstructor = unifyTermAgainstConstructor(termNode, bracketedTerms, _bracketed.default, localContext, function() {
+    localContext.trace("Unifying the '".concat(termString, "' term with the bracketed constructor..."), termNode);
+    termUnifiedWithBracketedConstructor = unifyTermWithConstructor(termNode, bracketedTerms, _bracketed.default, localContext, function() {
         var verifiedAhead;
         var bracketedTermNode = termNode; ///
         termNode = termNodeQuery(bracketedTermNode); ///
@@ -90,28 +90,28 @@ function unifyTermAgainstBracketedConstructor(termNode, terms, localContext, ver
         verifiedAhead = termVVerified; ///
         return verifiedAhead;
     });
-    if (termUnifiedAgainstBracketedConstructor) {
-        localContext.debug("...unified the '".concat(termString, "' term against the bracketed constructor."), termNode);
+    if (termUnifiedWithBracketedConstructor) {
+        localContext.debug("...unified the '".concat(termString, "' term with the bracketed constructor."), termNode);
     }
-    return termUnifiedAgainstBracketedConstructor;
+    return termUnifiedWithBracketedConstructor;
 }
-function unifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead) {
-    var termUnifiedAgainstConstructor = false;
+function unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead) {
+    var termUnifiedWithConstructor = false;
     var termString = localContext.nodeAsString(termNode), constructorString = constructor.getString(), constructorTermNode = constructor.getTermNode();
-    localContext.trace("Unifying the '".concat(termString, "' term against the '").concat(constructorString, "' constructor..."), termNode);
-    var termNodeA = termNode, constructorTermNodeB = constructorTermNode, unified = _termAgainstConstructor.default.unify(termNodeA, constructorTermNodeB, localContext);
+    localContext.trace("Unifying the '".concat(termString, "' term with the '").concat(constructorString, "' constructor..."), termNode);
+    var termNodeA = termNode, constructorTermNodeB = constructorTermNode, unified = _termWithConstructor.default.unify(termNodeA, constructorTermNodeB, localContext);
     if (unified) {
         var verifiedAhead;
         var type = constructor.getType(), term = _term.default.fromTermNodeAndType(termNode, type);
         terms.push(term);
         verifiedAhead = verifyAhead();
         terms.pop();
-        termUnifiedAgainstConstructor = verifiedAhead; ///
+        termUnifiedWithConstructor = verifiedAhead; ///
     }
-    if (termUnifiedAgainstConstructor) {
-        localContext.debug("...unified the '".concat(termString, "' term against the '").concat(constructorString, "' constructor."), termNode);
+    if (termUnifiedWithConstructor) {
+        localContext.debug("...unified the '".concat(termString, "' term with the '").concat(constructorString, "' constructor."), termNode);
     }
-    return termUnifiedAgainstConstructor;
+    return termUnifiedWithConstructor;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Term from \"../term\";\nimport bracketedConstructor from \"../constructor/bracketed\";\nimport termAgainstConstructorUnifier from \"../unifier/termAgainstConstructor\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/term/argument/term\"),\n      variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, terms, localContext, verifyAhead) {\n  let termVerified;\n\n  const termString = localContext.nodeAsString(termNode);\n\n  localContext.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsVariable,\n    unifyTermAgainstConstructors,\n    unifyTermAgainstBracketedConstructor\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, terms, localContext, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    localContext.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(shim, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nfunction verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = localContext.nodeAsString(termNode);\n\n    localContext.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variable = localContext.findVariableByVariableNode(variableNode);\n\n    if (variable !== null) {\n      let verifiedAhead;\n\n      const type = variable.getType(),\n            term = Term.fromTermNodeAndType(termNode, type);\n\n      terms.push(term);\n\n      verifiedAhead = verifyAhead();\n\n      terms.pop();\n\n      termVerifiedAsVariable = verifiedAhead; ///\n    }\n\n    if (termVerifiedAsVariable) {\n      localContext.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction unifyTermAgainstConstructors(termNode, terms, localContext, verifyAhead) {\n  let termUnifiedAgainstConstructors = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode === null) {\n    const constructors = localContext.getConstructors();\n\n    termUnifiedAgainstConstructors = constructors.some((constructor) => {\n      const termUnifiedAgainstConstructor = unifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead);\n\n      if (termUnifiedAgainstConstructor) {\n        return true;\n      }\n    });\n  }\n\n  return termUnifiedAgainstConstructors;\n}\n\nfunction unifyTermAgainstBracketedConstructor(termNode, terms, localContext, verifyAhead) {\n  let termUnifiedAgainstBracketedConstructor;\n\n  const termString = localContext.nodeAsString(termNode),\n        bracketedTerms = [];\n\n  localContext.trace(`Unifying the '${termString}' term against the bracketed constructor...`, termNode);\n\n  termUnifiedAgainstBracketedConstructor = unifyTermAgainstConstructor(termNode, bracketedTerms, bracketedConstructor, localContext, () => {\n    let verifiedAhead;\n\n    const bracketedTermNode = termNode; ///\n\n    termNode = termNodeQuery(bracketedTermNode); ///\n\n    const termVVerified = verifyTerm(termNode, terms, localContext, verifyAhead);\n\n    verifiedAhead = termVVerified;  ///\n\n    return verifiedAhead;\n  });\n\n  if (termUnifiedAgainstBracketedConstructor) {\n    localContext.debug(`...unified the '${termString}' term against the bracketed constructor.`, termNode);\n  }\n\n  return termUnifiedAgainstBracketedConstructor;\n}\n\nfunction unifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead) {\n  let termUnifiedAgainstConstructor = false;\n\n  const termString = localContext.nodeAsString(termNode),\n        constructorString = constructor.getString(),\n        constructorTermNode = constructor.getTermNode();\n\n  localContext.trace(`Unifying the '${termString}' term against the '${constructorString}' constructor...`, termNode);\n\n  const termNodeA = termNode,  ///\n        constructorTermNodeB = constructorTermNode,  ///\n        unified = termAgainstConstructorUnifier.unify(termNodeA, constructorTermNodeB, localContext);\n\n  if (unified) {\n    let verifiedAhead;\n\n    const type = constructor.getType(),\n          term = Term.fromTermNodeAndType(termNode, type);\n\n    terms.push(term);\n\n    verifiedAhead = verifyAhead();\n\n    terms.pop();\n\n    termUnifiedAgainstConstructor = verifiedAhead;  ///\n  }\n\n  if (termUnifiedAgainstConstructor) {\n    localContext.debug(`...unified the '${termString}' term against the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termUnifiedAgainstConstructor;\n}\n\n"],"names":["termNodeQuery","nodeQuery","variableNodeQuery","verifyTerm","termNode","terms","localContext","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsVariable","unifyTermAgainstConstructors","unifyTermAgainstBracketedConstructor","some","verifyTermFunction","debug","Object","assign","shim","termVerifiedAsVariable","variableNode","variable","findVariableByVariableNode","verifiedAhead","type","getType","term","Term","fromTermNodeAndType","push","pop","termUnifiedAgainstConstructors","constructors","getConstructors","constructor","termUnifiedAgainstConstructor","unifyTermAgainstConstructor","termUnifiedAgainstBracketedConstructor","bracketedTerms","bracketedConstructor","bracketedTermNode","termVVerified","constructorString","getString","constructorTermNode","getTermNode","termNodeA","constructorTermNodeB","unified","termAgainstConstructorUnifier","unify"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Term from \"../term\";\nimport bracketedConstructor from \"../constructor/bracketed\";\nimport termWithConstructorUnifier from \"../unifier/termWithConstructor\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/term/argument/term\"),\n      variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, terms, localContext, verifyAhead) {\n  let termVerified;\n\n  const termString = localContext.nodeAsString(termNode);\n\n  localContext.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsVariable,\n    unifyTermWithConstructors,\n    unifyTermWithBracketedConstructor\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, terms, localContext, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    localContext.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(shim, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nfunction verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = localContext.nodeAsString(termNode);\n\n    localContext.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variable = localContext.findVariableByVariableNode(variableNode);\n\n    if (variable !== null) {\n      let verifiedAhead;\n\n      const type = variable.getType(),\n            term = Term.fromTermNodeAndType(termNode, type);\n\n      terms.push(term);\n\n      verifiedAhead = verifyAhead();\n\n      terms.pop();\n\n      termVerifiedAsVariable = verifiedAhead; ///\n    }\n\n    if (termVerifiedAsVariable) {\n      localContext.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction unifyTermWithConstructors(termNode, terms, localContext, verifyAhead) {\n  let termUnifiedWithConstructors = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode === null) {\n    const constructors = localContext.getConstructors();\n\n    termUnifiedWithConstructors = constructors.some((constructor) => {\n      const termUnifiedWithConstructor = unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead);\n\n      if (termUnifiedWithConstructor) {\n        return true;\n      }\n    });\n  }\n\n  return termUnifiedWithConstructors;\n}\n\nfunction unifyTermWithBracketedConstructor(termNode, terms, localContext, verifyAhead) {\n  let termUnifiedWithBracketedConstructor;\n\n  const termString = localContext.nodeAsString(termNode),\n        bracketedTerms = [];\n\n  localContext.trace(`Unifying the '${termString}' term with the bracketed constructor...`, termNode);\n\n  termUnifiedWithBracketedConstructor = unifyTermWithConstructor(termNode, bracketedTerms, bracketedConstructor, localContext, () => {\n    let verifiedAhead;\n\n    const bracketedTermNode = termNode; ///\n\n    termNode = termNodeQuery(bracketedTermNode); ///\n\n    const termVVerified = verifyTerm(termNode, terms, localContext, verifyAhead);\n\n    verifiedAhead = termVVerified;  ///\n\n    return verifiedAhead;\n  });\n\n  if (termUnifiedWithBracketedConstructor) {\n    localContext.debug(`...unified the '${termString}' term with the bracketed constructor.`, termNode);\n  }\n\n  return termUnifiedWithBracketedConstructor;\n}\n\nfunction unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead) {\n  let termUnifiedWithConstructor = false;\n\n  const termString = localContext.nodeAsString(termNode),\n        constructorString = constructor.getString(),\n        constructorTermNode = constructor.getTermNode();\n\n  localContext.trace(`Unifying the '${termString}' term with the '${constructorString}' constructor...`, termNode);\n\n  const termNodeA = termNode,  ///\n        constructorTermNodeB = constructorTermNode,  ///\n        unified = termWithConstructorUnifier.unify(termNodeA, constructorTermNodeB, localContext);\n\n  if (unified) {\n    let verifiedAhead;\n\n    const type = constructor.getType(),\n          term = Term.fromTermNodeAndType(termNode, type);\n\n    terms.push(term);\n\n    verifiedAhead = verifyAhead();\n\n    terms.pop();\n\n    termUnifiedWithConstructor = verifiedAhead;  ///\n  }\n\n  if (termUnifiedWithConstructor) {\n    localContext.debug(`...unified the '${termString}' term with the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termUnifiedWithConstructor;\n}\n\n"],"names":["termNodeQuery","nodeQuery","variableNodeQuery","verifyTerm","termNode","terms","localContext","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsVariable","unifyTermWithConstructors","unifyTermWithBracketedConstructor","some","verifyTermFunction","debug","Object","assign","shim","termVerifiedAsVariable","variableNode","variable","findVariableByVariableNode","verifiedAhead","type","getType","term","Term","fromTermNodeAndType","push","pop","termUnifiedWithConstructors","constructors","getConstructors","constructor","termUnifiedWithConstructor","unifyTermWithConstructor","termUnifiedWithBracketedConstructor","bracketedTerms","bracketedConstructor","bracketedTermNode","termVVerified","constructorString","getString","constructorTermNode","getTermNode","termNodeA","constructorTermNodeB","unified","termWithConstructorUnifier","unify"],"mappings":"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"}

package/package.json

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

package/src/axiom.js

@@ -3,7 +3,5 @@
 import TopLevelAssertion from "./topLevelAssertion";
 
 export default class Axiom extends TopLevelAssertion {
-  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Axiom, json, fileContext); }
-
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Axiom, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/combinator.js

@@ -1,8 +1,6 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { statementNodeFromUnqualifiedStatementTokens } from "./utilities/node";
-import { unqualifiedStatementTokensFromStatementString } from "./utilities/tokens";
 
 export default class Combinator {
   constructor(statementNode, string) {
@@ -18,36 +16,12 @@ export default class Combinator {
     return this.string;
   }
 
-  toJSON(tokens) {
-    const statementString = nodeAsString(this.statementNode, tokens),
-          statement = statementString,  ///
-          json = {
-            statement
-          };
-
-    return json;
-  }
-
   static fromStatementNodeAndTokens(statementNode, tokens) {
     const string = stringFromStatementNodeAndTokens(statementNode, tokens),
           combinator = new Combinator(statementNode, string);
 
     return combinator;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const { statement } = json,
-          statementString = statement,  ///
-          lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          unqualifiedStatementTokens = unqualifiedStatementTokensFromStatementString(statementString, lexer),
-          statementNode = statementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser),
-          tokens = unqualifiedStatementTokens,  //
-          string = stringFromStatementNodeAndTokens(statementNode, tokens),
-          combinator = new Combinator(statementNode, string);
-
-    return combinator;
-  }
 }
 
 function stringFromStatementNodeAndTokens(statementNode, tokens) {

package/src/conclusion.js

@@ -2,9 +2,6 @@
 
 import metaLevelUnifier from "./unifier/metaLevel";
 
-import { nodeAsString } from "./utilities/string";
-import { statementNodeFromStatementString } from "./utilities/node";
-
 export default class Conclusion {
   constructor(statementNode) {
     this.statementNode = statementNode;
@@ -28,30 +25,9 @@ export default class Conclusion {
     return statementUnified;
   }
 
-  toJSON(tokens) {
-    const statementString = nodeAsString(this.statementNode, tokens),
-          statement = statementString,  ///
-          json = {
-            statement
-          };
-
-    return json;
-  }
-
   static fromStatementNode(statementNode) {
     const conclusion = new Conclusion(statementNode);
 
     return conclusion;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const { statement } = json,
-          statementString = statement,  ///
-          lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
-          conclusion = new Conclusion(statementNode);
-
-    return conclusion;
-  }
 }

package/src/conjecture.js

@@ -3,7 +3,5 @@
 import TopLevelAssertion from "./topLevelAssertion";
 
 export default class Conjecture extends TopLevelAssertion {
-  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Conjecture, json, fileContext); }
-
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Conjecture, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/consequent.js

@@ -2,9 +2,6 @@
 
 import metaLevelUnifier from "./unifier/metaLevel";
 
-import { nodeAsString } from "./utilities/string";
-import { statementNodeFromStatementString } from "./utilities/node";
-
 export default class Consequent {
   constructor(statementNode) {
     this.statementNode = statementNode;
@@ -28,30 +25,9 @@ export default class Consequent {
     return statementUnified;
   }
 
-  toJSON(tokens) {
-    const statementString = nodeAsString(this.statementNode, tokens),
-          statement = statementString,  ///
-          json = {
-            statement
-          };
-
-    return json;
-  }
-
   static fromStatementNode(statementNode) {
     const consequent = new Consequent(statementNode);
 
     return consequent;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const { statement } = json,
-          statementString = statement,  ///
-          lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
-          consequent = new Consequent(statementNode);
-
-    return consequent;
-  }
 }

package/src/constructor.js

@@ -1,9 +1,6 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { typeFromJSONAndFileContext } from "./type";
-import { termNodeFromConstructorDeclarationTokens } from "./utilities/node";
-import { constructorDeclarationTokensFromTermString } from "./utilities/tokens";
 
 export default class Constructor {
   constructor(termNode, string, type) {
@@ -24,52 +21,12 @@ export default class Constructor {
     return this.type;
   }
 
-  toJSON(tokens) {
-    const termString = nodeAsString(this.termNode, tokens),
-          typeJSON = (this.type === null) ?
-                        null :
-                          this.type.toJSON(tokens),
-          term = termString,  ///
-          type = typeJSON,  ///
-          json = {
-            term,
-            type
-          };
-
-    return json;
-  }
-
   static fromTermNodeTypeAndTokens(termNode, type, tokens) {
     const string = stringFromTermNodeTypeAndTokens(termNode, type, tokens),
           constructor = new Constructor(termNode, string, type);
 
     return constructor;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const { term } = json,
-          termString = term,  ///
-          lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          constructorDeclarationTokens = constructorDeclarationTokensFromTermString(termString, lexer),
-          termNode = termNodeFromConstructorDeclarationTokens(constructorDeclarationTokens, parser);
-
-    let { type } = json;
-
-    if (type !== null) {
-      const typeJSON = type;  ///
-
-      json = typeJSON;  ///
-
-      type = typeFromJSONAndFileContext(json, fileContext);
-    }
-
-    const tokens = constructorDeclarationTokens,  ///
-          string = stringFromTermNodeTypeAndTokens(termNode, type, tokens),
-          constructor = new Constructor(termNode, string, type);
-
-    return constructor;
-  }
 }
 
 function stringFromTermNodeTypeAndTokens(termNode, type, tokens) {

package/src/context/file.js

@@ -620,6 +620,45 @@ export default class FileContext {
 
   fatal(message, node) { this.releaseContext.fatal(message, node, this.tokens, this.filePath); }
 
+  reset() {
+    this.types = [];
+    this.rules = [];
+    this.axioms = [];
+    this.lemmas = [];
+    this.theorems = [];
+    this.variables = [];
+    this.metaLemmas = [];
+    this.conjectures = [];
+    this.combinators = [];
+    this.constructors = [];
+    this.metatheorems = [];
+    this.metavariables = [];
+  }
+
+  verify() {
+    let verified = false;
+
+    if (this.tokens === null) {
+      const lexer = this.getLexer(),
+            parser = this.getParser(),
+            content = this.fileContent; ///
+
+      this.tokens = lexer.tokenise(content);
+
+      this.node = parser.parse(this.tokens);
+    }
+
+    if (this.node !== null) {
+      this.reset();
+
+      const fileContext = this; ///
+
+      verified = topLevelVerifier.verify(this.node, fileContext);
+    }
+
+    return verified;
+  }
+
   toJSON() {
     const filePath =  this.filePath,
           fileContent = this.fileContent,
@@ -631,23 +670,9 @@ export default class FileContext {
     return json;
   }
 
-  verify() {
-    const lexer = this.getLexer(),
-          parser = this.getParser(),
-          content = this.fileContent,  ///
-          fileContext = this;
-
-    this.tokens = lexer.tokenise(content);
-
-    this.node = parser.parse(this.tokens);
-
-    const verified = topLevelVerifier.verify(this.node, fileContext);
-
-    return verified;
-  }
-
-  static fromJSONAndReleaseContext(json, releaseContext) {
-    const { fileContent, filePath } = json,
+  static fromFileAndReleaseContext(file, releaseContext) {
+    const fileContent = file.getContent(),
+          filePath = file.getPath(),
           tokens = null,
           node = null,
           types = [],

package/src/context/local.js

@@ -451,28 +451,6 @@ class LocalContext {
 
     return localContext;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    let { variables } = json;
-
-    const variablesJSON = variables;
-
-    variables = variablesJSON.map((variableJSON) => {
-      const json = variableJSON,  ///
-            variable = Variable.fromJSONAndFileContext(json, fileContext);
-
-      return variable;
-    });
-
-    const context = fileContext,  ///
-          proofSteps = [],
-          equivalences = [],
-          judgements = [],
-          metavariables = [],
-          localContext = new LocalContext(context, variables, proofSteps, judgements, equivalences, metavariables);  ///
-
-    return localContext;
-  }
 }
 
 export default LocalContext;