occam-verify-cli 0.0.1068 → 0.0.1069

package/lib/verifier/topLevel.js

@@ -13,15 +13,15 @@ var _error = /*#__PURE__*/ _interop_require_default(require("../error"));
 var _axiom = /*#__PURE__*/ _interop_require_default(require("../axiom"));
 var _lemma = /*#__PURE__*/ _interop_require_default(require("../lemma"));
 var _theorem = /*#__PURE__*/ _interop_require_default(require("../theorem"));
+var _metaLemma = /*#__PURE__*/ _interop_require_default(require("../metaLemma"));
 var _conjecture = /*#__PURE__*/ _interop_require_default(require("../conjecture"));
+var _metatheorem = /*#__PURE__*/ _interop_require_default(require("../metatheorem"));
 var _type = /*#__PURE__*/ _interop_require_default(require("../declaration/type"));
 var _variable = /*#__PURE__*/ _interop_require_default(require("../declaration/variable"));
 var _combinator = /*#__PURE__*/ _interop_require_default(require("../declaration/combinator"));
 var _constructor = /*#__PURE__*/ _interop_require_default(require("../declaration/constructor"));
 var _metavariable = /*#__PURE__*/ _interop_require_default(require("../declaration/metavariable"));
 var _verifier = /*#__PURE__*/ _interop_require_default(require("../verifier"));
-var _metaLemma = /*#__PURE__*/ _interop_require_default(require("../verify/metaLemma"));
-var _metatheorem = /*#__PURE__*/ _interop_require_default(require("../verify/metatheorem"));
 var _query = require("../utilities/query");
 function _assert_this_initialized(self) {
     if (self === void 0) {
@@ -173,7 +173,7 @@ _define_property(TopLevelVerifier, "maps", [
     {
         nodeQuery: metaLemmaNodeQuery,
         verify: function(metaLemmaNode, fileContext) {
-            var metaLemmaVerified = (0, _metaLemma.default)(metaLemmaNode, fileContext);
+            var metaLemma = _metaLemma.default.fromMetaLemmaNode(metaLemmaNode, fileContext), metaLemmaVerified = metaLemma.verify();
             return metaLemmaVerified;
         }
     },
@@ -187,7 +187,7 @@ _define_property(TopLevelVerifier, "maps", [
     {
         nodeQuery: metatheoremNodeQuery,
         verify: function(metatheoremNode, fileContext) {
-            var metatheoremVerified = (0, _metatheorem.default)(metatheoremNode, fileContext);
+            var metatheorem = _metatheorem.default.fromMetatheoremNode(metatheoremNode, fileContext), metatheoremVerified = metatheorem.verify();
             return metatheoremVerified;
         }
     },
@@ -230,4 +230,4 @@ _define_property(TopLevelVerifier, "maps", [
 var topLevelVerifier = new TopLevelVerifier();
 var _default = topLevelVerifier;
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verifier/topLevel.js"],"sourcesContent":["\"use strict\";\n\nimport Rule from \"../rule\";\nimport Error from \"../error\";\nimport Axiom from \"../axiom\";\nimport Lemma from \"../lemma\";\nimport Theorem from \"../theorem\";\nimport Conjecture from \"../conjecture\";\nimport TypeDeclaration from \"../declaration/type\";\nimport VariableDeclaration from \"../declaration/variable\";\nimport CombinatorDeclaration from \"../declaration/combinator\";\nimport ConstructorDeclaration from \"../declaration/constructor\";\nimport MetavariableDeclaration from \"../declaration/metavariable\";\n\nimport Verifier from \"../verifier\";\nimport verifyMetaLemma from \"../verify/metaLemma\";\nimport verifyMetatheorem from \"../verify/metatheorem\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst errorNodeQuery = nodeQuery(\"/error\"),\n      ruleNodeQuery = nodeQuery(\"/rule\"),\n      axiomNodeQuery = nodeQuery(\"/axiom\"),\n      lemmaNodeQuery = nodeQuery(\"/lemma\"),\n      theoremNodeQuery = nodeQuery(\"/theorem\"),\n      metaLemmaNodeQuery = nodeQuery(\"/metaLemma\"),\n      conjectureNodeQuery = nodeQuery(\"/conjecture\"),\n      metatheoremNodeQuery = nodeQuery(\"/metatheorem\"),\n      typeDeclarationNodeQuery = nodeQuery(\"/typeDeclaration\"),\n      variableDeclarationNodeQuery = nodeQuery(\"/variableDeclaration\"),\n      combinatorDeclarationNodeQuery = nodeQuery(\"/combinatorDeclaration\"),\n      constructorDeclarationNodeQuery = nodeQuery(\"/constructorDeclaration\"),\n      metavariableDeclarationNodeQuery = nodeQuery(\"/metavariableDeclaration\");\n\nclass TopLevelVerifier extends Verifier {\n  verify(node, fileContext) {\n    let verifiedAtTopLevel;\n\n    const nonTerminalNode = node, ///\n          nonTerminalNodeVerified = this.verifyNonTerminalNode(nonTerminalNode, fileContext);\n\n    verifiedAtTopLevel = nonTerminalNodeVerified;  ///\n\n    return verifiedAtTopLevel;\n  }\n\n  static maps = [\n    {\n      nodeQuery: errorNodeQuery,\n      verify: (errorNode, fileContext) => {\n        const error = Error.fromErrorNode(errorNode, fileContext),\n              errorVerified = error.verify();\n\n        return errorVerified;\n      }\n    },\n    {\n      nodeQuery: ruleNodeQuery,\n      verify: (ruleNode, fileContext) => {\n        const rule = Rule.fromRuleNode(ruleNode, fileContext),\n              ruleVerified = rule.verify();\n\n        return ruleVerified;\n      }\n    },\n    {\n      nodeQuery: axiomNodeQuery,\n      verify: (axiomNode, fileContext) => {\n        const axiom = Axiom.fromAxiomNode(axiomNode, fileContext),\n              axiomVerified = axiom.verify();\n\n        return axiomVerified;\n      }\n    },\n    {\n      nodeQuery: lemmaNodeQuery,\n      verify: (lemmaNode, fileContext) => {\n        const lemma = Lemma.fromLemmaNode(lemmaNode, fileContext),\n              lemmaVerified = lemma.verify();\n\n        return lemmaVerified;\n      }\n    },\n    {\n      nodeQuery: theoremNodeQuery,\n      verify: (theoremNode, fileContext) => {\n        const theorem = Theorem.fromTheoremNode(theoremNode, fileContext),\n              theoremVerified = theorem.verify();\n\n        return theoremVerified;\n      }\n    },\n    {\n      nodeQuery: metaLemmaNodeQuery,\n      verify: (metaLemmaNode, fileContext) => {\n        const metaLemmaVerified = verifyMetaLemma(metaLemmaNode, fileContext);\n\n        return metaLemmaVerified;\n      }\n    },\n    {\n      nodeQuery: conjectureNodeQuery,\n      verify: (conjectureNode, fileContext) => {\n        const conjecture = Conjecture.fromConjectureNode(conjectureNode, fileContext),\n              conjectureVerified = conjecture.verify();\n\n        return conjectureVerified;\n      }\n    },\n    {\n      nodeQuery: metatheoremNodeQuery,\n      verify: (metatheoremNode, fileContext) => {\n        const metatheoremVerified = verifyMetatheorem(metatheoremNode, fileContext);\n\n        return metatheoremVerified;\n      }\n    },\n    {\n      nodeQuery: typeDeclarationNodeQuery,\n      verify: (typeDeclarationNode, fileContext) => {\n        const typeDeclaration = TypeDeclaration.fromTypeDeclarationNode(typeDeclarationNode, fileContext),\n              typeDeclarationVerified = typeDeclaration.verify();\n\n        return typeDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: variableDeclarationNodeQuery,\n      verify: (variableDeclarationNode, fileContext) => {\n        const variableDeclaration = VariableDeclaration.fromVariableDeclarationNode(variableDeclarationNode, fileContext),\n              variableDeclarationVerified = variableDeclaration.verify();\n\n        return variableDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: combinatorDeclarationNodeQuery,\n      verify: (combinatorDeclarationNode, fileContext) => {\n        const combinatorDeclaration = CombinatorDeclaration.fromCombinatorDeclarationNode(combinatorDeclarationNode, fileContext),\n              combinatorDeclarationVerified = combinatorDeclaration.verify();\n\n        return combinatorDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: constructorDeclarationNodeQuery,\n      verify: (constructorDeclarationNode, fileContext) => {\n        const constructorDeclaration = ConstructorDeclaration.fromConstructorDeclarationNode(constructorDeclarationNode, fileContext),\n              constructorDeclarationVerified = constructorDeclaration.verify();\n\n        return constructorDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: metavariableDeclarationNodeQuery,\n      verify: (metavariableDeclarationNode, fileContext) => {\n        const metavariableDeclaration = MetavariableDeclaration.fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext),\n              metavariableDeclarationVerified = metavariableDeclaration.verify();\n\n        return metavariableDeclarationVerified;\n      }\n    }\n  ];\n}\n\nconst topLevelVerifier = new TopLevelVerifier();\n\nexport default topLevelVerifier;\n"],"names":["errorNodeQuery","nodeQuery","ruleNodeQuery","axiomNodeQuery","lemmaNodeQuery","theoremNodeQuery","metaLemmaNodeQuery","conjectureNodeQuery","metatheoremNodeQuery","typeDeclarationNodeQuery","variableDeclarationNodeQuery","combinatorDeclarationNodeQuery","constructorDeclarationNodeQuery","metavariableDeclarationNodeQuery","TopLevelVerifier","verify","node","fileContext","verifiedAtTopLevel","nonTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","Verifier","maps","errorNode","error","Error","fromErrorNode","errorVerified","ruleNode","rule","Rule","fromRuleNode","ruleVerified","axiomNode","axiom","Axiom","fromAxiomNode","axiomVerified","lemmaNode","lemma","Lemma","fromLemmaNode","lemmaVerified","theoremNode","theorem","Theorem","fromTheoremNode","theoremVerified","metaLemmaNode","metaLemmaVerified","verifyMetaLemma","conjectureNode","conjecture","Conjecture","fromConjectureNode","conjectureVerified","metatheoremNode","metatheoremVerified","verifyMetatheorem","typeDeclarationNode","typeDeclaration","TypeDeclaration","fromTypeDeclarationNode","typeDeclarationVerified","variableDeclarationNode","variableDeclaration","VariableDeclaration","fromVariableDeclarationNode","variableDeclarationVerified","combinatorDeclarationNode","combinatorDeclaration","CombinatorDeclaration","fromCombinatorDeclarationNode","combinatorDeclarationVerified","constructorDeclarationNode","constructorDeclaration","ConstructorDeclaration","fromConstructorDeclarationNode","constructorDeclarationVerified","metavariableDeclarationNode","metavariableDeclaration","MetavariableDeclaration","fromMetavariableDeclarationNode","metavariableDeclarationVerified","topLevelVerifier"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verifier/topLevel.js"],"sourcesContent":["\"use strict\";\n\nimport Rule from \"../rule\";\nimport Error from \"../error\";\nimport Axiom from \"../axiom\";\nimport Lemma from \"../lemma\";\nimport Theorem from \"../theorem\";\nimport MetaLemma from \"../metaLemma\";\nimport Conjecture from \"../conjecture\";\nimport Metatheorem from \"../metatheorem\";\nimport TypeDeclaration from \"../declaration/type\";\nimport VariableDeclaration from \"../declaration/variable\";\nimport CombinatorDeclaration from \"../declaration/combinator\";\nimport ConstructorDeclaration from \"../declaration/constructor\";\nimport MetavariableDeclaration from \"../declaration/metavariable\";\n\nimport Verifier from \"../verifier\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst errorNodeQuery = nodeQuery(\"/error\"),\n      ruleNodeQuery = nodeQuery(\"/rule\"),\n      axiomNodeQuery = nodeQuery(\"/axiom\"),\n      lemmaNodeQuery = nodeQuery(\"/lemma\"),\n      theoremNodeQuery = nodeQuery(\"/theorem\"),\n      metaLemmaNodeQuery = nodeQuery(\"/metaLemma\"),\n      conjectureNodeQuery = nodeQuery(\"/conjecture\"),\n      metatheoremNodeQuery = nodeQuery(\"/metatheorem\"),\n      typeDeclarationNodeQuery = nodeQuery(\"/typeDeclaration\"),\n      variableDeclarationNodeQuery = nodeQuery(\"/variableDeclaration\"),\n      combinatorDeclarationNodeQuery = nodeQuery(\"/combinatorDeclaration\"),\n      constructorDeclarationNodeQuery = nodeQuery(\"/constructorDeclaration\"),\n      metavariableDeclarationNodeQuery = nodeQuery(\"/metavariableDeclaration\");\n\nclass TopLevelVerifier extends Verifier {\n  verify(node, fileContext) {\n    let verifiedAtTopLevel;\n\n    const nonTerminalNode = node, ///\n          nonTerminalNodeVerified = this.verifyNonTerminalNode(nonTerminalNode, fileContext);\n\n    verifiedAtTopLevel = nonTerminalNodeVerified;  ///\n\n    return verifiedAtTopLevel;\n  }\n\n  static maps = [\n    {\n      nodeQuery: errorNodeQuery,\n      verify: (errorNode, fileContext) => {\n        const error = Error.fromErrorNode(errorNode, fileContext),\n              errorVerified = error.verify();\n\n        return errorVerified;\n      }\n    },\n    {\n      nodeQuery: ruleNodeQuery,\n      verify: (ruleNode, fileContext) => {\n        const rule = Rule.fromRuleNode(ruleNode, fileContext),\n              ruleVerified = rule.verify();\n\n        return ruleVerified;\n      }\n    },\n    {\n      nodeQuery: axiomNodeQuery,\n      verify: (axiomNode, fileContext) => {\n        const axiom = Axiom.fromAxiomNode(axiomNode, fileContext),\n              axiomVerified = axiom.verify();\n\n        return axiomVerified;\n      }\n    },\n    {\n      nodeQuery: lemmaNodeQuery,\n      verify: (lemmaNode, fileContext) => {\n        const lemma = Lemma.fromLemmaNode(lemmaNode, fileContext),\n              lemmaVerified = lemma.verify();\n\n        return lemmaVerified;\n      }\n    },\n    {\n      nodeQuery: theoremNodeQuery,\n      verify: (theoremNode, fileContext) => {\n        const theorem = Theorem.fromTheoremNode(theoremNode, fileContext),\n              theoremVerified = theorem.verify();\n\n        return theoremVerified;\n      }\n    },\n    {\n      nodeQuery: metaLemmaNodeQuery,\n      verify: (metaLemmaNode, fileContext) => {\n        const metaLemma = MetaLemma.fromMetaLemmaNode(metaLemmaNode, fileContext),\n              metaLemmaVerified = metaLemma.verify();\n\n        return metaLemmaVerified;\n      }\n    },\n    {\n      nodeQuery: conjectureNodeQuery,\n      verify: (conjectureNode, fileContext) => {\n        const conjecture = Conjecture.fromConjectureNode(conjectureNode, fileContext),\n              conjectureVerified = conjecture.verify();\n\n        return conjectureVerified;\n      }\n    },\n    {\n      nodeQuery: metatheoremNodeQuery,\n      verify: (metatheoremNode, fileContext) => {\n        const metatheorem = Metatheorem.fromMetatheoremNode(metatheoremNode, fileContext),\n              metatheoremVerified = metatheorem.verify();\n\n        return metatheoremVerified;\n      }\n    },\n    {\n      nodeQuery: typeDeclarationNodeQuery,\n      verify: (typeDeclarationNode, fileContext) => {\n        const typeDeclaration = TypeDeclaration.fromTypeDeclarationNode(typeDeclarationNode, fileContext),\n              typeDeclarationVerified = typeDeclaration.verify();\n\n        return typeDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: variableDeclarationNodeQuery,\n      verify: (variableDeclarationNode, fileContext) => {\n        const variableDeclaration = VariableDeclaration.fromVariableDeclarationNode(variableDeclarationNode, fileContext),\n              variableDeclarationVerified = variableDeclaration.verify();\n\n        return variableDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: combinatorDeclarationNodeQuery,\n      verify: (combinatorDeclarationNode, fileContext) => {\n        const combinatorDeclaration = CombinatorDeclaration.fromCombinatorDeclarationNode(combinatorDeclarationNode, fileContext),\n              combinatorDeclarationVerified = combinatorDeclaration.verify();\n\n        return combinatorDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: constructorDeclarationNodeQuery,\n      verify: (constructorDeclarationNode, fileContext) => {\n        const constructorDeclaration = ConstructorDeclaration.fromConstructorDeclarationNode(constructorDeclarationNode, fileContext),\n              constructorDeclarationVerified = constructorDeclaration.verify();\n\n        return constructorDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: metavariableDeclarationNodeQuery,\n      verify: (metavariableDeclarationNode, fileContext) => {\n        const metavariableDeclaration = MetavariableDeclaration.fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext),\n              metavariableDeclarationVerified = metavariableDeclaration.verify();\n\n        return metavariableDeclarationVerified;\n      }\n    }\n  ];\n}\n\nconst topLevelVerifier = new TopLevelVerifier();\n\nexport default topLevelVerifier;\n"],"names":["errorNodeQuery","nodeQuery","ruleNodeQuery","axiomNodeQuery","lemmaNodeQuery","theoremNodeQuery","metaLemmaNodeQuery","conjectureNodeQuery","metatheoremNodeQuery","typeDeclarationNodeQuery","variableDeclarationNodeQuery","combinatorDeclarationNodeQuery","constructorDeclarationNodeQuery","metavariableDeclarationNodeQuery","TopLevelVerifier","verify","node","fileContext","verifiedAtTopLevel","nonTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","Verifier","maps","errorNode","error","Error","fromErrorNode","errorVerified","ruleNode","rule","Rule","fromRuleNode","ruleVerified","axiomNode","axiom","Axiom","fromAxiomNode","axiomVerified","lemmaNode","lemma","Lemma","fromLemmaNode","lemmaVerified","theoremNode","theorem","Theorem","fromTheoremNode","theoremVerified","metaLemmaNode","metaLemma","MetaLemma","fromMetaLemmaNode","metaLemmaVerified","conjectureNode","conjecture","Conjecture","fromConjectureNode","conjectureVerified","metatheoremNode","metatheorem","Metatheorem","fromMetatheoremNode","metatheoremVerified","typeDeclarationNode","typeDeclaration","TypeDeclaration","fromTypeDeclarationNode","typeDeclarationVerified","variableDeclarationNode","variableDeclaration","VariableDeclaration","fromVariableDeclarationNode","variableDeclarationVerified","combinatorDeclarationNode","combinatorDeclaration","CombinatorDeclaration","fromCombinatorDeclarationNode","combinatorDeclarationVerified","constructorDeclarationNode","constructorDeclaration","ConstructorDeclaration","fromConstructorDeclarationNode","constructorDeclarationVerified","metavariableDeclarationNode","metavariableDeclaration","MetavariableDeclaration","fromMetavariableDeclarationNode","metavariableDeclarationVerified","topLevelVerifier"],"mappings":"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"}

package/package.json

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

package/src/assertion/subproof.js

@@ -128,7 +128,7 @@ export default class SubproofAssertion {
     return subproofUnified;
   }
 
-  static fromStatementNode(statementNode, fileContext) {
+  static fromStatementNode(statementNode, localContext) {
     let subproofAssertion = null;
 
     const subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
@@ -136,9 +136,8 @@ export default class SubproofAssertion {
     if (subproofAssertionNode !== null) {
       const { Statement } = shim,
             statementNodes = statementNodesQuery(subproofAssertionNode),
-            statement = Statement.fromStatementNode(statementNode, fileContext),
+            statement = Statement.fromStatementNode(statementNode, localContext),
             statementString = statement.getString(),
-            localContext = LocalContext.fromFileContext(fileContext),
             statements = statementNodes.map((statementNode) => {
               const statement = Statement.fromStatementNode(statementNode, localContext);
 

package/src/axiom.js

@@ -1,25 +1,26 @@
 "use strict";
 
+import shim from "./shim";
 import Label from "./label";
 import Consequent from "./consequent";
 import Supposition from "./supposition";
 import LocalContext from "./context/local";
 import TopLevelAssertion from "./topLevelAssertion";
 
+import { stringFromLabels } from "./topLevelAssertion";
 import { nodeQuery, nodesQuery } from "./utilities/query";
-import { labelsStringFromLabels } from "./topLevelAssertion";
 
 const labelNodesQuery = nodesQuery("/axiom/label"),
       consequentNodeQuery = nodeQuery("/axiom/consequent"),
       suppositionNodesQuery = nodesQuery("/axiom/supposition");
 
-export default class Axiom extends TopLevelAssertion {
+class Axiom extends TopLevelAssertion {
   verify() {
     let verified = false;
 
-    const labelsString = labelsStringFromLabels(this.labels);
+    const axiomString = this.string;  ///
 
-    this.fileContext.trace(`Verifying the '${labelsString}' axiom...`);
+    this.fileContext.trace(`Verifying the '${axiomString}' axiom...`);
 
     const labelsVerifiedAtTopLevel = this.labels.every((label) => {
       const labelVVerifiedAtTopLevel = label.verifyAtTopLevel(this.fileContext);
@@ -53,7 +54,7 @@ export default class Axiom extends TopLevelAssertion {
     }
 
     if (verified) {
-      this.fileContext.debug(`...verified the '${labelsString}' axiom.`);
+      this.fileContext.debug(`...verified the '${axiomString}' axiom.`);
     }
 
     return verified;
@@ -76,9 +77,16 @@ export default class Axiom extends TopLevelAssertion {
             return supposition;
           }),
           consequent = Consequent.fromConsequentNode(consequentNode, fileContext),
+          string = stringFromLabels(labels),
           proof = null,
-          axiom = new Axiom(fileContext, labels, suppositions, consequent, proof);
+          axiom = new Axiom(fileContext, string, labels, suppositions, consequent, proof);
 
     return axiom;
   }
 }
+
+Object.assign(shim, {
+  Axiom
+});
+
+export default Axiom;

package/src/combinator.js

@@ -4,10 +4,11 @@ import shim from "./shim";
 import LocalContext from "./context/local";
 
 import { nodeQuery } from "./utilities/query";
+import { statementFromJSON, statementToStatementJSON } from "./utilities/json";
 
 const statementNodeQuery = nodeQuery("/combinatorDeclaration/statement");
 
-export default class Combinator {
+class Combinator {
   constructor(statement) {
     this.statement = statement;
   }
@@ -43,7 +44,7 @@ export default class Combinator {
   }
 
   toJSON() {
-    const statementJSON = this.statement.toJSON(),
+    const statementJSON = statementToStatementJSON(this.statement),
           statement = statementJSON,  ///
           json = {
             statement
@@ -53,17 +54,8 @@ export default class Combinator {
   }
 
   static fromJSON(json, fileContext) {
-    let { statement } = json;
-
-    const statementJSON = statement;  ///
-
-    json = statementJSON; ///
-
-    const { Statement } = shim;
-
-    statement = Statement.fromJSON(json, fileContext);
-
-    const combinator = new Combinator(statement);
+    const statement = statementFromJSON(json, fileContext),
+          combinator = new Combinator(statement);
 
     return combinator;
   }
@@ -78,3 +70,10 @@ export default class Combinator {
     return combinator;
   }
 }
+
+Object.assign(shim, {
+  Combinator
+});
+
+export default Combinator;
+

package/src/conclusion.js

@@ -1,13 +1,15 @@
 "use strict";
 
+import shim from "./shim";
 import LocalContext from "./context/local";
 import UnqualifiedStatement from "./statement/unqualified";
 
 import { nodeQuery } from "./utilities/query";
+import { unqualifiedStatementFromJSON, unqualifiedStatementToUnqualifiedStatementJSON } from "./utilities/json";
 
 const unqualifiedStatementNodeQuery = nodeQuery("/conclusion/unqualifiedStatement");
 
-export default class Conclusion {
+class Conclusion {
   constructor(fileContext, unqualifiedStatement) {
     this.fileContext = fileContext;
     this.unqualifiedStatement = unqualifiedStatement;
@@ -71,7 +73,7 @@ export default class Conclusion {
   }
 
   toJSON() {
-    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),
+    const unqualifiedStatementJSON = unqualifiedStatementToUnqualifiedStatementJSON(this.unqualifiedStatement),
           unqualifiedStatement = unqualifiedStatementJSON,  ///
           json = {
             unqualifiedStatement
@@ -81,13 +83,8 @@ export default class Conclusion {
   }
 
   static fromJSON(json, fileContext) {
-    let { unqualifiedStatement } = json;
-
-    json = unqualifiedStatement;  ///
-
-    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);
-
-    const conclusion = new Conclusion(fileContext, unqualifiedStatement);
+    const unqualifiedStatement = unqualifiedStatementFromJSON(json, fileContext),
+          conclusion = new Conclusion(fileContext, unqualifiedStatement);
 
     return conclusion;
   }
@@ -100,3 +97,9 @@ export default class Conclusion {
     return conclusion;
   }
 }
+
+Object.assign(shim, {
+  Conclusion
+});
+
+export default Conclusion;

package/src/conjecture.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import shim from "./shim";
 import Label from "./label";
 import Proof from "./proof";
 import Consequent from "./consequent";
@@ -8,21 +9,21 @@ import LocalContext from "./context/local";
 import Substitutions from "./substitutions";
 import TopLevelAssertion from "./topLevelAssertion";
 
+import { stringFromLabels } from "./topLevelAssertion";
 import { nodeQuery, nodesQuery } from "./utilities/query";
-import { labelsStringFromLabels } from "./topLevelAssertion";
 
 const proofNodeQuery = nodeQuery("/conjecture/proof"),
       labelNodesQuery = nodesQuery("/conjecture/label"),
       consequentNodeQuery = nodeQuery("/conjecture/consequent"),
       suppositionNodesQuery = nodesQuery("/conjecture/supposition");
 
-export default class Conjecture extends TopLevelAssertion {
+class Conjecture extends TopLevelAssertion {
   verify() {
     let verified = false;
 
-    const labelsString = labelsStringFromLabels(this.labels);
+    const conjectureString = this.string; ///
 
-    this.fileContext.trace(`Verifying the '${labelsString}' conjecture...`);
+    this.fileContext.trace(`Verifying the '${conjectureString}' conjecture...`);
 
     const labelsVerifiedAtTopLevel = this.labels.every((label) => {
       const labelVVerifiedAtTopLevel = label.verifyAtTopLevel(this.fileContext);
@@ -62,7 +63,7 @@ export default class Conjecture extends TopLevelAssertion {
     }
 
     if (verified) {
-      this.fileContext.debug(`...verified the '${labelsString}' conjecture.`);
+      this.fileContext.debug(`...verified the '${conjectureString}' conjecture.`);
     }
 
     return verified;
@@ -86,9 +87,16 @@ export default class Conjecture extends TopLevelAssertion {
             return supposition;
           }),
           consequent = Consequent.fromConsequentNode(consequentNode, fileContext),
+          string = stringFromLabels(labels),
           proof = Proof.fromProofNode(proofNode, fileContext),
-          conjecture = new Conjecture(fileContext, labels, suppositions, consequent, proof);
+          conjecture = new Conjecture(fileContext, string, labels, suppositions, consequent, proof);
 
     return conjecture;
   }
 }
+
+Object.assign(shim, {
+  Conjecture
+});
+
+export default Conjecture;

package/src/consequent.js

@@ -1,13 +1,15 @@
 "use strict";
 
+import shim from "./shim";
 import LocalContext from "./context/local";
 import UnqualifiedStatement from "./statement/unqualified";
 
 import { nodeQuery } from "./utilities/query";
+import { unqualifiedStatementFromJSON, unqualifiedStatementToUnqualifiedStatementJSON } from "./utilities/json";
 
 const unqualifiedStatementNodeQuery = nodeQuery("/consequent/unqualifiedStatement");
 
-export default class Consequent {
+class Consequent {
   constructor(fileContext, unqualifiedStatement) {
     this.fileContext = fileContext;
     this.unqualifiedStatement = unqualifiedStatement;
@@ -71,7 +73,7 @@ export default class Consequent {
   }
 
   toJSON() {
-    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),
+    const unqualifiedStatementJSON = unqualifiedStatementToUnqualifiedStatementJSON(this.unqualifiedStatement),
           unqualifiedStatement = unqualifiedStatementJSON,  ///
           json = {
             unqualifiedStatement
@@ -81,13 +83,8 @@ export default class Consequent {
   }
 
   static fromJSON(json, fileContext) {
-    let { unqualifiedStatement } = json;
-
-    json = unqualifiedStatement;  ///
-
-    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);
-
-    const consequent = new Consequent(fileContext, unqualifiedStatement);
+    const unqualifiedStatement = unqualifiedStatementFromJSON(json, fileContext),
+          consequent = new Consequent(fileContext, unqualifiedStatement);
 
     return consequent;
   }
@@ -100,3 +97,9 @@ export default class Consequent {
     return consequent;
   }
 }
+
+Object.assign(shim, {
+  Consequent
+});
+
+export default Consequent;

package/src/constructor.js

@@ -4,11 +4,12 @@ import shim from "./shim";
 import LocalContext from "./context/local";
 
 import { nodeQuery } from "./utilities/query";
+import { termFromJSON, termToTermJSON } from "./utilities/json";
 
 const termNodeQuery = nodeQuery("/constructorDeclaration/term"),
       typeNodeQuery = nodeQuery("/constructorDeclaration/type");
 
-export default class Constructor {
+class Constructor {
   constructor(string, term) {
     this.string = string;
     this.term = term;
@@ -45,7 +46,7 @@ export default class Constructor {
   }
 
   toJSON() {
-    const termJSON = this.term.toJSON(),
+    const termJSON = termToTermJSON(this.term),
           term = termJSON,  ///
           json = {
             term
@@ -55,17 +56,8 @@ export default class Constructor {
   }
 
   static fromJSON(json, fileContext) {
-    let { term } = json;
-
-    const termJSON = term;  ///
-
-    json = termJSON;  ///
-
-    const { Term } = shim;
-
-    term = Term.fromJSON(json, fileContext);
-
-    const type = term.getType(),
+    const term = termFromJSON(json, fileContext),
+          type = term.getType(),
           string = stringFromTermAndType(term, type),
           constructor = new Constructor(string, term);
 
@@ -86,6 +78,12 @@ export default class Constructor {
   }
 }
 
+Object.assign(shim, {
+  Constructor
+});
+
+export default Constructor;
+
 export function stringFromTermAndType(term, type) {
   let string;