occam-verify-cli 0.0.469 → 0.0.471

package/lib/verify/proof.js

@@ -8,19 +8,19 @@ Object.defineProperty(exports, "default", {
         return verifyProof;
     }
 });
-var _proof = /*#__PURE__*/ _interopRequireDefault(require("../context/proof"));
+var _proof = /*#__PURE__*/ _interopRequireDefault(require("../step/proof"));
 var _derivation = /*#__PURE__*/ _interopRequireDefault(require("../verify/derivation"));
-var _qualified = /*#__PURE__*/ _interopRequireDefault(require("../verify/statement/qualified"));
+var _qualified = /*#__PURE__*/ _interopRequireDefault(require("./statement/qualified"));
+var _node = require("../utilities/node");
 var _query = require("../utilities/query");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-var derivationNodeQuery = (0, _query.nodeQuery)("/proof/derivation!"), qualifiedStatementNodeQuery = (0, _query.nodeQuery)("/proof/qualifiedStatement!");
-function verifyProof(proofNode, fileContext) {
+var statementNodeQuery = (0, _query.nodeQuery)("/qualifiedStatement/statement!"), derivationNodeQuery = (0, _query.nodeQuery)("/proof/derivation!"), qualifiedStatementNodeQuery = (0, _query.nodeQuery)("/proof/qualifiedStatement!");
+function verifyProof(proofNode, conclusion, proofContext) {
     var proofVerified = false;
-    var proofContext = _proof.default.fromFileContext(fileContext);
     proofContext.begin(proofNode);
     var derivationNode = derivationNodeQuery(proofNode), qualifiedStatementNode = qualifiedStatementNodeQuery(proofNode);
     var derivationVerified = false, qualifiedStatementVerified = false;
@@ -34,65 +34,17 @@ function verifyProof(proofNode, fileContext) {
         qualifiedStatementVerified = (0, _qualified.default)(qualifiedStatementNode, proofContext);
         derived = false;
         proofContext.setDerived(derived);
-    }
-    // if (derivationVerified) {
-    //   const qualifiedStatementNode = qualifiedStatementNodeQuery(proofNode),
-    //         qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, proofContext);
-    //
-    //   if (qualifiedStatementVerified) {
-    //     const statementNode = conclusion.getStatementNode(),
-    //           proofStatementNode = proofStatementNodeQuery(proofNode),
-    //           proofStatementNodeMatches = matchProofStatementNode(proofStatementNode, statementNode);
-    //
-    //     proofVerified = proofStatementNodeMatches;  ///
-    //   }
-    // }
-    proofVerified ? proofContext.complete(proofNode) : proofContext.complete(proofNode);
-    return proofVerified;
-}
-function matchProofStatementNode(proofStatementNode, statementNode) {
-    var proofNonTerminalNode = proofStatementNode, nonTerminalNode = statementNode, proofNonTerminalNodeMatches = matchProofNonTerminalNode(proofNonTerminalNode, nonTerminalNode), proofStatementNodeMatches = proofNonTerminalNodeMatches; ///
-    return proofStatementNodeMatches;
-}
-function matchProofNode(proofNode, node) {
-    var proofNodeMatches = false;
-    var nodeTerminalNode = node.isTerminalNode(), ruleNodeTerminalNode = proofNode.isTerminalNode();
-    if (nodeTerminalNode === ruleNodeTerminalNode) {
-        if (nodeTerminalNode) {
-            var terminalNode = node, proofTerminalNode = proofNode, proofTerminalNodeMatches = matchProofTerminalNode(proofTerminalNode, terminalNode);
-            proofNodeMatches = proofTerminalNodeMatches; ///
-        } else {
-            var nonTerminalNode = node, proofNonTerminalNode = proofNode, proofNonTerminalNodeMatches = matchProofNonTerminalNode(proofNonTerminalNode, nonTerminalNode);
-            proofNodeMatches = proofNonTerminalNodeMatches; ///
+        if (qualifiedStatementVerified) {
+            var statementNode = statementNodeQuery(qualifiedStatementNode), proofStep = _proof.default.fromStatementNode(statementNode);
+            proofContext.addProofStep(proofStep);
         }
     }
-    return proofNodeMatches;
-}
-function matchProofNodes(proofNodes, nodes) {
-    var proofNodesMatches = false;
-    var nodesLength = nodes.length, proofNodesLength = proofNodes.length;
-    if (nodesLength === proofNodesLength) {
-        proofNodesMatches = nodes.every(function(node, index) {
-            var proofNode = proofNodes[index], proofNodeMatches = matchProofNode(proofNode, node);
-            if (proofNodeMatches) {
-                return true;
-            }
-        });
+    if (derivationVerified || qualifiedStatementVerified) {
+        var lastProofStep = proofContext.getLastProofStep(), proofStep1 = lastProofStep, statementNode1 = proofStep1.getStatementNode(), conclusionStatementNode = conclusion.getStatementNode(), nodeA = statementNode1, nodeB = conclusionStatementNode, nodeMatches = (0, _node.matchNode)(nodeA, nodeB);
+        proofVerified = nodeMatches; ///
     }
-    return proofNodesMatches;
-}
-function matchProofTerminalNode(proofTerminalNode, terminalNode) {
-    var matches = proofTerminalNode.match(terminalNode), proofTerminalNodeMatches = matches; ///
-    return proofTerminalNodeMatches;
-}
-function matchProofNonTerminalNode(proofNonTerminalNode, nonTerminalNode) {
-    var proofNonTerminalNodeMatches = false;
-    var ruleName = nonTerminalNode.getRuleName(), proofRuleName = proofNonTerminalNode.getRuleName(); ///
-    if (ruleName === proofRuleName) {
-        var childNodes = nonTerminalNode.getChildNodes(), proofChildNodes = proofNonTerminalNode.getChildNodes(), nodes = childNodes, proofNodes = proofChildNodes, proofNodesMatches = matchProofNodes(proofNodes, nodes);
-        proofNonTerminalNodeMatches = proofNodesMatches; ///
-    }
-    return proofNonTerminalNodeMatches;
+    proofVerified ? proofContext.complete(proofNode) : proofContext.complete(proofNode);
+    return proofVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/proof.js"],"sourcesContent":["\"use strict\";\n\nimport ProofContext from \"../context/proof\";\nimport verifyDerivation from \"../verify/derivation\";\nimport verifyQualifiedStatement from \"../verify/statement/qualified\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst derivationNodeQuery = nodeQuery(\"/proof/derivation!\"),\n      qualifiedStatementNodeQuery = nodeQuery(\"/proof/qualifiedStatement!\");\n\nexport default function verifyProof(proofNode, fileContext) {\n  let proofVerified = false;\n\n  const proofContext = ProofContext.fromFileContext(fileContext);\n\n  proofContext.begin(proofNode);\n\n  const derivationNode = derivationNodeQuery(proofNode),\n        qualifiedStatementNode = qualifiedStatementNodeQuery(proofNode);\n\n  let derivationVerified = false,\n      qualifiedStatementVerified = false;\n\n  if (derivationNode !== null) {\n    derivationVerified = verifyDerivation(derivationNode, proofContext);\n  }\n\n  if (qualifiedStatementNode !== null) {\n    let derived;\n\n    derived = true;\n\n    proofContext.setDerived(derived);\n\n    qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, proofContext);\n\n    derived = false;\n\n    proofContext.setDerived(derived);\n  }\n\n  // if (derivationVerified) {\n  //   const qualifiedStatementNode = qualifiedStatementNodeQuery(proofNode),\n  //         qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, proofContext);\n  //\n  //   if (qualifiedStatementVerified) {\n  //     const statementNode = conclusion.getStatementNode(),\n  //           proofStatementNode = proofStatementNodeQuery(proofNode),\n  //           proofStatementNodeMatches = matchProofStatementNode(proofStatementNode, statementNode);\n  //\n  //     proofVerified = proofStatementNodeMatches;  ///\n  //   }\n  // }\n\n  proofVerified ?\n    proofContext.complete(proofNode) :\n      proofContext.complete(proofNode);\n\n  return proofVerified;\n}\n\nfunction matchProofStatementNode(proofStatementNode, statementNode) {\n  const proofNonTerminalNode = proofStatementNode,  ///\n        nonTerminalNode = statementNode,  ///\n        proofNonTerminalNodeMatches = matchProofNonTerminalNode(proofNonTerminalNode, nonTerminalNode),\n        proofStatementNodeMatches = proofNonTerminalNodeMatches;  ///\n\n  return proofStatementNodeMatches;\n}\n\nfunction matchProofNode(proofNode, node) {\n  let proofNodeMatches = false;\n\n  const nodeTerminalNode = node.isTerminalNode(),\n        ruleNodeTerminalNode = proofNode.isTerminalNode();\n\n  if (nodeTerminalNode === ruleNodeTerminalNode) {\n    if (nodeTerminalNode) {\n      const terminalNode = node,  ///\n            proofTerminalNode = proofNode,  ///\n            proofTerminalNodeMatches = matchProofTerminalNode(proofTerminalNode, terminalNode);\n\n      proofNodeMatches = proofTerminalNodeMatches;  ///\n    } else {\n      const nonTerminalNode = node, ///\n            proofNonTerminalNode = proofNode,  ///\n            proofNonTerminalNodeMatches = matchProofNonTerminalNode(proofNonTerminalNode, nonTerminalNode);\n\n      proofNodeMatches = proofNonTerminalNodeMatches; ///\n    }\n  }\n\n  return proofNodeMatches;\n}\n\nfunction matchProofNodes(proofNodes, nodes) {\n  let proofNodesMatches = false;\n\n  const nodesLength = nodes.length,\n        proofNodesLength = proofNodes.length;\n\n  if (nodesLength === proofNodesLength) {\n    proofNodesMatches = nodes.every((node, index) => {\n      const proofNode = proofNodes[index],\n            proofNodeMatches = matchProofNode(proofNode, node);\n\n      if (proofNodeMatches) {\n        return true;\n      }\n    })\n  }\n\n  return proofNodesMatches;\n}\n\nfunction matchProofTerminalNode(proofTerminalNode, terminalNode) {\n  const matches = proofTerminalNode.match(terminalNode),\n        proofTerminalNodeMatches = matches;  ///\n\n  return proofTerminalNodeMatches;\n}\n\nfunction matchProofNonTerminalNode(proofNonTerminalNode, nonTerminalNode) {\n  let proofNonTerminalNodeMatches = false;\n\n  const ruleName = nonTerminalNode.getRuleName(),\n        proofRuleName = proofNonTerminalNode.getRuleName(); ///\n\n  if (ruleName === proofRuleName) {\n    const childNodes = nonTerminalNode.getChildNodes(),\n          proofChildNodes = proofNonTerminalNode.getChildNodes(),\n          nodes = childNodes, ///\n          proofNodes = proofChildNodes, ///\n          proofNodesMatches = matchProofNodes(proofNodes, nodes);\n\n    proofNonTerminalNodeMatches = proofNodesMatches; ///\n  }\n\n  return proofNonTerminalNodeMatches;\n}\n"],"names":["verifyProof","derivationNodeQuery","nodeQuery","qualifiedStatementNodeQuery","proofNode","fileContext","proofVerified","proofContext","ProofContext","fromFileContext","begin","derivationNode","qualifiedStatementNode","derivationVerified","qualifiedStatementVerified","verifyDerivation","derived","setDerived","verifyQualifiedStatement","complete","matchProofStatementNode","proofStatementNode","statementNode","proofNonTerminalNode","nonTerminalNode","proofNonTerminalNodeMatches","matchProofNonTerminalNode","proofStatementNodeMatches","matchProofNode","node","proofNodeMatches","nodeTerminalNode","isTerminalNode","ruleNodeTerminalNode","terminalNode","proofTerminalNode","proofTerminalNodeMatches","matchProofTerminalNode","matchProofNodes","proofNodes","nodes","proofNodesMatches","nodesLength","length","proofNodesLength","every","index","matches","match","ruleName","getRuleName","proofRuleName","childNodes","getChildNodes","proofChildNodes"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBQcm9vZlN0ZXAgZnJvbSBcIi4uL3N0ZXAvcHJvb2ZcIjtcbmltcG9ydCB2ZXJpZnlEZXJpdmF0aW9uIGZyb20gXCIuLi92ZXJpZnkvZGVyaXZhdGlvblwiO1xuaW1wb3J0IHZlcmlmeVF1YWxpZmllZFN0YXRlbWVudCBmcm9tIFwiLi9zdGF0ZW1lbnQvcXVhbGlmaWVkXCI7XG5cbmltcG9ydCB7IG1hdGNoTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvbm9kZVwiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcXVhbGlmaWVkU3RhdGVtZW50L3N0YXRlbWVudCFcIiksXG4gICAgICBkZXJpdmF0aW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Byb29mL2Rlcml2YXRpb24hXCIpLFxuICAgICAgcXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Byb29mL3F1YWxpZmllZFN0YXRlbWVudCFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVByb29mKHByb29mTm9kZSwgY29uY2x1c2lvbiwgcHJvb2ZDb250ZXh0KSB7XG4gIGxldCBwcm9vZlZlcmlmaWVkID0gZmFsc2U7XG5cbiAgcHJvb2ZDb250ZXh0LmJlZ2luKHByb29mTm9kZSk7XG5cbiAgY29uc3QgZGVyaXZhdGlvbk5vZGUgPSBkZXJpdmF0aW9uTm9kZVF1ZXJ5KHByb29mTm9kZSksXG4gICAgICAgIHF1YWxpZmllZFN0YXRlbWVudE5vZGUgPSBxdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkocHJvb2ZOb2RlKTtcblxuICBsZXQgZGVyaXZhdGlvblZlcmlmaWVkID0gZmFsc2UsXG4gICAgICBxdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGlmIChkZXJpdmF0aW9uTm9kZSAhPT0gbnVsbCkge1xuICAgIGRlcml2YXRpb25WZXJpZmllZCA9IHZlcmlmeURlcml2YXRpb24oZGVyaXZhdGlvbk5vZGUsIHByb29mQ29udGV4dCk7XG4gIH1cblxuICBpZiAocXVhbGlmaWVkU3RhdGVtZW50Tm9kZSAhPT0gbnVsbCkge1xuICAgIGxldCBkZXJpdmVkO1xuXG4gICAgZGVyaXZlZCA9IHRydWU7XG5cbiAgICBwcm9vZkNvbnRleHQuc2V0RGVyaXZlZChkZXJpdmVkKTtcblxuICAgIHF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5UXVhbGlmaWVkU3RhdGVtZW50KHF1YWxpZmllZFN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBkZXJpdmVkID0gZmFsc2U7XG5cbiAgICBwcm9vZkNvbnRleHQuc2V0RGVyaXZlZChkZXJpdmVkKTtcblxuICAgIGlmIChxdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeShxdWFsaWZpZWRTdGF0ZW1lbnROb2RlKSxcbiAgICAgICAgICAgIHByb29mU3RlcCA9IFByb29mU3RlcC5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKTtcblxuICAgICAgcHJvb2ZDb250ZXh0LmFkZFByb29mU3RlcChwcm9vZlN0ZXApO1xuICAgIH1cbiAgfVxuXG4gIGlmIChkZXJpdmF0aW9uVmVyaWZpZWQgfHwgcXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBsYXN0UHJvb2ZTdGVwID0gcHJvb2ZDb250ZXh0LmdldExhc3RQcm9vZlN0ZXAoKSxcbiAgICAgICAgICBwcm9vZlN0ZXAgPSBsYXN0UHJvb2ZTdGVwLCAvLy9cbiAgICAgICAgICBzdGF0ZW1lbnROb2RlID0gcHJvb2ZTdGVwLmdldFN0YXRlbWVudE5vZGUoKSxcbiAgICAgICAgICBjb25jbHVzaW9uU3RhdGVtZW50Tm9kZSA9IGNvbmNsdXNpb24uZ2V0U3RhdGVtZW50Tm9kZSgpLFxuICAgICAgICAgIG5vZGVBID0gc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vZGVCID0gY29uY2x1c2lvblN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub2RlTWF0Y2hlcyA9IG1hdGNoTm9kZShub2RlQSwgbm9kZUIpO1xuXG4gICAgcHJvb2ZWZXJpZmllZCA9IG5vZGVNYXRjaGVzOyAgLy8vXG4gIH1cblxuICBwcm9vZlZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUocHJvb2ZOb2RlKSA6XG4gICAgICBwcm9vZkNvbnRleHQuY29tcGxldGUocHJvb2ZOb2RlKTtcblxuICByZXR1cm4gcHJvb2ZWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlQcm9vZiIsInN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsImRlcml2YXRpb25Ob2RlUXVlcnkiLCJxdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkiLCJwcm9vZk5vZGUiLCJjb25jbHVzaW9uIiwicHJvb2ZDb250ZXh0IiwicHJvb2ZWZXJpZmllZCIsImJlZ2luIiwiZGVyaXZhdGlvbk5vZGUiLCJxdWFsaWZpZWRTdGF0ZW1lbnROb2RlIiwiZGVyaXZhdGlvblZlcmlmaWVkIiwicXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlEZXJpdmF0aW9uIiwiZGVyaXZlZCIsInNldERlcml2ZWQiLCJ2ZXJpZnlRdWFsaWZpZWRTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwicHJvb2ZTdGVwIiwiUHJvb2ZTdGVwIiwiZnJvbVN0YXRlbWVudE5vZGUiLCJhZGRQcm9vZlN0ZXAiLCJsYXN0UHJvb2ZTdGVwIiwiZ2V0TGFzdFByb29mU3RlcCIsImdldFN0YXRlbWVudE5vZGUiLCJjb25jbHVzaW9uU3RhdGVtZW50Tm9kZSIsIm5vZGVBIiwibm9kZUIiLCJub2RlTWF0Y2hlcyIsIm1hdGNoTm9kZSIsImNvbXBsZXRlIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFhQTs7O2VBQXdCQTs7OzBEQVhGOytEQUNPOzhEQUNRO29CQUVYO3FCQUNBOzs7Ozs7QUFFMUIsSUFBTUMscUJBQXFCQyxJQUFBQSxnQkFBUyxFQUFDLG1DQUMvQkMsc0JBQXNCRCxJQUFBQSxnQkFBUyxFQUFDLHVCQUNoQ0UsOEJBQThCRixJQUFBQSxnQkFBUyxFQUFDO0FBRS9CLFNBQVNGLFlBQVlLLFNBQVMsRUFBRUMsVUFBVSxFQUFFQyxZQUFZLEVBQUU7SUFDdkUsSUFBSUMsZ0JBQWdCLEtBQUs7SUFFekJELGFBQWFFLEtBQUssQ0FBQ0o7SUFFbkIsSUFBTUssaUJBQWlCUCxvQkFBb0JFLFlBQ3JDTSx5QkFBeUJQLDRCQUE0QkM7SUFFM0QsSUFBSU8scUJBQXFCLEtBQUssRUFDMUJDLDZCQUE2QixLQUFLO0lBRXRDLElBQUlILG1CQUFtQixJQUFJLEVBQUU7UUFDM0JFLHFCQUFxQkUsSUFBQUEsbUJBQWdCLEVBQUNKLGdCQUFnQkg7SUFDeEQsQ0FBQztJQUVELElBQUlJLDJCQUEyQixJQUFJLEVBQUU7UUFDbkMsSUFBSUk7UUFFSkEsVUFBVSxJQUFJO1FBRWRSLGFBQWFTLFVBQVUsQ0FBQ0Q7UUFFeEJGLDZCQUE2QkksSUFBQUEsa0JBQXdCLEVBQUNOLHdCQUF3Qko7UUFFOUVRLFVBQVUsS0FBSztRQUVmUixhQUFhUyxVQUFVLENBQUNEO1FBRXhCLElBQUlGLDRCQUE0QjtZQUM5QixJQUFNSyxnQkFBZ0JqQixtQkFBbUJVLHlCQUNuQ1EsWUFBWUMsY0FBUyxDQUFDQyxpQkFBaUIsQ0FBQ0g7WUFFOUNYLGFBQWFlLFlBQVksQ0FBQ0g7UUFDNUIsQ0FBQztJQUNILENBQUM7SUFFRCxJQUFJUCxzQkFBc0JDLDRCQUE0QjtRQUNwRCxJQUFNVSxnQkFBZ0JoQixhQUFhaUIsZ0JBQWdCLElBQzdDTCxhQUFZSSxlQUNaTCxpQkFBZ0JDLFdBQVVNLGdCQUFnQixJQUMxQ0MsMEJBQTBCcEIsV0FBV21CLGdCQUFnQixJQUNyREUsUUFBUVQsZ0JBQ1JVLFFBQVFGLHlCQUNSRyxjQUFjQyxJQUFBQSxlQUFTLEVBQUNILE9BQU9DO1FBRXJDcEIsZ0JBQWdCcUIsYUFBYyxHQUFHO0lBQ25DLENBQUM7SUFFRHJCLGdCQUNFRCxhQUFhd0IsUUFBUSxDQUFDMUIsYUFDcEJFLGFBQWF3QixRQUFRLENBQUMxQixVQUFVO0lBRXBDLE9BQU9HO0FBQ1QifQ==

package/lib/verify/statement/unqualified.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _statement = /*#__PURE__*/ _interopRequireDefault(require("../../verify/statement"));
-var _assertion = /*#__PURE__*/ _interopRequireDefault(require("../../assertion"));
 var _query = require("../../utilities/query");
 var _string = require("../../utilities/string");
 function _interopRequireDefault(obj) {
@@ -29,7 +28,7 @@ function verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext) {
         if (statementVerified) {
             var derived = proofContext.isDerived();
             if (derived) {
-                var assertion = _assertion.default.fromStatementNode(statementNode), assertionMatches = proofContext.matchAssertion(assertion);
+                var assertionMatches = proofContext.matchStatement(statementNode);
                 unqualifiedStatementVerified = assertionMatches; ///
             } else {
                 unqualifiedStatementVerified = true;
@@ -43,4 +42,4 @@ function verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext) {
     return unqualifiedStatementVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50IGZyb20gXCIuLi8uLi92ZXJpZnkvc3RhdGVtZW50XCI7XG5cbmltcG9ydCBBc3NlcnRpb24gZnJvbSBcIi4uLy4uL2Fzc2VydGlvblwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlLCBwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSBmYWxzZTtcblxuICBwcm9vZkNvbnRleHQuYmVnaW4odW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKTtcblxuICBjb25zdCB1bnF1YWxpZmllZFN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIHByb29mQ29udGV4dC5kZWJ1ZyhgVmVyaWZ5aW5nIHRoZSAnJHt1bnF1YWxpZmllZFN0YXRlbWVudFN0cmluZ30nIHVucXVhbGlmaWVkIHN0YXRlbWVudC4uLmApO1xuXG4gIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlUXVlcnkodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKTtcblxuICBpZiAoc3RhdGVtZW50Tm9kZSAhPT0gbnVsbCkge1xuICAgIGNvbnN0IHN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5U3RhdGVtZW50KHN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBpZiAoc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IGRlcml2ZWQgPSBwcm9vZkNvbnRleHQuaXNEZXJpdmVkKCk7XG5cbiAgICAgIGlmIChkZXJpdmVkKSB7XG4gICAgICAgIGNvbnN0IGFzc2VydGlvbiA9IEFzc2VydGlvbi5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSxcbiAgICAgICAgICAgICAgYXNzZXJ0aW9uTWF0Y2hlcyA9IHByb29mQ29udGV4dC5tYXRjaEFzc2VydGlvbihhc3NlcnRpb24pO1xuXG4gICAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSBhc3NlcnRpb25NYXRjaGVzOyAgLy8vXG4gICAgICB9IGVsc2Uge1xuICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICBpZiAodW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgIHByb29mQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dW5xdWFsaWZpZWRTdGF0ZW1lbnRTdHJpbmd9JyB1bnF1YWxpZmllZCBzdGF0ZW1lbnQuYCk7XG4gIH1cblxuICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKSA6XG4gICAgICBwcm9vZkNvbnRleHQuaGFsdCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlIiwicHJvb2ZDb250ZXh0IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCIsImJlZ2luIiwidW5xdWFsaWZpZWRTdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJkZWJ1ZyIsInN0YXRlbWVudE5vZGUiLCJzdGF0ZW1lbnRWZXJpZmllZCIsInZlcmlmeVN0YXRlbWVudCIsImRlcml2ZWQiLCJpc0Rlcml2ZWQiLCJhc3NlcnRpb24iLCJBc3NlcnRpb24iLCJmcm9tU3RhdGVtZW50Tm9kZSIsImFzc2VydGlvbk1hdGNoZXMiLCJtYXRjaEFzc2VydGlvbiIsImluZm8iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBd0JBOzs7OERBVEk7OERBRU47cUJBRUk7c0JBQ0c7Ozs7OztBQUU3QixJQUFNQyxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFdEIsU0FBU0YsMkJBQTJCRyx3QkFBd0IsRUFBRUMsWUFBWSxFQUFFO0lBQ3pGLElBQUlDLCtCQUErQixLQUFLO0lBRXhDRCxhQUFhRSxLQUFLLENBQUNIO0lBRW5CLElBQU1JLDZCQUE2QkMsSUFBQUEsb0JBQVksRUFBQ0w7SUFFaERDLGFBQWFLLEtBQUssQ0FBQyxBQUFDLGtCQUE0QyxPQUEzQkYsNEJBQTJCO0lBRWhFLElBQU1HLGdCQUFnQlQsbUJBQW1CRTtJQUV6QyxJQUFJTyxrQkFBa0IsSUFBSSxFQUFFO1FBQzFCLElBQU1DLG9CQUFvQkMsSUFBQUEsa0JBQWUsRUFBQ0YsZUFBZU47UUFFekQsSUFBSU8sbUJBQW1CO1lBQ3JCLElBQU1FLFVBQVVULGFBQWFVLFNBQVM7WUFFdEMsSUFBSUQsU0FBUztnQkFDWCxJQUFNRSxZQUFZQyxrQkFBUyxDQUFDQyxpQkFBaUIsQ0FBQ1AsZ0JBQ3hDUSxtQkFBbUJkLGFBQWFlLGNBQWMsQ0FBQ0o7Z0JBRXJEViwrQkFBK0JhLGtCQUFtQixHQUFHO1lBQ3ZELE9BQU87Z0JBQ0xiLCtCQUErQixJQUFJO1lBQ3JDLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlBLDhCQUE4QjtRQUNoQ0QsYUFBYWdCLElBQUksQ0FBQyxBQUFDLGlCQUEyQyxPQUEzQmIsNEJBQTJCO0lBQ2hFLENBQUM7SUFFREYsK0JBQ0VELGFBQWFpQixRQUFRLENBQUNsQiw0QkFDcEJDLGFBQWFrQixJQUFJLENBQUNuQix5QkFBeUI7SUFFL0MsT0FBT0U7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50IGZyb20gXCIuLi8uLi92ZXJpZnkvc3RhdGVtZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IG5vZGVBc1N0cmluZyB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5cbmNvbnN0IHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZFN0YXRlbWVudC9zdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCkge1xuICBsZXQgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHByb29mQ29udGV4dC5iZWdpbih1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgcHJvb2ZDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3VucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nfScgdW5xdWFsaWZpZWQgc3RhdGVtZW50Li4uYCk7XG5cbiAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIGlmIChzdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KTtcblxuICAgIGlmIChzdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgICAgY29uc3QgZGVyaXZlZCA9IHByb29mQ29udGV4dC5pc0Rlcml2ZWQoKTtcblxuICAgICAgaWYgKGRlcml2ZWQpIHtcbiAgICAgICAgY29uc3QgYXNzZXJ0aW9uTWF0Y2hlcyA9IHByb29mQ29udGV4dC5tYXRjaFN0YXRlbWVudChzdGF0ZW1lbnROb2RlKTtcblxuICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gYXNzZXJ0aW9uTWF0Y2hlczsgIC8vL1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBwcm9vZkNvbnRleHQuaW5mbyhgVmVyaWZpZWQgdGhlICcke3VucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nfScgdW5xdWFsaWZpZWQgc3RhdGVtZW50LmApO1xuICB9XG5cbiAgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKTtcblxuICByZXR1cm4gdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCIsInN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInByb29mQ29udGV4dCIsInVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJiZWdpbiIsInVucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJzdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlTdGF0ZW1lbnQiLCJkZXJpdmVkIiwiaXNEZXJpdmVkIiwiYXNzZXJ0aW9uTWF0Y2hlcyIsIm1hdGNoU3RhdGVtZW50IiwiaW5mbyIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU0E7OztlQUF3QkE7Ozs4REFQSTtxQkFFRjtzQkFDRzs7Ozs7O0FBRTdCLElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUV0QixTQUFTRiwyQkFBMkJHLHdCQUF3QixFQUFFQyxZQUFZLEVBQUU7SUFDekYsSUFBSUMsK0JBQStCLEtBQUs7SUFFeENELGFBQWFFLEtBQUssQ0FBQ0g7SUFFbkIsSUFBTUksNkJBQTZCQyxJQUFBQSxvQkFBWSxFQUFDTDtJQUVoREMsYUFBYUssS0FBSyxDQUFDLEFBQUMsa0JBQTRDLE9BQTNCRiw0QkFBMkI7SUFFaEUsSUFBTUcsZ0JBQWdCVCxtQkFBbUJFO0lBRXpDLElBQUlPLGtCQUFrQixJQUFJLEVBQUU7UUFDMUIsSUFBTUMsb0JBQW9CQyxJQUFBQSxrQkFBZSxFQUFDRixlQUFlTjtRQUV6RCxJQUFJTyxtQkFBbUI7WUFDckIsSUFBTUUsVUFBVVQsYUFBYVUsU0FBUztZQUV0QyxJQUFJRCxTQUFTO2dCQUNYLElBQU1FLG1CQUFtQlgsYUFBYVksY0FBYyxDQUFDTjtnQkFFckRMLCtCQUErQlUsa0JBQW1CLEdBQUc7WUFDdkQsT0FBTztnQkFDTFYsK0JBQStCLElBQUk7WUFDckMsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsOEJBQThCO1FBQ2hDRCxhQUFhYSxJQUFJLENBQUMsQUFBQyxpQkFBMkMsT0FBM0JWLDRCQUEyQjtJQUNoRSxDQUFDO0lBRURGLCtCQUNFRCxhQUFhYyxRQUFRLENBQUNmLDRCQUNwQkMsYUFBYWUsSUFBSSxDQUFDaEIseUJBQXlCO0lBRS9DLE9BQU9FO0FBQ1QifQ==

package/package.json

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

package/src/context/file.js

@@ -175,16 +175,16 @@ export default class FileContext {
     return constructors;
   }
 
-  getAssertions() {
-    const assertions = [];  ///
+  getProofSteps() {
+    const proofSteps = [];  ///
 
-    return assertions;
+    return proofSteps;
   }
 
-  getMetaAssertions() {
-    const metaAssertions = [];  ///
+  getMetaproofSteps() {
+    const metaproofSteps = [];  ///
 
-    return metaAssertions;
+    return metaproofSteps;
   }
 
   findTypeByTypeName(typeName) {

package/src/context/metaproof.js

@@ -7,10 +7,10 @@ import callbacksMixins from "../mixins/callbacks";
 import { last } from "../utilities/array";
 
 class MetaproofContext {
-  constructor(context, derived, metaAssertions) {
+  constructor(context, derived, metaproofSteps) {
     this.context = context;
     this.derived = derived;
-    this.metaAssertions = metaAssertions;
+    this.metaproofSteps = metaproofSteps;
   }
 
   getContext() {
@@ -21,63 +21,60 @@ class MetaproofContext {
     return this.derived;
   }
 
-  getMetaAssertions() {
-    let metaAssertions = this.context.getMetaAssertions();
+  getMetaproofSteps() {
+    let metaproofSteps = this.context.getMetaproofSteps();
 
-    metaAssertions = [  ///
-      ...metaAssertions,
-      ...this.metaAssertions
+    metaproofSteps = [  ///
+      ...metaproofSteps,
+      ...this.metaproofSteps
     ];
 
-    return metaAssertions;
+    return metaproofSteps;
   }
 
-  getLastMetaAssertion() {
-    let lastMetaAssertion = null;
+  getLastMetaproofStep() {
+    let lastMetaproofStep = null;
 
-    const metaAssertionsLength = this.metaAssertions.length;
+    const metaproofStepsLength = this.metaproofSteps.length;
 
-    if (metaAssertionsLength > 0) {
-      lastMetaAssertion = last(this.metaAssertions);
+    if (metaproofStepsLength > 0) {
+      lastMetaproofStep = last(this.metaproofSteps);
     }
 
-    return lastMetaAssertion;
+    return lastMetaproofStep;
   }
 
   setDerived(derived) {
     this.derived = derived;
   }
 
-  addMetaAssertion(metaAssertion) {
-    this.metaAssertions.push(metaAssertion);
+  addMetaproofStep(metaproofStep) {
+    this.metaproofSteps.push(metaproofStep);
   }
 
-  matchMetaAssertion(metaAssertion) {
-    let metaAssertionMatches;
+  matchMetastatement(metastatementNode) {
+    let metastatementMatches;
 
-    const metaAssertionB = metaAssertion; ///
+    metastatementMatches = this.metaproofSteps.some((metaproofStep) => {
+      metastatementMatches = metaproofStep.matchMetastatement(metastatementNode);
 
-    metaAssertionMatches = this.metaAssertions.some((metaAssertion) => {
-      const metaAssertionA = metaAssertion, ///
-            matches = metaAssertionA.match(metaAssertionB);
-
-      if (matches) {
+      if (metastatementMatches) {
         return true;
       }
     });
 
-    if (!metaAssertionMatches) {
-      metaAssertionMatches = this.context.matchMetaAssertion(metaAssertion);
+    if (!metastatementMatches) {
+      metastatementMatches = this.context.matchMetastatement(metastatementNode);
     }
 
-    return metaAssertionMatches;
+    return metastatementMatches;
   }
 
   static fromFileContext(fileContext) {
     const context = fileContext,  ///
           derived = false,
-          metaAssertions = [],
-          metaproofContext = new MetaproofContext(context, derived, metaAssertions);
+          metaproofSteps = [],
+          metaproofContext = new MetaproofContext(context, derived, metaproofSteps);
 
     return metaproofContext;
   }
@@ -85,9 +82,9 @@ class MetaproofContext {
   static fromMetaproofContext(metaproofContext) {
     const context = metaproofContext,  ///
           derived = false,
-          metaAssertions = [];
+          metaproofSteps = [];
 
-    metaproofContext = new MetaproofContext(context, derived, metaAssertions);  ///
+    metaproofContext = new MetaproofContext(context, derived, metaproofSteps);  ///
 
     return metaproofContext;
   }

package/src/context/proof.js

@@ -4,14 +4,14 @@ import fileMixins from "../mixins/file";
 import loggingMixins from "../mixins/logging";
 import callbacksMixins from "../mixins/callbacks";
 
-import { push } from "../utilities/array";
+import { push, last } from "../utilities/array";
 
 class ProofContext {
-  constructor(context, derived, variables, assertions) {
+  constructor(context, derived, variables, proofSteps) {
     this.context = context;
     this.derived = derived;
     this.variables = variables;
-    this.assertions = assertions;
+    this.proofSteps = proofSteps;
   }
 
   getContext() {
@@ -22,15 +22,15 @@ class ProofContext {
     return this.derived;
   }
 
-  getAssertions() {
-    let assertions = this.context.getAssertions();
+  getProofSteps() {
+    let proofSteps = this.context.getProofSteps();
 
-    assertions = [
-      ...assertions,
-      ...this.assertions
+    proofSteps = [
+      ...proofSteps,
+      ...this.proofSteps
     ];
 
-    return assertions;
+    return proofSteps;
   }
 
   getTypes() { return this.context.getTypes(); }
@@ -57,6 +57,12 @@ class ProofContext {
     return variables;
   }
 
+  getLastProofStep() {
+    const lastProofStep = last(this.proofSteps);
+
+    return lastProofStep;
+  }
+
   setDerived(derived) {
     this.derived = derived;
   }
@@ -65,29 +71,26 @@ class ProofContext {
     this.variables.push(variable);
   }
 
-  addAssertion(assertion) {
-    this.assertions.push(assertion);
+  addProofStep(proofStep) {
+    this.proofSteps.push(proofStep);
   }
 
-  matchAssertion(assertion) {
-    let assertionMatches;
-
-    const assertionB = assertion; ///
+  matchStatement(statementNode) {
+    let statementMatches;
 
-    assertionMatches = this.assertions.some((assertion) => {
-      const assertionA = assertion, ///
-            matches = assertionA.match(assertionB);
+    statementMatches = this.proofSteps.some((proofStep) => {
+      statementMatches = proofStep.matchStatement(statementNode);
 
-      if (matches) {
+      if (statementMatches) {
         return true;
       }
     });
 
-    if (!assertionMatches) {
-      assertionMatches = this.context.matchAssertion(assertion);
+    if (!statementMatches) {
+      statementMatches = this.context.matchStatement(statementNode);
     }
 
-    return assertionMatches;
+    return statementMatches;
   }
 
   findVariableByVariableName(variableName) {
@@ -131,8 +134,8 @@ class ProofContext {
     const context = fileContext,  ///
           derived = false,
           variables = [],
-          assertions = [],
-          proofContext = new ProofContext(context, derived, variables, assertions);
+          proofSteps = [],
+          proofContext = new ProofContext(context, derived, variables, proofSteps);
 
     return proofContext;
   }
@@ -141,9 +144,9 @@ class ProofContext {
     const context = proofContext,  ///
           derived = false,
           variables = [],
-          assertions = [];
+          proofSteps = [];
 
-    proofContext = new ProofContext(context, derived, variables, assertions);
+    proofContext = new ProofContext(context, derived, variables, proofSteps);
 
     return proofContext;
   }

package/src/metaSubstitution.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { matchBracketedMetastatementChildNode, bracketedMetastatementChildNodeFromChildNodes } from "./utilities/metastatement";
+import { matchBracketedMetastatementChildNode, bracketedMetastatementChildNodeFromChildNodes } from "./utilities/metaAssertion";
 
 export default class MetaSubstitution {
   constructor(metavariableName, nodes) {

package/src/rule.js

@@ -51,10 +51,19 @@ export default class Rule {
 
       metastatementNatches = conclusionMatches; ///
     } else {
-      const metaAssertions = metaproofContext.getMetaAssertions();
+      const metaproofSteps = metaproofContext.getMetaproofSteps();
 
-      metastatementNatches = someSubArray(metaAssertions, premisesLength, (metaAssertions) => {
-        const premisesMatchConclusion = matchPremisesAndConclusion(this.premises, this.conclusion, metaAssertions, metastatementNode);
+      metastatementNatches = someSubArray(metaproofSteps, premisesLength, (metaproofSteps) => {
+        let premisesMatchConclusion = false;
+
+        const metaSubstitutions = [],
+              premisesMatches = matchPremises(this.premises, metaproofSteps, metaSubstitutions);
+
+        if (premisesMatches) {
+          const conclusionMatches = matchConclusion(this.conclusion, metastatementNode, metaSubstitutions);
+
+          premisesMatchConclusion = conclusionMatches;  ///
+        }
 
         if (premisesMatchConclusion) {
           return true;
@@ -136,10 +145,10 @@ export default class Rule {
   }
 }
 
-function matchPremise(premise, metaAssertions, metaSubstitutions) {
-  const metaAssertion = prune(metaAssertions, (metaAssertion) => {
-    const metaSubproofNode = metaAssertion.getMetaSubproofNode(),
-          metastatementNode = metaAssertion.getMetastatementNode()
+function matchPremise(premise, metaproofSteps, metaSubstitutions) {
+  const metaproofStep = prune(metaproofSteps, (metaproofStep) => {
+    const metaSubproofNode = metaproofStep.getMetaSubproofNode(),
+          metastatementNode = metaproofStep.getMetastatementNode()
 
     if (metaSubproofNode !== null) {
       const metaSubProofMatches = premise.matchMetaSubproofNode(metaSubproofNode, metaSubstitutions);
@@ -156,17 +165,16 @@ function matchPremise(premise, metaAssertions, metaSubstitutions) {
         return true;
       }
     }
-
   }) || null;
 
-  const premiseMatches = (metaAssertion !== null);
+  const premiseMatches = (metaproofStep !== null);
 
   return premiseMatches;
 }
 
-function matchPremises(premise, metaAssertions, metaSubstitutions) {
+function matchPremises(premise, metaproofSteps, metaSubstitutions) {
   const premisesMatches = premise.every((premise) => {
-    const premiseMatches = matchPremise(premise, metaAssertions, metaSubstitutions);
+    const premiseMatches = matchPremise(premise, metaproofSteps, metaSubstitutions);
 
     if (premiseMatches) {
       return true;
@@ -182,18 +190,3 @@ function matchConclusion(conclusion, metastatementNode, metaSubstitutions) {
 
   return conclusionMatches;
 }
-
-function matchPremisesAndConclusion(premises, conclusion, metaAssertions, metastatementNode) {
-  let premisesMatchConclusion = false;
-
-  const metaSubstitutions = [],
-        premisesMatches = matchPremises(premises, metaAssertions, metaSubstitutions);
-
-  if (premisesMatches) {
-    const conclusionMatches = matchConclusion(conclusion, metastatementNode, metaSubstitutions);
-
-    premisesMatchConclusion = conclusionMatches;  ///
-  }
-
-  return premisesMatchConclusion;
-}

package/src/step/metaproof.js

@@ -0,0 +1,100 @@
+"use strict";
+
+import { first, second } from "../utilities/array";
+import { nodeQuery, nodesQuery } from "../utilities/query";
+
+import { matchTopmostMetaAssertionMetastatementNode } from "../utilities/metaAssertion";
+
+const metastatementNodesQuery = nodesQuery("/metaSubproofAssertion/metastatement"),
+      metaSubproofAssertionNodeQuery = nodeQuery("/metastatement/metaSubproofAssertion"),
+      qualifiedOrUnqualifiedMetastatementMetastatementNodesQuery = nodesQuery("/metaSubproof/qualifiedMetastatement|unqualifiedMetastatement/metastatement!");
+
+export default class MetaproofStep {
+  constructor(metaSubproofNode, metastatementNode) {
+    this.metaSubproofNode = metaSubproofNode;
+    this.metastatementNode = metastatementNode;
+  }
+
+  getMetaSubproofNode() {
+    return this.metaSubproofNode;
+  }
+
+  getMetastatementNode() {
+    return this.metastatementNode;
+  }
+
+  matchMetastatement(metastatementNode) {
+    let metastatementMatches;
+
+    const metaSubproofAssertionNode = metaSubproofAssertionNodeQuery(metastatementNode);
+
+    if (metaSubproofAssertionNode !== null) {
+      const metaSubproofAssertionMatches = this.matchMetaSubproofAssertion(metaSubproofAssertionNode);
+
+      metastatementMatches = metaSubproofAssertionMatches;  ///
+    } else {
+      const metastatementsMatch = this.matchMetastatements(metastatementNode);
+
+      metastatementMatches = metastatementsMatch; //
+    }
+
+    return metastatementMatches;
+  }
+
+  matchMetastatements(metastatementNode) {
+    let metastatementsMatch = false;
+
+    if (this.metastatementNode !== null) {
+      const topmostMetastatementNode = metastatementNode, ///
+            topmostMetaAssertionMetastatementNode = this.metastatementNode,  ///
+            topmostMetaAssertionMetastatementNodeMatches = matchTopmostMetaAssertionMetastatementNode(topmostMetaAssertionMetastatementNode, topmostMetastatementNode),
+            metastatementNodeMatches = topmostMetaAssertionMetastatementNodeMatches;  ///
+
+      return metastatementNodeMatches;
+    }
+
+    return metastatementsMatch;
+  }
+
+  matchMetaSubproofAssertion(metaSubproofAssertionNode) {
+    let metaSubproofAssertionMatches = false;
+
+    if (this.metaSubproofNode !== null) {
+      const metaSubproofAssertionMetastatementNodes = metastatementNodesQuery(metaSubproofAssertionNode),
+            firstMetaSubproofAssertionMetastatementNode = first(metaSubproofAssertionMetastatementNodes),
+            qualifiedOrUnqualifiedMetastatementMetastatementNodes = qualifiedOrUnqualifiedMetastatementMetastatementNodesQuery(this.metaSubproofNode),
+            firstQualifiedOrUnqualifiedMetastatementMetastatementNode = first(qualifiedOrUnqualifiedMetastatementMetastatementNodes);
+
+      const topmostMetastatementNode = firstMetaSubproofAssertionMetastatementNode,  ///
+            topmostMetaAssertionMetastatementNode = firstQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
+            topmostMetaAssertionMetastatementNodeMatches = matchTopmostMetaAssertionMetastatementNode(topmostMetaAssertionMetastatementNode, topmostMetastatementNode);
+
+      if (topmostMetaAssertionMetastatementNodeMatches) {
+        const secondMetaSubproofAssertionMetastatementNode = second(metaSubproofAssertionMetastatementNodes),
+              secondQualifiedOrUnqualifiedMetastatementMetastatementNode = second(qualifiedOrUnqualifiedMetastatementMetastatementNodes);
+
+        const topmostMetastatementNode = secondMetaSubproofAssertionMetastatementNode, ///
+              topmostMetaAssertionMetastatementNode = secondQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
+              topmostMetaAssertionMetastatementNodeMatches = matchTopmostMetaAssertionMetastatementNode(topmostMetaAssertionMetastatementNode, topmostMetastatementNode);
+
+        metaSubproofAssertionMatches = topmostMetaAssertionMetastatementNodeMatches; ///
+      }
+    }
+
+    return metaSubproofAssertionMatches;
+  }
+
+  static fromMetaSubproofNode(metaSubproofNode) {
+    const metastatementNode = null,
+          metaProofStep = new MetaproofStep(metaSubproofNode, metastatementNode);
+
+    return metaProofStep;
+  }
+
+  static fromMetastatementNode(metastatementNode) {
+    const metaSubproofNode = null,
+          metaProofStep = new MetaproofStep(metaSubproofNode, metastatementNode);
+
+    return metaProofStep;
+  }
+}

package/src/step/proof.js

@@ -0,0 +1,30 @@
+"use strict";
+
+export default class ProofStep {
+  constructor(subproofNode, statementNode) {
+    this.subproofNode = subproofNode;
+    this.statementNode = statementNode;
+  }
+
+  getSubproofNode() {
+    return this.subproofNode;
+  }
+
+  getStatementNode() {
+    return this.statementNode;
+  }
+
+  static fromSubproofNode(subproofNode) {
+    const statementNode = null,
+          metaProofStep = new ProofStep(subproofNode, statementNode);
+
+    return metaProofStep;
+  }
+
+  static fromStatementNode(statementNode) {
+    const subproofNode = null,
+          metaProofStep = new ProofStep(subproofNode, statementNode);
+
+    return metaProofStep;
+  }
+}

package/src/utilities/array.js

@@ -6,7 +6,7 @@ import permutationsMatrix from "../permutationsMatrix";
 
 import { MAXIMUM_INDEXES_LENGTH, MAXIMUM_PERMUTATION_LENGTH } from "../constants";
 
-export const { front, first, second, third, last, push, prune, filter } = arrayUtilities;
+export const { first, second, third, last, push, prune, filter } = arrayUtilities;
 
 export function someSubArray(array, subArrayLength, callback) {
   let found = false;