occam-verify-cli 0.0.1009 → 0.0.1011

package/lib/verifier/topLevel.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _rule = /*#__PURE__*/ _interop_require_default(require("../rule"));
+var _combinator = /*#__PURE__*/ _interop_require_default(require("../declaration/combinator"));
+var _metavariable = /*#__PURE__*/ _interop_require_default(require("../declaration/metavariable"));
 var _verifier = /*#__PURE__*/ _interop_require_default(require("../verifier"));
 var _error = /*#__PURE__*/ _interop_require_default(require("../verify/error"));
 var _axiom = /*#__PURE__*/ _interop_require_default(require("../verify/axiom"));
@@ -17,11 +19,9 @@ var _theorem = /*#__PURE__*/ _interop_require_default(require("../verify/theorem
 var _metaLemma = /*#__PURE__*/ _interop_require_default(require("../verify/metaLemma"));
 var _conjecture = /*#__PURE__*/ _interop_require_default(require("../verify/conjecture"));
 var _metatheorem = /*#__PURE__*/ _interop_require_default(require("../verify/metatheorem"));
-var _combinator = /*#__PURE__*/ _interop_require_default(require("../declaration/combinator"));
 var _type = /*#__PURE__*/ _interop_require_default(require("../verify/declaration/type"));
 var _variable = /*#__PURE__*/ _interop_require_default(require("../verify/declaration/variable"));
 var _constructor = /*#__PURE__*/ _interop_require_default(require("../verify/declaration/constructor"));
-var _metavariable = /*#__PURE__*/ _interop_require_default(require("../verify/declaration/metavariable"));
 var _query = require("../utilities/query");
 function _assert_this_initialized(self) {
     if (self === void 0) {
@@ -222,7 +222,7 @@ _define_property(TopLevelVerifier, "maps", [
     {
         nodeQuery: metavariableDeclarationNodeQuery,
         verify: function(metavariableDeclarationNode, fileContext) {
-            var metavariableDeclarationVerified = (0, _metavariable.default)(metavariableDeclarationNode, fileContext);
+            var metavariableDeclaration = _metavariable.default.fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext), metavariableDeclarationVerified = metavariableDeclaration.verify(fileContext);
             return metavariableDeclarationVerified;
         }
     }
@@ -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 Verifier from \"../verifier\";\nimport verifyError from \"../verify/error\";\nimport verifyAxiom from \"../verify/axiom\";\nimport verifyLemma from \"../verify/lemma\";\nimport verifyTheorem from \"../verify/theorem\";\nimport verifyMetaLemma from \"../verify/metaLemma\";\nimport verifyConjecture from \"../verify/conjecture\";\nimport verifyMetatheorem from \"../verify/metatheorem\";\nimport CombinatorDeclaration from \"../declaration/combinator\";\nimport verifyTypeDeclaration from \"../verify/declaration/type\";\nimport verifyVariableDeclaration from \"../verify/declaration/variable\";\nimport verifyConstructorDeclaration from \"../verify/declaration/constructor\";\nimport verifyMetavariableDeclaration from \"../verify/declaration/metavariable\";\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 verified;\n\n    const nonTerminalNode = node, ///\n          nonTerminalNodeVerified = this.verifyNonTerminalNode(nonTerminalNode, fileContext);\n\n    verified = nonTerminalNodeVerified;  ///\n\n    return verified;\n  }\n\n  static maps = [\n    {\n      nodeQuery: errorNodeQuery,\n      verify: (errorNode, fileContext) => {\n        const errorVerified = verifyError(errorNode, fileContext);\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(fileContext);\n\n        return ruleVerified;\n      }\n    },\n    {\n      nodeQuery: axiomNodeQuery,\n      verify: (axiomNode, fileContext) => {\n        const axiomVerified = verifyAxiom(axiomNode, fileContext);\n\n        return axiomVerified;\n      }\n    },\n    {\n      nodeQuery: lemmaNodeQuery,\n      verify: (lemmaNode, fileContext) => {\n        const lemmaVerified = verifyLemma(lemmaNode, fileContext);\n\n        return lemmaVerified;\n      }\n    },\n    {\n      nodeQuery: theoremNodeQuery,\n      verify: (theoremNode, fileContext) => {\n        const theoremVerified = verifyTheorem(theoremNode, fileContext);\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 conjectureVerified = verifyConjecture(conjectureNode, fileContext);\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 typeDeclarationVerified = verifyTypeDeclaration(typeDeclarationNode, fileContext);\n\n        return typeDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: variableDeclarationNodeQuery,\n      verify: (variableDeclarationNode, fileContext) => {\n        const variableDeclarationVerified = verifyVariableDeclaration(variableDeclarationNode, fileContext);\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(fileContext);\n\n        return combinatorDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: constructorDeclarationNodeQuery,\n      verify: (constructorDeclarationNode, fileContext) => {\n        const constructorDeclarationVerified = verifyConstructorDeclaration(constructorDeclarationNode, fileContext);\n\n        return constructorDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: metavariableDeclarationNodeQuery,\n      verify: (metavariableDeclarationNode, fileContext) => {\n        const metavariableDeclarationVerified = verifyMetavariableDeclaration(metavariableDeclarationNode, fileContext);\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","verified","nonTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","Verifier","maps","errorNode","errorVerified","verifyError","ruleNode","rule","Rule","fromRuleNode","ruleVerified","axiomNode","axiomVerified","verifyAxiom","lemmaNode","lemmaVerified","verifyLemma","theoremNode","theoremVerified","verifyTheorem","metaLemmaNode","metaLemmaVerified","verifyMetaLemma","conjectureNode","conjectureVerified","verifyConjecture","metatheoremNode","metatheoremVerified","verifyMetatheorem","typeDeclarationNode","typeDeclarationVerified","verifyTypeDeclaration","variableDeclarationNode","variableDeclarationVerified","verifyVariableDeclaration","combinatorDeclarationNode","combinatorDeclaration","CombinatorDeclaration","fromCombinatorDeclarationNode","combinatorDeclarationVerified","constructorDeclarationNode","constructorDeclarationVerified","verifyConstructorDeclaration","metavariableDeclarationNode","metavariableDeclarationVerified","verifyMetavariableDeclaration","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 CombinatorDeclaration from \"../declaration/combinator\";\nimport MetavariableDeclaration from \"../declaration/metavariable\";\n\nimport Verifier from \"../verifier\";\nimport verifyError from \"../verify/error\";\nimport verifyAxiom from \"../verify/axiom\";\nimport verifyLemma from \"../verify/lemma\";\nimport verifyTheorem from \"../verify/theorem\";\nimport verifyMetaLemma from \"../verify/metaLemma\";\nimport verifyConjecture from \"../verify/conjecture\";\nimport verifyMetatheorem from \"../verify/metatheorem\";\nimport verifyTypeDeclaration from \"../verify/declaration/type\";\nimport verifyVariableDeclaration from \"../verify/declaration/variable\";\nimport verifyConstructorDeclaration from \"../verify/declaration/constructor\";\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 verified;\n\n    const nonTerminalNode = node, ///\n          nonTerminalNodeVerified = this.verifyNonTerminalNode(nonTerminalNode, fileContext);\n\n    verified = nonTerminalNodeVerified;  ///\n\n    return verified;\n  }\n\n  static maps = [\n    {\n      nodeQuery: errorNodeQuery,\n      verify: (errorNode, fileContext) => {\n        const errorVerified = verifyError(errorNode, fileContext);\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(fileContext);\n\n        return ruleVerified;\n      }\n    },\n    {\n      nodeQuery: axiomNodeQuery,\n      verify: (axiomNode, fileContext) => {\n        const axiomVerified = verifyAxiom(axiomNode, fileContext);\n\n        return axiomVerified;\n      }\n    },\n    {\n      nodeQuery: lemmaNodeQuery,\n      verify: (lemmaNode, fileContext) => {\n        const lemmaVerified = verifyLemma(lemmaNode, fileContext);\n\n        return lemmaVerified;\n      }\n    },\n    {\n      nodeQuery: theoremNodeQuery,\n      verify: (theoremNode, fileContext) => {\n        const theoremVerified = verifyTheorem(theoremNode, fileContext);\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 conjectureVerified = verifyConjecture(conjectureNode, fileContext);\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 typeDeclarationVerified = verifyTypeDeclaration(typeDeclarationNode, fileContext);\n\n        return typeDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: variableDeclarationNodeQuery,\n      verify: (variableDeclarationNode, fileContext) => {\n        const variableDeclarationVerified = verifyVariableDeclaration(variableDeclarationNode, fileContext);\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(fileContext);\n\n        return combinatorDeclarationVerified;\n      }\n    },\n    {\n      nodeQuery: constructorDeclarationNodeQuery,\n      verify: (constructorDeclarationNode, fileContext) => {\n        const constructorDeclarationVerified = verifyConstructorDeclaration(constructorDeclarationNode, fileContext);\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(fileContext);\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","verified","nonTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","Verifier","maps","errorNode","errorVerified","verifyError","ruleNode","rule","Rule","fromRuleNode","ruleVerified","axiomNode","axiomVerified","verifyAxiom","lemmaNode","lemmaVerified","verifyLemma","theoremNode","theoremVerified","verifyTheorem","metaLemmaNode","metaLemmaVerified","verifyMetaLemma","conjectureNode","conjectureVerified","verifyConjecture","metatheoremNode","metatheoremVerified","verifyMetatheorem","typeDeclarationNode","typeDeclarationVerified","verifyTypeDeclaration","variableDeclarationNode","variableDeclarationVerified","verifyVariableDeclaration","combinatorDeclarationNode","combinatorDeclaration","CombinatorDeclaration","fromCombinatorDeclarationNode","combinatorDeclarationVerified","constructorDeclarationNode","constructorDeclarationVerified","verifyConstructorDeclaration","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.1009",
+  "version": "0.0.1011",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/argument.js

@@ -0,0 +1,79 @@
+"use strict";
+
+import { nodeQuery } from "./utilities/query";
+
+const termNodeQuery = nodeQuery("/argument/term"),
+      typeNodeQuery = nodeQuery("/argument//type");
+
+export default class Argument {
+  constructor(string, node, fileContext) {
+    this.string = string;
+    this.node = node;
+    this.fileContext = fileContext;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getNode() {
+    return this.node;
+  }
+
+  getFileContext() {
+    return this.fileContext;
+  }
+
+  verify(fileContext) {
+    let verified = false;
+
+    const argumentString = this.string; ///
+
+    fileContext.trace(`Verifying the '${argumentString}' argument...`);
+
+    if (this.node === null) {
+      verified = true;
+    } else {
+      const termNode = termNodeQuery(this.node);
+
+      if (termNode !== null) {
+        const termString = this.fileContext.nodeAsString(termNode);
+
+        this.fileContext.debug(`The '${termString}' term was found when a type should have been present.`);
+      } else {
+        const typeNode = typeNodeQuery(this.node);
+
+        if (typeNode !== null) {
+          const typePresent = this.fileContext.isTypePresentByTypeNode(typeNode);
+
+          if (typePresent) {
+            verified = true;
+          } else {
+            const typeString = this.fileContext.nodeAsString(typeNode);
+
+            this.fileContext.debug(`The '${typeString}' type is not present.`);
+          }
+        }
+      }
+    }
+
+    if (verified) {
+      fileContext.debug(`...verified the '${argumentString}' argument.`);
+    }
+
+    return verified;
+  }
+
+  static fromArgumentNode(argumentNode, fileContext) {
+    let argument = null;
+
+    if (argumentNode !== null) {
+      const node = argumentNode,  ///
+            string = fileContext.nodeAsString(node);
+
+      argument = new Argument(string, node, fileContext);
+    }
+
+    return argument;
+  }
+}

package/src/combinator.js

@@ -5,7 +5,6 @@ import Statement from "./statement";
 import LocalContext from "./context/local";
 
 import { nodeQuery } from "./utilities/query";
-import { statementNodeFromStatementString } from "./utilities/node";
 
 const statementNodeQuery = nodeQuery("/combinatorDeclaration/statement");
 
@@ -47,13 +46,13 @@ export default class Combinator {
   static fromJSON(json, fileContext) {
     let { statement } = json;
 
-    const lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          statementString = statement,  ///
-          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
-          localContext = LocalContext.fromFileContext(fileContext);
+    const string = statement;  ///
 
-    statement = Statement.fromStatementNode(statementNode, localContext);
+    json = {  ///
+      string
+    };
+
+    statement = Statement.fromJSON(json, fileContext);
 
     const combinator = new Combinator(statement);
 

package/src/conclusion.js

@@ -6,7 +6,6 @@ import UnqualifiedStatement from "./statement/unqualified";
 
 import { trim } from "./utilities/string";
 import { nodeQuery } from "./utilities/query";
-import { unqualifiedStatementNodeFromUnqualifiedStatementString } from "./utilities/node";
 
 const unqualifiedStatementNodeQuery = nodeQuery("/conclusion/unqualifiedStatement");
 
@@ -80,8 +79,8 @@ export default class Conclusion {
   }
 
   toJSON() {
-    const unqualifiedStatementString = this.unqualifiedStatement.getString(),
-          unqualifiedStatement = unqualifiedStatementString,  ///
+    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),
+          unqualifiedStatement = unqualifiedStatementJSON,  ///
           json = {
             unqualifiedStatement
           };
@@ -92,17 +91,15 @@ export default class Conclusion {
   static fromJSON(json, fileContext) {
     let { unqualifiedStatement } = json;
 
-    const lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          unqualifiedStatementString = unqualifiedStatement,  ///
-          unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, lexer, parser);
+    json = unqualifiedStatement;  ///
 
-    unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);
+    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);
 
     const conclusion = new Conclusion(fileContext, unqualifiedStatement);
 
     return conclusion;
   }
+
   static fromConclusionNode(conclusionNode, fileContext) {
     const unqualifiedStatementNode = unqualifiedStatementNodeQuery(conclusionNode),
           unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),

package/src/context/release.js

@@ -470,7 +470,7 @@ export default class ReleaseContext {
           parser = null,
           verified = false,
           initialised = false,
-          fileContexts = null,
+          fileContexts = [],
           customGrammar = customGrammarFromNameAndEntries(name, entries),
           dependencyReleaseContexts = null,
           releaseContext = new ReleaseContext(log, name, json, entries, lexer, parser, verified, initialised, fileContexts, customGrammar, dependencyReleaseContexts);

package/src/declaration/combinator.js

@@ -3,33 +3,38 @@
 import Combinator from "../combinator";
 
 export default class CombinatorDeclaration {
-  constructor(combinator) {
+  constructor(fileContext, combinator) {
+    this.fileContext = fileContext;
     this.combinator = combinator;
   }
 
+  getFileContext() {
+    return this.fileContext;
+  }
+
   getCombinator() {
     return this.combinator;
   }
 
   getString() { return this.combinator.getString(); }
 
-  verify(fileContext) {
+  verify() {
     let verified;
 
-    const ocmbinatorDeclarationString = this.getString(); ///
+    const combinatorDeclarationString = this.getString(); ///
 
-    fileContext.trace(`Verifying the '${ocmbinatorDeclarationString}' combinator declaration...`);
+    this.fileContext.trace(`Verifying the '${combinatorDeclarationString}' combinator declaration...`);
 
-    const combinatorVerified = this.combinator.verify(fileContext);
+    const combinatorVerified = this.combinator.verify(this.fileContext);
 
     if (combinatorVerified) {
-      fileContext.addCombinator(this.combinator);
+      this.fileContext.addCombinator(this.combinator);
 
       verified = true;
     }
 
     if (verified) {
-      fileContext.debug(`...verified the '${ocmbinatorDeclarationString}' combinator declaration.`);
+      this.fileContext.debug(`...verified the '${combinatorDeclarationString}' combinator declaration.`);
     }
 
     return verified;
@@ -37,7 +42,7 @@ export default class CombinatorDeclaration {
 
   static fromCombinatorDeclarationNode(combinatorDeclarationNode, fileContext) {
     const combinator = Combinator.fromCombinatorDeclarationNode(combinatorDeclarationNode, fileContext),
-          combinatorDeclaration = new CombinatorDeclaration(combinator);
+          combinatorDeclaration = new CombinatorDeclaration(fileContext, combinator);
 
     return combinatorDeclaration;
   }

package/src/declaration/metavariable.js

@@ -0,0 +1,57 @@
+"use strict";
+
+import MetaType from "../metaType";
+import Metavariable from "../metavariable";
+
+import { nodeQuery } from "../utilities/query";
+
+const metaTypeNodeQuery = nodeQuery("/metavariableDeclaration/metaType");
+
+export default class MetavariableDeclaration {
+  constructor(string, metavariable) {
+    this.string = string;
+    this.metavariable = metavariable;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getMetavariable() {
+    return this.metavariable;
+  }
+
+  verify(fileContext) {
+    let verified;
+
+    const metavariableDeclarationString = this.string; ///
+
+    fileContext.trace(`Verifying the '${metavariableDeclarationString}' metavariable declaration...`);
+
+    const metavariableVerified = this.metavariable.verify(fileContext);
+
+    if (metavariableVerified) {
+      fileContext.addMetavariable(this.metavariable);
+
+      verified = true;
+    }
+
+    if (verified) {
+      fileContext.debug(`...verified the '${metavariableDeclarationString}' metavariable declaration.`);
+    }
+
+    return verified;
+  }
+
+  static fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext) {
+    const metaTypeNode = metaTypeNodeQuery(metavariableDeclarationNode),
+          metaType = MetaType.fromMetaTypeNode(metaTypeNode, fileContext),
+          metavariable = Metavariable.fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext),
+          metavariableString = metavariable.getString(),
+          metaTypeString = metaType.getString(),
+          string = `${metavariableString}:${metaTypeString}`,
+          metavariableDeclaration = new MetavariableDeclaration(string, metavariable);
+
+    return metavariableDeclaration;
+  }
+}

package/src/metaType.js

@@ -13,6 +13,12 @@ class MetaType {
     return this.name;
   }
 
+  getString() {
+    const string = this.name; ///
+
+    return string;
+  }
+
   isEqualTo(metaType) {
     const equalTo = (this === metaType);
 
@@ -69,15 +75,3 @@ Object.assign(shim, {
 });
 
 export default MetaType;
-
-export function metaTypeFromJSON(json, fileContext) {
-  let metaType = null;
-
-  if (json !== null) {
-    const { name } = json;
-
-    metaType = new MetaType(name);
-  }
-
-  return metaType;
-}

package/src/metavariable.js

@@ -1,9 +1,17 @@
 "use strict";
 
-import { metaTypeFromJSON } from "./metaType";
+import Argument from "./argument";
+import MetaType from "./metaType";
+import LocalContext from "./context/local";
+
+import { nodeQuery } from "./utilities/query";
 import { metavariableNameFromMetavariableNode } from "./utilities/name";
 import { metavariableNodeFromMetavariableString } from "./utilities/node";
 
+const argumentNodeQuery = nodeQuery("/metavariable/argument"),
+      metaTypeNodeQuery = nodeQuery("/metavariableDeclaration/metaType"),
+      metavariableNodeQuery = nodeQuery("/metavariableDeclaration/metavariable");
+
 export default class Metavariable {
   constructor(string, node, name, metaType) {
     this.string = string;
@@ -46,6 +54,40 @@ export default class Metavariable {
     return metavariableNodeMatches;
   }
 
+  verify(fileContext) {
+    let metavariableVerified = false;
+
+    const metavariableString = this.string; ///
+
+    fileContext.trace(`Verifying the '${metavariableString}' metavariable...`);
+
+    const metavariableNode = this.node, ///
+          metavariablePresent = fileContext.isMetavariablePresentByMetavariableNode(metavariableNode);
+
+    if (metavariablePresent) {
+      fileContext.debug(`The metavariable '${metavariableString}' is already present.`);
+    } else {
+      const argumentNode = argumentNodeQuery(metavariableNode),
+            argument = Argument.fromArgumentNode(argumentNode, fileContext);
+
+      if (argument === null) {
+        metavariableVerified = true;
+      } else {
+        const argumentVerified = argument.verify(fileContext);
+
+        if (argumentVerified) {
+          metavariableVerified = true;
+        }
+      }
+    }
+
+    if (metavariableVerified) {
+      fileContext.debug(`...verified the '${metavariableString}' metavariable.`);
+    }
+
+    return metavariableVerified;
+  }
+
   toJSON() {
     const metaTypeJSON = (this.metaType !== null) ?
                             this.metaType.toJSON() :
@@ -70,9 +112,11 @@ export default class Metavariable {
 
     let { metaType } = json;
 
-    json = metaType;  ///
+    if (metaType !== null) {
+      json = metaType;  ///
 
-    metaType = metaTypeFromJSON(json, fileContext);
+      metaType = MetaType.fromJSON(json, fileContext);
+    }
 
     const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
           name = metavariableName,  ///
@@ -83,8 +127,8 @@ export default class Metavariable {
 
   static fromMetavariableNode(metavariableNode, fileContext) {
     const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
-          name = metavariableName,  ///
           node = metavariableNode,  ///
+          name = metavariableName,  ///
           string = fileContext.nodeAsString(node),
           metaType = null,
           metavariable = new Metavariable(string, node, name, metaType);
@@ -94,11 +138,26 @@ export default class Metavariable {
 
   static fromMetavariableNodeAndMetaType(metavariableNode, metaType, fileContext) {
     const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
-          name = metavariableName,  ///
           node = metavariableNode,  ///
+          name = metavariableName,  ///
           string = fileContext.nodeAsString(node),
           metavariable = new Metavariable(string, node, name, metaType);
 
     return metavariable;
   }
+
+  static fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext) {
+    const metaTypeNode = metaTypeNodeQuery(metavariableDeclarationNode),
+          metavariableNode = metavariableNodeQuery(metavariableDeclarationNode),
+          metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
+          localContext = LocalContext.fromFileContext(fileContext),
+          metavariableString = fileContext.nodeAsString(metavariableNode),
+          string = metavariableString,  ///
+          node = metavariableNode,  ///
+          name = metavariableName,  ///
+          metaType = MetaType.fromMetaTypeNode(metaTypeNode, localContext),
+          metavariable = new Metavariable(string, node, name, metaType);
+
+    return metavariable;
+  }
 }

package/src/premise.js

@@ -143,8 +143,8 @@ export default class Premise {
   }
 
   toJSON() {
-    const unqualifiedStatementString = this.unqualifiedStatement.getString(),
-          unqualifiedStatement = unqualifiedStatementString,  ///
+    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),
+          unqualifiedStatement = unqualifiedStatementJSON,  ///
           json = {
             unqualifiedStatement
           };
@@ -155,12 +155,9 @@ export default class Premise {
   static fromJSON(json, fileContext) {
     let { unqualifiedStatement } = json;
 
-    const lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          unqualifiedStatementString = unqualifiedStatement,  ///
-          unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, lexer, parser);
+    json = unqualifiedStatement;  ///
 
-    unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);
+    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);
 
     const premise = new Premise(fileContext, unqualifiedStatement);
 

package/src/statement/qualified.js

@@ -36,7 +36,7 @@ export default class QualifiedStatement {
   verify(substitutions, localContext) {
     let verified;
 
-    const qualifiedStatementString = trim(this.string); ///
+    const qualifiedStatementString = this.string; ///
 
     localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement...`);
 
@@ -89,12 +89,10 @@ export default class QualifiedStatement {
       const statementNode = statementNodeQuery(qualifiedStatementNode),
             referenceNode = referenceNodeQuery(qualifiedStatementNode),
             localContext = LocalContext.fromFileContext(fileContext),
-            statement = (statementNode !== null) ?
-                          Statement.fromStatementNode(statementNode, localContext) :
-                            null,
+            statement = Statement.fromStatementNode(statementNode, localContext),
             reference = Reference.fromReferenceNode(referenceNode, fileContext),
             node = qualifiedStatementNode,  ///
-            string = fileContext.nodeAsString(node);
+            string = trim(fileContext.nodeAsString(node));  ///
 
         qualifiedStatement = new QualifiedStatement(string, statement, reference);
     }

package/src/statement/unqualified.js

@@ -3,29 +3,25 @@
 import Statement from "../statement";
 import LocalContext from "../context/local";
 
-import { trim } from "../utilities/string";
 import { nodeQuery } from "../utilities/query";
 
 const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement");
 
 export default class UnqualifiedStatement {
-  constructor(string, statement) {
-    this.string = string;
+  constructor(statement) {
     this.statement = statement;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getStatement() {
     return this.statement;
   }
 
+  getString() { return this.statement.getString(); }
+
   verify(assignments, stated, localContext) {
     let verified;
 
-    const unqualifiedStatementString = trim(this.string); ///
+    const unqualifiedStatementString = this.getString(); ///
 
     localContext.trace(`Verifying the '${unqualifiedStatementString}' unqualified statement...`);
 
@@ -40,19 +36,37 @@ export default class UnqualifiedStatement {
     return verified;
   }
 
+  toJSON() {
+    const statementJSON = this.statement.toJSON(),
+          statement = statementJSON,  ///
+          json = {
+            statement
+          };
+
+    return json;
+  }
+
+  static fromJSON(json, fileContext) {
+    let { statement } = json;
+
+    json = statement; ///
+
+    statement = Statement.fromJSON(json, fileContext);
+
+    const unqualifiedStatement = new UnqualifiedStatement(statement);
+
+    return unqualifiedStatement;
+  }
+
   static fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext) {
     let unqualifiedStatement = null;
 
     if (unqualifiedStatementNode !== null) {
       const statementNode = statementNodeQuery(unqualifiedStatementNode),
             localContext = LocalContext.fromFileContext(fileContext),
-            statement = (statementNode !== null) ?
-                          Statement.fromStatementNode(statementNode, localContext) :
-                            null,
-            node = unqualifiedStatementNode,  ///
-            string = fileContext.nodeAsString(node);
+            statement = Statement.fromStatementNode(statementNode, localContext);
 
-      unqualifiedStatement = new UnqualifiedStatement(string, statement);
+      unqualifiedStatement = new UnqualifiedStatement(statement);
     }
 
     return unqualifiedStatement;