occam-verify-cli 0.0.471 → 0.0.473

package/lib/verify/statement/unqualified.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "default", {
 });
 var _statement = /*#__PURE__*/ _interopRequireDefault(require("../../verify/statement"));
 var _query = require("../../utilities/query");
-var _string = require("../../utilities/string");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -20,8 +19,6 @@ var statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement!
 function verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext) {
     var unqualifiedStatementVerified = false;
     proofContext.begin(unqualifiedStatementNode);
-    var unqualifiedStatementString = (0, _string.nodeAsString)(unqualifiedStatementNode);
-    proofContext.debug("Verifying the '".concat(unqualifiedStatementString, "' unqualified statement..."));
     var statementNode = statementNodeQuery(unqualifiedStatementNode);
     if (statementNode !== null) {
         var statementVerified = (0, _statement.default)(statementNode, proofContext);
@@ -35,11 +32,8 @@ function verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext) {
             }
         }
     }
-    if (unqualifiedStatementVerified) {
-        proofContext.info("Verified the '".concat(unqualifiedStatementString, "' unqualified statement."));
-    }
     unqualifiedStatementVerified ? proofContext.complete(unqualifiedStatementNode) : proofContext.halt(unqualifiedStatementNode);
     return unqualifiedStatementVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50IGZyb20gXCIuLi8uLi92ZXJpZnkvc3RhdGVtZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IG5vZGVBc1N0cmluZyB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5cbmNvbnN0IHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZFN0YXRlbWVudC9zdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCkge1xuICBsZXQgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHByb29mQ29udGV4dC5iZWdpbih1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgcHJvb2ZDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3VucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nfScgdW5xdWFsaWZpZWQgc3RhdGVtZW50Li4uYCk7XG5cbiAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIGlmIChzdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KTtcblxuICAgIGlmIChzdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgICAgY29uc3QgZGVyaXZlZCA9IHByb29mQ29udGV4dC5pc0Rlcml2ZWQoKTtcblxuICAgICAgaWYgKGRlcml2ZWQpIHtcbiAgICAgICAgY29uc3QgYXNzZXJ0aW9uTWF0Y2hlcyA9IHByb29mQ29udGV4dC5tYXRjaFN0YXRlbWVudChzdGF0ZW1lbnROb2RlKTtcblxuICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gYXNzZXJ0aW9uTWF0Y2hlczsgIC8vL1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBwcm9vZkNvbnRleHQuaW5mbyhgVmVyaWZpZWQgdGhlICcke3VucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nfScgdW5xdWFsaWZpZWQgc3RhdGVtZW50LmApO1xuICB9XG5cbiAgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKTtcblxuICByZXR1cm4gdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCIsInN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInByb29mQ29udGV4dCIsInVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJiZWdpbiIsInVucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJzdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlTdGF0ZW1lbnQiLCJkZXJpdmVkIiwiaXNEZXJpdmVkIiwiYXNzZXJ0aW9uTWF0Y2hlcyIsIm1hdGNoU3RhdGVtZW50IiwiaW5mbyIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU0E7OztlQUF3QkE7Ozs4REFQSTtxQkFFRjtzQkFDRzs7Ozs7O0FBRTdCLElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUV0QixTQUFTRiwyQkFBMkJHLHdCQUF3QixFQUFFQyxZQUFZLEVBQUU7SUFDekYsSUFBSUMsK0JBQStCLEtBQUs7SUFFeENELGFBQWFFLEtBQUssQ0FBQ0g7SUFFbkIsSUFBTUksNkJBQTZCQyxJQUFBQSxvQkFBWSxFQUFDTDtJQUVoREMsYUFBYUssS0FBSyxDQUFDLEFBQUMsa0JBQTRDLE9BQTNCRiw0QkFBMkI7SUFFaEUsSUFBTUcsZ0JBQWdCVCxtQkFBbUJFO0lBRXpDLElBQUlPLGtCQUFrQixJQUFJLEVBQUU7UUFDMUIsSUFBTUMsb0JBQW9CQyxJQUFBQSxrQkFBZSxFQUFDRixlQUFlTjtRQUV6RCxJQUFJTyxtQkFBbUI7WUFDckIsSUFBTUUsVUFBVVQsYUFBYVUsU0FBUztZQUV0QyxJQUFJRCxTQUFTO2dCQUNYLElBQU1FLG1CQUFtQlgsYUFBYVksY0FBYyxDQUFDTjtnQkFFckRMLCtCQUErQlUsa0JBQW1CLEdBQUc7WUFDdkQsT0FBTztnQkFDTFYsK0JBQStCLElBQUk7WUFDckMsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsOEJBQThCO1FBQ2hDRCxhQUFhYSxJQUFJLENBQUMsQUFBQyxpQkFBMkMsT0FBM0JWLDRCQUEyQjtJQUNoRSxDQUFDO0lBRURGLCtCQUNFRCxhQUFhYyxRQUFRLENBQUNmLDRCQUNwQkMsYUFBYWUsSUFBSSxDQUFDaEIseUJBQXlCO0lBRS9DLE9BQU9FO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50IGZyb20gXCIuLi8uLi92ZXJpZnkvc3RhdGVtZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3Qgc3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3VucXVhbGlmaWVkU3RhdGVtZW50L3N0YXRlbWVudCFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50KHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KSB7XG4gIGxldCB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gZmFsc2U7XG5cbiAgcHJvb2ZDb250ZXh0LmJlZ2luKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIGlmIChzdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KTtcblxuICAgIGlmIChzdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgICAgY29uc3QgZGVyaXZlZCA9IHByb29mQ29udGV4dC5pc0Rlcml2ZWQoKTtcblxuICAgICAgaWYgKGRlcml2ZWQpIHtcbiAgICAgICAgY29uc3QgYXNzZXJ0aW9uTWF0Y2hlcyA9IHByb29mQ29udGV4dC5tYXRjaFN0YXRlbWVudChzdGF0ZW1lbnROb2RlKTtcblxuICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gYXNzZXJ0aW9uTWF0Y2hlczsgIC8vL1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKTtcblxuICByZXR1cm4gdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCIsInN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInByb29mQ29udGV4dCIsInVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJiZWdpbiIsInN0YXRlbWVudE5vZGUiLCJzdGF0ZW1lbnRWZXJpZmllZCIsInZlcmlmeVN0YXRlbWVudCIsImRlcml2ZWQiLCJpc0Rlcml2ZWQiLCJhc3NlcnRpb25NYXRjaGVzIiwibWF0Y2hTdGF0ZW1lbnQiLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFBOzs7ZUFBd0JBOzs7OERBTkk7cUJBRUY7Ozs7OztBQUUxQixJQUFNQyxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFdEIsU0FBU0YsMkJBQTJCRyx3QkFBd0IsRUFBRUMsWUFBWSxFQUFFO0lBQ3pGLElBQUlDLCtCQUErQixLQUFLO0lBRXhDRCxhQUFhRSxLQUFLLENBQUNIO0lBRW5CLElBQU1JLGdCQUFnQk4sbUJBQW1CRTtJQUV6QyxJQUFJSSxrQkFBa0IsSUFBSSxFQUFFO1FBQzFCLElBQU1DLG9CQUFvQkMsSUFBQUEsa0JBQWUsRUFBQ0YsZUFBZUg7UUFFekQsSUFBSUksbUJBQW1CO1lBQ3JCLElBQU1FLFVBQVVOLGFBQWFPLFNBQVM7WUFFdEMsSUFBSUQsU0FBUztnQkFDWCxJQUFNRSxtQkFBbUJSLGFBQWFTLGNBQWMsQ0FBQ047Z0JBRXJERiwrQkFBK0JPLGtCQUFtQixHQUFHO1lBQ3ZELE9BQU87Z0JBQ0xQLCtCQUErQixJQUFJO1lBQ3JDLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVEQSwrQkFDRUQsYUFBYVUsUUFBUSxDQUFDWCw0QkFDcEJDLGFBQWFXLElBQUksQ0FBQ1oseUJBQXlCO0lBRS9DLE9BQU9FO0FBQ1QifQ==

package/package.json

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

package/src/constants.js

@@ -9,5 +9,4 @@ export const LEFT_BRACKET = "(";
 export const RIGHT_BRACKET = ")";
 export const MAXIMUM_INDEXES_LENGTH = 10;
 export const MAXIMUM_PERMUTATION_LENGTH = 5;
-export const BRACKETED_STATEMENT_CHILD_NODES_LENGTH = 3;
-export const BRACKETED_METASTATEMENT_CHILD_NODES_LENGTH = 3;
+export const BRACKETED_CHILD_NODES_LENGTH = 3;

package/src/context/metaproof.js

@@ -44,10 +44,14 @@ class MetaproofContext {
     return lastMetaproofStep;
   }
 
-  setDerived(derived) {
+  setDerived(derived = true) {
     this.derived = derived;
   }
 
+  resetDerived() {
+    this.derived = false;
+  }
+
   addMetaproofStep(metaproofStep) {
     this.metaproofSteps.push(metaproofStep);
   }

package/src/context/proof.js

@@ -63,10 +63,14 @@ class ProofContext {
     return lastProofStep;
   }
 
-  setDerived(derived) {
+  setDerived(derived = true) {
     this.derived = derived;
   }
 
+  resetDerived() {
+    this.derived = false;
+  }
+
   addVariable(variable) {
     this.variables.push(variable);
   }

package/src/equality.js

@@ -0,0 +1,8 @@
+"use strict";
+
+export default class Equality {
+  constructor(termNodeA, termNodeB) {
+    this.termNodeA = termNodeA;
+    this.termNodeB = termNodeB;
+  }
+}

package/src/metaSubstitution.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { matchBracketedMetastatementChildNode, bracketedMetastatementChildNodeFromChildNodes } from "./utilities/metaAssertion";
+import { matchNodes, bracketedChildNodeFromChildNodes } from "./utilities/node";
 
 export default class MetaSubstitution {
   constructor(metavariableName, nodes) {
@@ -19,34 +19,34 @@ export default class MetaSubstitution {
   matchNodes(nodes) {
     let matches;
 
-    const metaSubstitutionNodes = this.nodes,  ///
-          metaSubstitutionNonTerminalNodeMatches = matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes);
+    const nodesA = this.nodes,  ///
+          nodesB = nodes,
+          metaSubstitutionNodesMatch = matchNodes(nodesA, nodesB);
 
-    matches = metaSubstitutionNonTerminalNodeMatches;  ///
+    matches = metaSubstitutionNodesMatch;  ///
 
     if (!matches) {
       const childNodes = nodes, ///
-            bracketedMetastatementChildNodeMatches = matchBracketedMetastatementChildNode(childNodes, (bracketedMetastatementChildNode) => {
-              const nonTerminalNode = bracketedMetastatementChildNode,  ///
-                    childNodes = nonTerminalNode.getChildNodes(),
-                    nodes = childNodes, ///
-                    metaAssertionNonTerminalNodeMatches = matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes),
-                    bracketedMetastatementChildNodeMatches = metaAssertionNonTerminalNodeMatches; ///
+            bracketedChildNode = bracketedChildNodeFromChildNodes(childNodes);
 
-              return bracketedMetastatementChildNodeMatches;
-            });
+      if (bracketedChildNode !== null) {
+        const nonTerminalNode = bracketedChildNode,  ///
+              childNodes = nonTerminalNode.getChildNodes(),
+              nodesB = childNodes, ///
+              nodesMatch = matchNodes(nodesA, nodesB);
 
-      matches = bracketedMetastatementChildNodeMatches; ///
+        matches = nodesMatch; ///
+      }
     }
 
     return matches;
   }
 
   static fromMetavariableNameAndNodes(metavariableName, nodes) {
-    const bracketedMetastatementChildNode = bracketedMetastatementChildNodeFromChildNodes(nodes);
+    const bracketedChildNode = bracketedChildNodeFromChildNodes(nodes);
 
-    if (bracketedMetastatementChildNode !== null) {
-      const nonTerminalNode = bracketedMetastatementChildNode,  ///
+    if (bracketedChildNode !== null) {
+      const nonTerminalNode = bracketedChildNode,  ///
             childNodes = nonTerminalNode.getChildNodes();
 
       nodes = childNodes; ///
@@ -57,74 +57,3 @@ export default class MetaSubstitution {
     return metaSubstitution;
   }
 }
-
-function matchMetaSubstitutionNode(metaSubstitutionNode, node) {
-  let metaSubstitutionNodeMatches = false;
-
-  const nodeTerminalNode = node.isTerminalNode(),
-        ruleNodeTerminalNode = metaSubstitutionNode.isTerminalNode();
-
-  if (nodeTerminalNode === ruleNodeTerminalNode) {
-    if (nodeTerminalNode) {
-      const terminalNode = node,  ///
-            metaSubstitutionTerminalNode = metaSubstitutionNode,  ///
-            metaSubstitutionTerminalNodeMatches = matchMetaSubstitutionTerminalNode(metaSubstitutionTerminalNode, terminalNode);
-
-      metaSubstitutionNodeMatches = metaSubstitutionTerminalNodeMatches;  ///
-    } else {
-      const nonTerminalNode = node, ///
-            metaSubstitutionNonTerminalNode = metaSubstitutionNode,  ///
-            metaSubstitutionNonTerminalNodeMatches = matchMetaSubstitutionNonTerminalNode(metaSubstitutionNonTerminalNode, nonTerminalNode);
-
-      metaSubstitutionNodeMatches = metaSubstitutionNonTerminalNodeMatches; ///
-    }
-  }
-
-  return metaSubstitutionNodeMatches;
-}
-
-function matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes) {
-  let metaSubstitutionNodesMatches = false;
-
-  const nodesLength = nodes.length,
-        metaSubstitutionNodesLength = metaSubstitutionNodes.length;
-
-  if (nodesLength === metaSubstitutionNodesLength) {
-    metaSubstitutionNodesMatches = nodes.every((node, index) => {
-      const metaSubstitutionNode = metaSubstitutionNodes[index],
-            metaSubstitutionNodeMatches = matchMetaSubstitutionNode(metaSubstitutionNode, node);
-
-      if (metaSubstitutionNodeMatches) {
-        return true;
-      }
-    })
-  }
-
-  return metaSubstitutionNodesMatches;
-}
-
-function matchMetaSubstitutionTerminalNode(metaSubstitutionTerminalNode, terminalNode) {
-  const matches = metaSubstitutionTerminalNode.match(terminalNode),
-        metaSubstitutionTerminalNodeMatches = matches;  ///
-
-  return metaSubstitutionTerminalNodeMatches;
-}
-
-function matchMetaSubstitutionNonTerminalNode(metaSubstitutionNonTerminalNode, nonTerminalNode) {
-  let metaSubstitutionNonTerminalNodeMatches = false;
-
-  const ruleName = nonTerminalNode.getRuleName(),
-        metaSubstitutionRuleName = metaSubstitutionNonTerminalNode.getRuleName(); ///
-
-  if (ruleName === metaSubstitutionRuleName) {
-    const childNodes = nonTerminalNode.getChildNodes(),
-          metaSubstitutionChildNodes = metaSubstitutionNonTerminalNode.getChildNodes(),
-          nodes = childNodes, ///
-          metaSubstitutionNodes = metaSubstitutionChildNodes, ///
-          metaSubstitutionNodesMatches = matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes);
-
-    metaSubstitutionNonTerminalNodeMatches = metaSubstitutionNodesMatches; ///
-  }
-
-  return metaSubstitutionNonTerminalNodeMatches;
-}

package/src/step/metaproof.js

@@ -2,8 +2,7 @@
 
 import { first, second } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
-
-import { matchTopmostMetaAssertionMetastatementNode } from "../utilities/metaAssertion";
+import { matchBracketedNonTerminalNode } from "../utilities/node";
 
 const metastatementNodesQuery = nodesQuery("/metaSubproofAssertion/metastatement"),
       metaSubproofAssertionNodeQuery = nodeQuery("/metastatement/metaSubproofAssertion"),
@@ -45,10 +44,10 @@ export default class MetaproofStep {
     let metastatementsMatch = false;
 
     if (this.metastatementNode !== null) {
-      const topmostMetastatementNode = metastatementNode, ///
-            topmostMetaAssertionMetastatementNode = this.metastatementNode,  ///
-            topmostMetaAssertionMetastatementNodeMatches = matchTopmostMetaAssertionMetastatementNode(topmostMetaAssertionMetastatementNode, topmostMetastatementNode),
-            metastatementNodeMatches = topmostMetaAssertionMetastatementNodeMatches;  ///
+      const nonTerminalNodeA = metastatementNode, ///
+            nonTerminalNodeB = this.metastatementNode,  ///
+            bracketedNodeMatches = matchBracketedNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB),
+            metastatementNodeMatches = bracketedNodeMatches;  ///
 
       return metastatementNodeMatches;
     }
@@ -65,19 +64,19 @@ export default class MetaproofStep {
             qualifiedOrUnqualifiedMetastatementMetastatementNodes = qualifiedOrUnqualifiedMetastatementMetastatementNodesQuery(this.metaSubproofNode),
             firstQualifiedOrUnqualifiedMetastatementMetastatementNode = first(qualifiedOrUnqualifiedMetastatementMetastatementNodes);
 
-      const topmostMetastatementNode = firstMetaSubproofAssertionMetastatementNode,  ///
-            topmostMetaAssertionMetastatementNode = firstQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
-            topmostMetaAssertionMetastatementNodeMatches = matchTopmostMetaAssertionMetastatementNode(topmostMetaAssertionMetastatementNode, topmostMetastatementNode);
+      const nonTerminalNodeA = firstMetaSubproofAssertionMetastatementNode,  ///
+            nonTerminalNodeB = firstQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
+            bracketedNodeMatches = matchBracketedNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB);
 
-      if (topmostMetaAssertionMetastatementNodeMatches) {
+      if (bracketedNodeMatches) {
         const secondMetaSubproofAssertionMetastatementNode = second(metaSubproofAssertionMetastatementNodes),
               secondQualifiedOrUnqualifiedMetastatementMetastatementNode = second(qualifiedOrUnqualifiedMetastatementMetastatementNodes);
 
-        const topmostMetastatementNode = secondMetaSubproofAssertionMetastatementNode, ///
-              topmostMetaAssertionMetastatementNode = secondQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
-              topmostMetaAssertionMetastatementNodeMatches = matchTopmostMetaAssertionMetastatementNode(topmostMetaAssertionMetastatementNode, topmostMetastatementNode);
+        const nonTerminalNodeA = secondMetaSubproofAssertionMetastatementNode, ///
+              nonTerminalNodeB = secondQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
+              bracketedNodeMatches = matchBracketedNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB);
 
-        metaSubproofAssertionMatches = topmostMetaAssertionMetastatementNodeMatches; ///
+        metaSubproofAssertionMatches = bracketedNodeMatches; ///
       }
     }
 

package/src/substitution.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { matchBracketedStatementChildNode, bracketedStatementChildNodeFromChildNodes } from "./utilities/statement";
+import { matchNodes, bracketedChildNodeFromChildNodes } from "./utilities/node";
 
 export default class Substitution {
   constructor(variableName, nodes) {
@@ -19,112 +19,41 @@ export default class Substitution {
   matchNodes(nodes) {
     let matches;
 
-    const substitutionNodes = this.nodes,  ///
-          substitutionNonTerminalNodeMatches = matchSubstitutionNodes(substitutionNodes, nodes);
+    const nodesA = this.nodes,  ///
+          nodesB = nodes,
+          metaSubstitutionNodesMatch = matchNodes(nodesA, nodesB);
 
-    matches = substitutionNonTerminalNodeMatches;  ///
+    matches = metaSubstitutionNodesMatch;  ///
 
     if (!matches) {
       const childNodes = nodes, ///
-            bracketedStatementChildNodeMatches = matchBracketedStatementChildNode(childNodes, (bracketedStatementChildNode) => {
-              const nonTerminalNode = bracketedStatementChildNode,  ///
-                    childNodes = nonTerminalNode.getChildNodes(),
-                    nodes = childNodes, ///
-                    assertionNonTerminalNodeMatches = matchSubstitutionNodes(substitutionNodes, nodes),
-                    bracketedStatementChildNodeMatches = assertionNonTerminalNodeMatches; ///
+            bracketedChildNode = bracketedChildNodeFromChildNodes(childNodes);
 
-              return bracketedStatementChildNodeMatches;
-            });
+      if (bracketedChildNode !== null) {
+        const nonTerminalNode = bracketedChildNode,  ///
+              childNodes = nonTerminalNode.getChildNodes(),
+              nodesB = childNodes, ///
+              nodesMatch = matchNodes(nodesA, nodesB);
 
-      matches = bracketedStatementChildNodeMatches; ///
+        matches = nodesMatch; ///
+      }
     }
 
     return matches;
   }
 
-  static fromVariableNameAndNodes(variableName, nodes) {
-    const bracketedStatementChildNode = bracketedStatementChildNodeFromChildNodes(nodes);
+  static fromMetavariableNameAndNodes(variableName, nodes) {
+    const bracketedChildNode = bracketedChildNodeFromChildNodes(nodes);
 
-    if (bracketedStatementChildNode !== null) {
-      const nonTerminalNode = bracketedStatementChildNode,  ///
+    if (bracketedChildNode !== null) {
+      const nonTerminalNode = bracketedChildNode,  ///
             childNodes = nonTerminalNode.getChildNodes();
 
       nodes = childNodes; ///
     }
 
-    const substitution = new Substitution(variableName, nodes);
-
-    return substitution;
-  }
-}
-
-function matchSubstitutionNode(substitutionNode, node) {
-  let substitutionNodeMatches = false;
-
-  const nodeTerminalNode = node.isTerminalNode(),
-        ruleNodeTerminalNode = substitutionNode.isTerminalNode();
-
-  if (nodeTerminalNode === ruleNodeTerminalNode) {
-    if (nodeTerminalNode) {
-      const terminalNode = node,  ///
-            substitutionTerminalNode = substitutionNode,  ///
-            substitutionTerminalNodeMatches = matchSubstitutionTerminalNode(substitutionTerminalNode, terminalNode);
-
-      substitutionNodeMatches = substitutionTerminalNodeMatches;  ///
-    } else {
-      const nonTerminalNode = node, ///
-            substitutionNonTerminalNode = substitutionNode,  ///
-            substitutionNonTerminalNodeMatches = matchSubstitutionNonTerminalNode(substitutionNonTerminalNode, nonTerminalNode);
-
-      substitutionNodeMatches = substitutionNonTerminalNodeMatches; ///
-    }
-  }
-
-  return substitutionNodeMatches;
-}
-
-function matchSubstitutionNodes(substitutionNodes, nodes) {
-  let substitutionNodesMatches = false;
+    const metaSubstitution = new Substitution(variableName, nodes);
 
-  const nodesLength = nodes.length,
-        substitutionNodesLength = substitutionNodes.length;
-
-  if (nodesLength === substitutionNodesLength) {
-    substitutionNodesMatches = nodes.every((node, index) => {
-      const substitutionNode = substitutionNodes[index],
-            substitutionNodeMatches = matchSubstitutionNode(substitutionNode, node);
-
-      if (substitutionNodeMatches) {
-        return true;
-      }
-    })
-  }
-
-  return substitutionNodesMatches;
-}
-
-function matchSubstitutionTerminalNode(substitutionTerminalNode, terminalNode) {
-  const matches = substitutionTerminalNode.match(terminalNode),
-        substitutionTerminalNodeMatches = matches;  ///
-
-  return substitutionTerminalNodeMatches;
-}
-
-function matchSubstitutionNonTerminalNode(substitutionNonTerminalNode, nonTerminalNode) {
-  let substitutionNonTerminalNodeMatches = false;
-
-  const ruleName = nonTerminalNode.getRuleName(),
-        substitutionRuleName = substitutionNonTerminalNode.getRuleName(); ///
-
-  if (ruleName === substitutionRuleName) {
-    const childNodes = nonTerminalNode.getChildNodes(),
-          substitutionChildNodes = substitutionNonTerminalNode.getChildNodes(),
-          nodes = childNodes, ///
-          substitutionNodes = substitutionChildNodes, ///
-          substitutionNodesMatches = matchSubstitutionNodes(substitutionNodes, nodes);
-
-    substitutionNonTerminalNodeMatches = substitutionNodesMatches; ///
+    return metaSubstitution;
   }
-
-  return substitutionNonTerminalNodeMatches;
 }

package/src/utilities/node.js

@@ -1,5 +1,9 @@
 "use strict";
 
+import { first, second, third } from "./array";
+import { METASTATEMENT_RULE_NAME } from "../ruleNames";
+import { BRACKETED_CHILD_NODES_LENGTH, LEFT_BRACKET, RIGHT_BRACKET } from "../constants";
+
 export function matchNode(nodeA, nodeB) {
   let nodeMatches = false;
 
@@ -25,7 +29,7 @@ export function matchNode(nodeA, nodeB) {
   return nodeMatches;
 }
 
-function matchNodes(nodesA, nodesB) {
+export function matchNodes(nodesA, nodesB) {
   let nodesMatch = false;
 
   const nodesALength = nodesA.length,
@@ -45,6 +49,79 @@ function matchNodes(nodesA, nodesB) {
   return nodesMatch;
 }
 
+export function matchBracketedNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB) {
+  let bracketedNodeMatches = false;
+
+  if (!bracketedNodeMatches) {
+    const nonTerminalNodeMatches = matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB);
+
+    bracketedNodeMatches = nonTerminalNodeMatches;  ///
+  }
+
+  if (!bracketedNodeMatches) {
+    const nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(),
+          childNodesA = nonTerminalNodeAChildNodes, ///
+          bracketedChildNodeA = bracketedChildNodeFromChildNodes(childNodesA);
+
+    if (bracketedChildNodeA !== null) {
+      const nodeA = bracketedChildNodeA,  ///
+            nodeB = nonTerminalNodeB, ///
+            nodeMatches = matchNode(nodeA, nodeB);
+
+      bracketedNodeMatches = nodeMatches; ///
+    }
+  }
+
+  if (!bracketedNodeMatches) {
+    const nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(),
+          childNodesB = nonTerminalNodeBChildNodes, ///
+          bracketedChildNodeB = bracketedChildNodeFromChildNodes(childNodesB);
+
+    if (bracketedChildNodeB !== null) {
+      const nodeB = bracketedChildNodeB,  ///
+            nodeA = nonTerminalNodeA, ///
+            nodeMatches = matchNode(nodeA, nodeB);
+
+      bracketedNodeMatches = nodeMatches; ///
+    }
+  }
+
+  return bracketedNodeMatches;
+}
+
+export function bracketedChildNodeFromChildNodes(childNodes) {
+  let bracketedChildNode = null;
+
+  const childNodesLength = childNodes.length;
+
+  if (childNodesLength === BRACKETED_CHILD_NODES_LENGTH) {
+    const firstChildNode = first(childNodes),
+          thirdChildNode = third(childNodes),
+          secondChildNode = second(childNodes),
+          firstChildNodeTerminalNode = firstChildNode.isTerminalNode(),
+          thirdChildNodeTerminalNode = thirdChildNode.isTerminalNode(),
+          secondChildNodeNonTerminalNode = secondChildNode.isNonTerminalNode();
+
+    if (firstChildNodeTerminalNode && secondChildNodeNonTerminalNode && thirdChildNodeTerminalNode) {
+      const nonTerminalNode = secondChildNode,  ///
+            firstTerminalNode = firstChildNode, ///
+            secondTerminalNode = thirdChildNode,  ///
+            nonTerminalNodeRuleName = nonTerminalNode.getRuleName(),
+            firstTerminalNodeContent = firstTerminalNode.getContent(),
+            secondTerminalNodeContent = secondTerminalNode.getContent(),
+            firstTerminalNodeContentLeftBracket = (firstTerminalNodeContent === LEFT_BRACKET),
+            secondTerminalNodeContentRightBracket = (secondTerminalNodeContent === RIGHT_BRACKET),
+            nonTerminalNodeRuleNameMetastatementRuleName = (nonTerminalNodeRuleName === METASTATEMENT_RULE_NAME);
+
+      if (firstTerminalNodeContentLeftBracket && nonTerminalNodeRuleNameMetastatementRuleName && secondTerminalNodeContentRightBracket) {
+        bracketedChildNode = nonTerminalNode;  ///
+      }
+    }
+  }
+
+  return bracketedChildNode;
+}
+
 function matchTerminalNode(terminalNodeA, terminalNodeB) {
   const matches = terminalNodeA.match(terminalNodeB),
         terminalNodeMatches = matches;  ///

package/src/utilities/releaseContext.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { last } from "../utilities/array";
+
 export function createReleaseContext(dependency, dependentNames, context, callback) {
   const { releaseContextMap } = context,
         dependencyName = dependency.getName(),
@@ -25,9 +27,9 @@ export function createReleaseContext(dependency, dependentNames, context, callba
 
     releaseContextMap[releaseName] = releaseContext;
 
-    if (releaseContext === null) {
-      const { log } = context;
+    const { log } = context;
 
+    if (releaseContext === null) {
       log.error(`The '${releaseName}' package could not be created.`);
 
       callback(error);
@@ -35,6 +37,26 @@ export function createReleaseContext(dependency, dependentNames, context, callba
       return;
     }
 
+    const releaseMatchesDependency = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context);
+
+    if (!releaseMatchesDependency) {
+      const version = releaseContext.getVersion(),
+            versionString = version.toString(),
+            lastDependentName = last(dependentNames),
+            dependentName = lastDependentName,  ///
+            dependencyName = dependency.getName(),
+            shortenedVersion = dependency.getShortedVersion(),
+            shortenedVersionString = shortenedVersion.toString();
+
+      error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;
+
+      log.error(error);
+
+      callback(error);
+
+      return;
+    }
+
     createDependencyReleaseContexts(dependency, dependentNames, context, callback);
   }, context);
 }
@@ -107,6 +129,23 @@ function checkCyclicDependencyExists(dependency, dependentNames, context) {
   return cyclicDependencyExists;
 }
 
+function checkReleaseMatchesDependency(dependency, dependentNames, releaseContext, context) {
+  let releaseMatchesDependency = true;
+
+  const entries = releaseContext.getEntries(),
+        shortenedVersion = dependency.getShortedVersion();
+
+  if (shortenedVersion !== null) {
+    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);
+
+    if (!entriesMatchShortenedVersion) {
+      releaseMatchesDependency = false;
+    }
+  }
+
+  return releaseMatchesDependency;
+}
+
 function createDependencyReleaseContexts(dependency, dependentNames, context, callback) {
   const { releaseContextMap } = context,
         dependencyName = dependency.getName(),

package/src/verify/derivation.js

@@ -14,14 +14,11 @@ const statementNodeQuery = nodeQuery("/qualifiedStatement|unqualifiedStatement/s
       unqualifiedStatementNodesQuery = nodesQuery("/subproof/unqualifiedStatement")
 
 export default function verifyDerivation(derivationNode, proofContext) {
-  let derivationVerified,
-      derived;
+  let derivationVerified;
 
   proofContext.begin(derivationNode);
 
-  derived = true;
-
-  proofContext.setDerived(derived);
+  proofContext.setDerived();
 
   const derivationChildNodes = derivationChildNodesQuery(derivationNode);
 
@@ -33,9 +30,7 @@ export default function verifyDerivation(derivationNode, proofContext) {
     }
   });
 
-  derived = false;
-
-  proofContext.setDerived(derived);
+  proofContext.setDerived();
 
   derivationVerified ?
     proofContext.complete(derivationNode) :

package/src/verify/metaDerivation.js

@@ -14,14 +14,11 @@ const metastatementNodeQuery = nodeQuery("/qualifiedMetastatement|unqualifiedMet
       unqualifiedMetastatementNodesQuery = nodesQuery("/metaSubproof/unqualifiedMetastatement")
 
 export default function verifyMetaDerivation(metaDerivationNode, metaproofContext) {
-  let metaDerivationVerified,
-      derived;
+  let metaDerivationVerified;
 
   metaproofContext.begin(metaDerivationNode);
 
-  derived = true;
-
-  metaproofContext.setDerived(derived);
+  metaproofContext.setDerived();
 
   const metaDerivationChildNodes = metaDerivationChildNodesQuery(metaDerivationNode);
 
@@ -33,9 +30,7 @@ export default function verifyMetaDerivation(metaDerivationNode, metaproofContex
     }
   });
 
-  derived = false;
-
-  metaproofContext.setDerived(derived);
+  metaproofContext.resetDerived();
 
   metaDerivationVerified ?
     metaproofContext.complete(metaDerivationNode) :