occam-verify-cli 0.0.936 → 0.0.938

package/lib/verify/termAsConstructor.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _constructor = /*#__PURE__*/ _interop_require_default(require("../constructor"));
-var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
 var _termAsConstructor = /*#__PURE__*/ _interop_require_default(require("../verifier/termAsConstructor"));
+var _array = require("../utilities/array");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -20,32 +20,39 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
     var termVerifiedAsConstructor = false;
     var termString = fileContext.nodeAsString(termNode);
     fileContext.debug("Verifying the '".concat(termString, "' term as a constructor..."), termNode);
-    var localContext = _local.default.fromFileContext(fileContext), nonTerminalNode = termNode, childNodes = nonTerminalNode.getChildNodes(), childNodesVerified = _termAsConstructor.default.verifyChildNodes(childNodes, localContext, function() {
-        var verifiedAhead = true;
-        return verifiedAhead;
-    });
-    if (childNodesVerified) {
-        var type = null;
-        if (typeNode === null) {
-            termVerifiedAsConstructor = true;
-        } else {
-            type = fileContext.findTypeByTypeNode(typeNode);
-            if (type !== null) {
-                termVerifiedAsConstructor = true;
-            } else {
-                var typeString = fileContext.nodeAsString(typeNode);
-                fileContext.debug("The '".concat(termString, "' constructor's '").concat(typeString, "' type is not present."), termNode);
-            }
-        }
-        if (termVerifiedAsConstructor) {
-            var tokens = fileContext.getTokens(), constructor = _constructor.default.fromTermNodeTypeAndTokens(termNode, type, tokens);
-            fileContext.addConstructor(constructor);
-        }
+    var types = [], typeVerified = verifyType(typeNode, types, fileContext);
+    var type;
+    if (typeVerified) {
+        var firstType = (0, _array.first)(types);
+        type = firstType; ///
+        termVerifiedAsConstructor = _termAsConstructor.default.verify(termNode, fileContext);
+    }
+    if (termVerifiedAsConstructor) {
+        var tokens = fileContext.getTokens(), constructor = _constructor.default.fromTermNodeTypeAndTokens(termNode, type, tokens);
+        fileContext.addConstructor(constructor);
     }
     if (termVerifiedAsConstructor) {
         fileContext.debug("...verified the '".concat(termString, "' term as a constructor."), termNode);
     }
     return termVerifiedAsConstructor;
 }
+function verifyType(typeNode, types, fileContext) {
+    var typeVerified = false;
+    if (typeNode === null) {
+        var type = null;
+        types.push(type);
+        typeVerified = true;
+    } else {
+        var type1 = fileContext.findTypeByTypeNode(typeNode);
+        if (type1 !== null) {
+            types.push(type1);
+            typeVerified = true;
+        } else {
+            var typeString = fileContext.nodeAsString(typeNode);
+            fileContext.debug("The '".concat(typeString, "' type is not present."), typeNode);
+        }
+    }
+    return typeVerified;
+}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIGZyb20gXCIuLi92ZXJpZmllci90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUZXJtQXNDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgdHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gZmFsc2U7XG5cbiAgY29uc3QgdGVybVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0ZXJtTm9kZSk7XG5cbiAgZmlsZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7dGVybVN0cmluZ30nIHRlcm0gYXMgYSBjb25zdHJ1Y3Rvci4uLmAsIHRlcm1Ob2RlKTtcblxuICBjb25zdCBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgbm9uVGVybWluYWxOb2RlID0gdGVybU5vZGUsIC8vL1xuICAgICAgICBjaGlsZE5vZGVzID0gbm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgY2hpbGROb2Rlc1ZlcmlmaWVkID0gdGVybUFzQ29uc3RydWN0b3JWZXJpZmllci52ZXJpZnlDaGlsZE5vZGVzKGNoaWxkTm9kZXMsIGxvY2FsQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgIH0pO1xuXG4gIGlmIChjaGlsZE5vZGVzVmVyaWZpZWQpIHtcbiAgICBsZXQgdHlwZSA9IG51bGw7XG5cbiAgICBpZiAodHlwZU5vZGUgPT09IG51bGwpIHtcbiAgICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSB0cnVlO1xuICAgIH0gZWxzZSB7XG4gICAgICB0eXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOb2RlKHR5cGVOb2RlKTtcblxuICAgICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgICAgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IHRydWU7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBjb25zdCB0eXBlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHR5cGVOb2RlKTtcblxuICAgICAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgVGhlICcke3Rlcm1TdHJpbmd9JyBjb25zdHJ1Y3RvcidzICcke3R5cGVTdHJpbmd9JyB0eXBlIGlzIG5vdCBwcmVzZW50LmAsIHRlcm1Ob2RlKTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICBpZiAodGVybVZlcmlmaWVkQXNDb25zdHJ1Y3Rvcikge1xuICAgICAgY29uc3QgdG9rZW5zID0gZmlsZUNvbnRleHQuZ2V0VG9rZW5zKCksXG4gICAgICAgICAgICBjb25zdHJ1Y3RvciA9IENvbnN0cnVjdG9yLmZyb21UZXJtTm9kZVR5cGVBbmRUb2tlbnModGVybU5vZGUsIHR5cGUsIHRva2Vucyk7XG5cbiAgICAgIGZpbGVDb250ZXh0LmFkZENvbnN0cnVjdG9yKGNvbnN0cnVjdG9yKTtcbiAgICB9XG4gIH1cblxuICBpZiAodGVybVZlcmlmaWVkQXNDb25zdHJ1Y3Rvcikge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7dGVybVN0cmluZ30nIHRlcm0gYXMgYSBjb25zdHJ1Y3Rvci5gLCB0ZXJtTm9kZSk7XG4gIH1cblxuICByZXR1cm4gdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3Rvcjtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUZXJtQXNDb25zdHJ1Y3RvciIsInRlcm1Ob2RlIiwidHlwZU5vZGUiLCJmaWxlQ29udGV4dCIsInRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IiLCJ0ZXJtU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJub25UZXJtaW5hbE5vZGUiLCJjaGlsZE5vZGVzIiwiZ2V0Q2hpbGROb2RlcyIsImNoaWxkTm9kZXNWZXJpZmllZCIsInRlcm1Bc0NvbnN0cnVjdG9yVmVyaWZpZXIiLCJ2ZXJpZnlDaGlsZE5vZGVzIiwidmVyaWZpZWRBaGVhZCIsInR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5vZGUiLCJ0eXBlU3RyaW5nIiwidG9rZW5zIiwiZ2V0VG9rZW5zIiwiY29uc3RydWN0b3IiLCJDb25zdHJ1Y3RvciIsImZyb21UZXJtTm9kZVR5cGVBbmRUb2tlbnMiLCJhZGRDb25zdHJ1Y3RvciJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBTUE7OztlQUF3QkE7OztrRUFKQTs0REFDQzt3RUFDYTs7Ozs7O0FBRXZCLFNBQVNBLHdCQUF3QkMsUUFBUSxFQUFFQyxRQUFRLEVBQUVDLFdBQVc7SUFDN0UsSUFBSUMsNEJBQTRCO0lBRWhDLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLCtCQUE2Qko7SUFFNUUsSUFBTU8sZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNQLGNBQzVDUSxrQkFBa0JWLFVBQ2xCVyxhQUFhRCxnQkFBZ0JFLGFBQWEsSUFDMUNDLHFCQUFxQkMsMEJBQXlCLENBQUNDLGdCQUFnQixDQUFDSixZQUFZSixjQUFjO1FBQ3hGLElBQU1TLGdCQUFnQjtRQUV0QixPQUFPQTtJQUNUO0lBRU4sSUFBSUgsb0JBQW9CO1FBQ3RCLElBQUlJLE9BQU87UUFFWCxJQUFJaEIsYUFBYSxNQUFNO1lBQ3JCRSw0QkFBNEI7UUFDOUIsT0FBTztZQUNMYyxPQUFPZixZQUFZZ0Isa0JBQWtCLENBQUNqQjtZQUV0QyxJQUFJZ0IsU0FBUyxNQUFNO2dCQUNqQmQsNEJBQTRCO1lBQzlCLE9BQU87Z0JBQ0wsSUFBTWdCLGFBQWFqQixZQUFZRyxZQUFZLENBQUNKO2dCQUU1Q0MsWUFBWUksS0FBSyxDQUFDLEFBQUMsUUFBcUNhLE9BQTlCZixZQUFXLHFCQUE4QixPQUFYZSxZQUFXLDJCQUF5Qm5CO1lBQzlGO1FBQ0Y7UUFFQSxJQUFJRywyQkFBMkI7WUFDN0IsSUFBTWlCLFNBQVNsQixZQUFZbUIsU0FBUyxJQUM5QkMsY0FBY0Msb0JBQVcsQ0FBQ0MseUJBQXlCLENBQUN4QixVQUFVaUIsTUFBTUc7WUFFMUVsQixZQUFZdUIsY0FBYyxDQUFDSDtRQUM3QjtJQUNGO0lBRUEsSUFBSW5CLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIGZyb20gXCIuLi92ZXJpZmllci90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5pbXBvcnQgeyBmaXJzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VGVybUFzQ29uc3RydWN0b3IodGVybU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IGZhbHNlO1xuXG4gIGNvbnN0IHRlcm1TdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodGVybU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuLi5gLCB0ZXJtTm9kZSk7XG5cbiAgY29uc3QgdHlwZXMgPSBbXSxcbiAgICAgICAgdHlwZVZlcmlmaWVkID0gdmVyaWZ5VHlwZSh0eXBlTm9kZSwgdHlwZXMsIGZpbGVDb250ZXh0KTtcblxuICBsZXQgdHlwZTtcblxuICBpZiAodHlwZVZlcmlmaWVkKSB7XG4gICAgY29uc3QgZmlyc3RUeXBlID0gZmlyc3QodHlwZXMpO1xuXG4gICAgdHlwZSA9IGZpcnN0VHlwZTsgLy8vXG5cbiAgICB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gdGVybUFzQ29uc3RydWN0b3JWZXJpZmllci52ZXJpZnkodGVybU5vZGUsIGZpbGVDb250ZXh0KTtcbiAgfVxuXG4gIGlmICh0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yKSB7XG4gICAgY29uc3QgdG9rZW5zID0gZmlsZUNvbnRleHQuZ2V0VG9rZW5zKCksXG4gICAgICAgICAgY29uc3RydWN0b3IgPSBDb25zdHJ1Y3Rvci5mcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpO1xuXG4gICAgZmlsZUNvbnRleHQuYWRkQ29uc3RydWN0b3IoY29uc3RydWN0b3IpO1xuICB9XG5cbiAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuYCwgdGVybU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG59XG5cbmZ1bmN0aW9uIHZlcmlmeVR5cGUodHlwZU5vZGUsIHR5cGVzLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdHlwZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgaWYgKHR5cGVOb2RlID09PSBudWxsKSB7XG4gICAgY29uc3QgdHlwZSA9IG51bGw7XG5cbiAgICB0eXBlcy5wdXNoKHR5cGUpO1xuXG4gICAgdHlwZVZlcmlmaWVkID0gdHJ1ZTtcbiAgfSBlbHNlIHtcbiAgICBjb25zdCB0eXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOb2RlKHR5cGVOb2RlKTtcblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICB0eXBlcy5wdXNoKHR5cGUpO1xuXG4gICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCB0eXBlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHR5cGVOb2RlKTtcblxuICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB0eXBlTm9kZSk7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUZXJtQXNDb25zdHJ1Y3RvciIsInRlcm1Ob2RlIiwidHlwZU5vZGUiLCJmaWxlQ29udGV4dCIsInRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IiLCJ0ZXJtU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJ0eXBlcyIsInR5cGVWZXJpZmllZCIsInZlcmlmeVR5cGUiLCJ0eXBlIiwiZmlyc3RUeXBlIiwiZmlyc3QiLCJ0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIiwidmVyaWZ5IiwidG9rZW5zIiwiZ2V0VG9rZW5zIiwiY29uc3RydWN0b3IiLCJDb25zdHJ1Y3RvciIsImZyb21UZXJtTm9kZVR5cGVBbmRUb2tlbnMiLCJhZGRDb25zdHJ1Y3RvciIsInB1c2giLCJmaW5kVHlwZUJ5VHlwZU5vZGUiLCJ0eXBlU3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7O2tFQUxBO3dFQUNjO3FCQUVoQjs7Ozs7O0FBRVAsU0FBU0Esd0JBQXdCQyxRQUFRLEVBQUVDLFFBQVEsRUFBRUMsV0FBVztJQUM3RSxJQUFJQyw0QkFBNEI7SUFFaEMsSUFBTUMsYUFBYUYsWUFBWUcsWUFBWSxDQUFDTDtJQUU1Q0UsWUFBWUksS0FBSyxDQUFDLEFBQUMsa0JBQTRCLE9BQVhGLFlBQVcsK0JBQTZCSjtJQUU1RSxJQUFNTyxRQUFRLEVBQUUsRUFDVkMsZUFBZUMsV0FBV1IsVUFBVU0sT0FBT0w7SUFFakQsSUFBSVE7SUFFSixJQUFJRixjQUFjO1FBQ2hCLElBQU1HLFlBQVlDLElBQUFBLFlBQUssRUFBQ0w7UUFFeEJHLE9BQU9DLFdBQVcsR0FBRztRQUVyQlIsNEJBQTRCVSwwQkFBeUIsQ0FBQ0MsTUFBTSxDQUFDZCxVQUFVRTtJQUN6RTtJQUVBLElBQUlDLDJCQUEyQjtRQUM3QixJQUFNWSxTQUFTYixZQUFZYyxTQUFTLElBQzlCQyxjQUFjQyxvQkFBVyxDQUFDQyx5QkFBeUIsQ0FBQ25CLFVBQVVVLE1BQU1LO1FBRTFFYixZQUFZa0IsY0FBYyxDQUFDSDtJQUM3QjtJQUVBLElBQUlkLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1Q7QUFFQSxTQUFTTSxXQUFXUixRQUFRLEVBQUVNLEtBQUssRUFBRUwsV0FBVztJQUM5QyxJQUFJTSxlQUFlO0lBRW5CLElBQUlQLGFBQWEsTUFBTTtRQUNyQixJQUFNUyxPQUFPO1FBRWJILE1BQU1jLElBQUksQ0FBQ1g7UUFFWEYsZUFBZTtJQUNqQixPQUFPO1FBQ0wsSUFBTUUsUUFBT1IsWUFBWW9CLGtCQUFrQixDQUFDckI7UUFFNUMsSUFBSVMsVUFBUyxNQUFNO1lBQ2pCSCxNQUFNYyxJQUFJLENBQUNYO1lBRVhGLGVBQWU7UUFDakIsT0FBTztZQUNMLElBQU1lLGFBQWFyQixZQUFZRyxZQUFZLENBQUNKO1lBRTVDQyxZQUFZSSxLQUFLLENBQUMsQUFBQyxRQUFrQixPQUFYaUIsWUFBVywyQkFBeUJ0QjtRQUNoRTtJQUNGO0lBRUEsT0FBT087QUFDVCJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.936",
+  "version": "0.0.938",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,7 +12,7 @@
   "dependencies": {
     "argumentative": "^2.0.28",
     "necessary": "^14.0.1",
-    "occam-custom-grammars": "^5.0.837",
+    "occam-custom-grammars": "^5.0.839",
     "occam-entities": "^1.0.152",
     "occam-file-system": "^6.0.192",
     "occam-grammar-utilities": "^8.0.207",

package/src/conclusion.js

@@ -15,25 +15,21 @@ export default class Conclusion {
     return this.statementNode;
   }
 
-  matchStatementNode(statementNode, substitutions, fileContext, localContext) {
-    let matchesStatementNode = false;
+  unifyStatement(statementNode, substitutions, fileContext, localContext) {
+    let statementUnified = false;
 
     if (this.statementNode !== null) {
-      const fileContextA = fileContext, ///
-            nonTerminalNodeA = this.statementNode,  ///
-            nonTerminalNodeB = statementNode,  ///
+      const nodeA = this.statementNode,  ///
+            nodeB = statementNode,  ///
+            fileContextA = fileContext, ///
             localContextA = LocalContext.fromFileContext(fileContextA),
             localContextB = localContext,  ///
-            nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-              const verifiedAhead = true;
+            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-              return verifiedAhead;
-            });
-
-      matchesStatementNode = nonTerminalNodeUnified; ///
+      statementUnified = unified; ///
     }
 
-    return matchesStatementNode;
+    return statementUnified;
   }
 
   toJSON(tokens) {

package/src/consequent.js

@@ -15,25 +15,21 @@ export default class Consequent {
     return this.statementNode;
   }
 
-  matchStatementNode(statementNode, substitutions, fileContext, localContext) {
-    let matchesStatementNode = false;
+  unifyStatement(statementNode, substitutions, fileContext, localContext) {
+    let statementUnified = false;
 
     if (this.statementNode !== null) {
-      const fileContextA = fileContext, ///
-            nonTerminalNodeA = this.statementNode,  ///
-            nonTerminalNodeB = statementNode,  ///
+      const nodeA = this.statementNode,  ///
+            nodeB = statementNode,  ///
+            fileContextA = fileContext, ///
             localContextA = LocalContext.fromFileContext(fileContextA),
             localContextB = localContext,  ///
-            nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-              const verifiedAhead = true;
+            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-              return verifiedAhead;
-            });
-
-      matchesStatementNode = nonTerminalNodeUnified; ///
+      statementUnified = unified; ///
     }
 
-    return matchesStatementNode;
+    return statementUnified;
   }
 
   toJSON(tokens) {

package/src/context/local.js

@@ -336,14 +336,14 @@ class LocalContext {
 
   findVariableByVariableNode(variableNode) {
     const node = variableNode,  ///
-      variables = this.getVariables(),
-      variable = variables.find((variable) => {
-        const matches = variable.matchNode(node);
+          variables = this.getVariables(),
+          variable = variables.find((variable) => {
+            const matches = variable.matchNode(node);
 
-        if (matches) {
-          return true;
-        }
-      }) || null;
+            if (matches) {
+              return true;
+            }
+          }) || null;
 
     return variable;
   }

package/src/equality.js

@@ -31,14 +31,8 @@ export default class Equality {
   isEqual(localContext) {
     const leftTermNode = this.leftTerm.getNode(),
           rightTermNode = this.rightTerm.getNode(),
-          nonTerminalNodeA = leftTermNode,  ///
-          nonTerminalNodeB = rightTermNode, ///
-          nonTerminalNodeUnified = equalityUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, localContext, () => {
-            const verifiedAhead = true;
-
-            return verifiedAhead;
-          }),
-          equal = nonTerminalNodeUnified;  ///
+          equalityUnified = equalityUnifier.unify(leftTermNode, rightTermNode, localContext),
+          equal = equalityUnified;  ///
 
     return equal;
   }

package/src/premise.js

@@ -22,35 +22,34 @@ export default class Premise {
     return this.statementNode;
   }
 
-  matchStatementNode(statementNode, substitutions, fileContext, localContext) {
-    let matchesStatementNode = false;
+  unifyStatement(statementNode, substitutions, fileContext, localContext) {
+    let statementUnified = false;
 
     if (this.statementNode !== null) {
-      const fileContextA = fileContext, ///
-            nonTerminalNodeA = this.statementNode,  ///
-            nonTerminalNodeB = statementNode,  ///
+      const nodeA = this.statementNode,  ///
+            nodeB = statementNode,  ///
+            fileContextA = fileContext, ///
             localContextA = LocalContext.fromFileContext(fileContextA),
             localContextB = localContext,  ///
-            nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-              const verifiedAhead = true;
+            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-              return verifiedAhead;
-            });
-
-      matchesStatementNode = nonTerminalNodeUnified; ///
+      statementUnified = unified; ///
     }
 
-    return matchesStatementNode;
+    return statementUnified;
   }
 
-  matchSubproofNode(subproofNode, substitutions, fileContext, localContext) {
-    let matchesSubproofNode = false;
+  unifySubproof(subproofNode, substitutions, fileContext, localContext) {
+    let subproofUnified = false;
 
     if (this.statementNode !== null) {
       const subproofAssertionNode = subproofAssertionNodeQuery(this.statementNode);
 
       if (subproofAssertionNode !== null) {
-        const subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),
+        const fileContextA = fileContext, ///
+              localContextA = LocalContext.fromFileContext(fileContextA),
+              localContextB = localContext,  ///
+              subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),
               subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode),
               subproofStatementNodes = [
                 ...subproofSuppositionStatementNodes,
@@ -58,26 +57,19 @@ export default class Premise {
               ],
               subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode);
 
-        matchesSubproofNode = match(subproofAssertionStatementNodes, subproofStatementNodes, (subproofAssertionStatementNode, subproofStatementNode) => {
-          const fileContextA = fileContext, ///
-                nonTerminalNodeA = subproofAssertionStatementNode,  ///
-                nonTerminalNodeB = subproofStatementNode, ///
-                localContextA = LocalContext.fromFileContext(fileContextA),
-                localContextB = localContext,  ///
-                nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-                  const verifiedAhead = true;
-
-                  return verifiedAhead;
-                });
+        subproofUnified = match(subproofAssertionStatementNodes, subproofStatementNodes, (subproofAssertionStatementNode, subproofStatementNode) => {
+          const nodeA = subproofAssertionStatementNode,  ///
+                nodeB = subproofStatementNode, ///
+                unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-          if (nonTerminalNodeUnified) {
+          if (unified) {
             return true;
           }
         });
       }
     }
 
-    return matchesSubproofNode;
+    return subproofUnified;
   }
 
   toJSON(tokens) {

package/src/proofStep.js

@@ -60,18 +60,14 @@ export default class ProofStep {
 function unifyStatementAgainstStatement(statementNodeA, statementNodeB, equivalences, localContext) {
   let statementUnifiedAgainstStatement = false;
 
-  const nonTerminalNodeA = statementNodeA,  ///
-        nonTerminalNodeB = statementNodeB,  ///
-        substitutions = [],
+  const nodeA = statementNodeA,  ///
+        nodeB = statementNodeB,  ///
         localContextA = localContext, ///
         localContextB = localContext,  ///
-        nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-          const verifiedAhead = true;
-
-          return verifiedAhead;
-        });
+        substitutions = [],
+        unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-  if (nonTerminalNodeUnified) {
+  if (unified) {
     const substitutionsUnified = substitutions.every((substitution) => {
       const substitutionUnified = equivalences.some((equivalence) => {
         const substitutionUnifiedAgainstEquivalence = substitution.unifyAgainstEquivalence(equivalence, substitutions, localContext);

package/src/rule.js

@@ -30,20 +30,20 @@ export default class Rule {
     return this.fileContext;
   }
 
-  matchStatement(statementNode, localContext) {
-    let matchesStatement = false;
+  unifyStatement(statementNode, localContext) {
+    let statementUnified = false;
 
     const proofSteps = localContext.getProofSteps(),
           substitutions = [],
-          premisesMatch = matchPremises(this.premises, proofSteps, substitutions, this.fileContext, localContext);
+          premisesUnified = unifyPremises(this.premises, proofSteps, substitutions, this.fileContext, localContext);
 
-    if (premisesMatch) {
-      const conclusionMatches = matchConclusion(this.conclusion, statementNode, substitutions, this.fileContext, localContext);
+    if (premisesUnified) {
+      const conclusionUnified = unifyConclusion(this.conclusion, statementNode, substitutions, this.fileContext, localContext);
 
-      matchesStatement = conclusionMatches;  ///
+      statementUnified = conclusionUnified;  ///
     }
 
-    return matchesStatement;
+    return statementUnified;
   }
 
   matchMetavariableNode(metavariableNode) {
@@ -128,45 +128,45 @@ export default class Rule {
 }
 
 function matchPremise(premise, proofStep, substitutions, fileContext, localContext) {
-  let premiseMatches = false;
+  let premiseUnified = false;
 
   const subproofNode = proofStep.getSubproofNode(),
         statementNode = proofStep.getStatementNode();
 
   if (subproofNode !== null) {
-    const premiseMatchesSubproofNode = premise.matchSubproofNode(subproofNode, substitutions, fileContext, localContext);
+    const subproofUnified = premise.unifySubproof(subproofNode, substitutions, fileContext, localContext);
 
-    premiseMatches = premiseMatchesSubproofNode; ///
+    premiseUnified = subproofUnified; ///
   }
 
   if (statementNode !== null) {
-    const premiseMatchesStatementNode = premise.matchStatementNode(statementNode, substitutions, fileContext, localContext);
+    const statementUnified = premise.unifyStatement(statementNode, substitutions, fileContext, localContext);
 
-    premiseMatches = premiseMatchesStatementNode;  ///
+    premiseUnified = statementUnified;  ///
   }
 
-  return premiseMatches;
+  return premiseUnified;
 }
 
-function matchPremises(premises, proofSteps, substitutions, fileContext, localContext) {
+function unifyPremises(premises, proofSteps, substitutions, fileContext, localContext) {
   premises = reverse(premises); ///
 
   proofSteps = reverse(proofSteps); ///
 
-  const premisesMatch = correlate(premises, proofSteps, (premise, proofStep) => {
-    const premiseMatches = matchPremise(premise, proofStep, substitutions, fileContext, localContext);
+  const premisesUnified = correlate(premises, proofSteps, (premise, proofStep) => {
+    const premiseUnified = matchPremise(premise, proofStep, substitutions, fileContext, localContext);
 
-    if (premiseMatches) {
+    if (premiseUnified) {
       return true;
     }
   });
 
-  return premisesMatch;
+  return premisesUnified;
 }
 
-function matchConclusion(conclusion, statementNode, substitutions, fileContext, localContext) {
-  const conclusionMatchesStatementNode = conclusion.matchStatementNode(statementNode, substitutions, fileContext, localContext),
-        conclusionMatches = conclusionMatchesStatementNode; ///
+function unifyConclusion(conclusion, statementNode, substitutions, fileContext, localContext) {
+  const statementUnified = conclusion.unifyStatement(statementNode, substitutions, fileContext, localContext),
+        conclusionUnified = statementUnified; ///
 
-  return conclusionMatches;
+  return conclusionUnified;
 }

package/src/substitution/statementForMetavariable.js

@@ -71,17 +71,13 @@ export default class StatementForMetavariableSubstitution extends Substitution {
       ];
 
       const { metaLevelUnifier } = shim,
-            nonTerminalNodeA = this.metavariableNode, ///
-            nonTerminalNodeB = metavariableNode, ///
+            nodeA = this.metavariableNode, ///
+            nodeB = metavariableNode, ///
             localContextA = localContext, ///
             localContextB = localContext,  ///
-            nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-              const verifiedAhead = true;
+            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-              return verifiedAhead;
-            });
-
-      unifiedAgainstEquivalence = nonTerminalNodeUnified; ///
+      unifiedAgainstEquivalence = unified; ///
     }
 
     return unifiedAgainstEquivalence;

package/src/supposition.js

@@ -22,35 +22,34 @@ export default class Supposition {
     return this.statementNode;
   }
 
-  matchStatementNode(statementNode, substitutions, fileContext, localContext) {
-    let matchesStatementNode = false;
+  unifyStatement(statementNode, substitutions, fileContext, localContext) {
+    let statementUnified = false;
 
     if (this.statementNode !== null) {
-      const fileContextA = fileContext, ///
-            nonTerminalNodeA = this.statementNode,  ///
-            nonTerminalNodeB = statementNode,  ///
+      const nodeA = this.statementNode,  ///
+            nodeB = statementNode,  ///
+            fileContextA = fileContext, ///
             localContextA = LocalContext.fromFileContext(fileContextA),
             localContextB = localContext,  ///
-            nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-              const verifiedAhead = true;
+            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-              return verifiedAhead;
-            });
-
-      matchesStatementNode = nonTerminalNodeUnified; ///
+      statementUnified = unified; ///
     }
 
-    return matchesStatementNode;
+    return statementUnified;
   }
 
-  matchSubproofNode(subproofNode, substitutions, fileContext, localContext) {
-    let matchesSubproofNode = false;
+  unifySubproof(subproofNode, substitutions, fileContext, localContext) {
+    let subproofUnified = false;
 
     if (this.statementNode !== null) {
       const subproofAssertionNode = subproofAssertionNodeQuery(this.statementNode);
 
       if (subproofAssertionNode !== null) {
-        const subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),
+        const fileContextA = fileContext, ///
+              localContextA = LocalContext.fromFileContext(fileContextA),
+              localContextB = localContext,  ///
+              subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),
               subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode),
               subproofStatementNodes = [
                 ...subproofSuppositionStatementNodes,
@@ -58,26 +57,19 @@ export default class Supposition {
               ],
               subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode);
 
-        matchesSubproofNode = match(subproofAssertionStatementNodes, subproofStatementNodes, (subproofAssertionStatementNode, subproofStatementNode) => {
-          const fileContextA = fileContext, ///
-                nonTerminalNodeA = subproofAssertionStatementNode,  ///
-                nonTerminalNodeB = subproofStatementNode, ///
-                localContextA = LocalContext.fromFileContext(fileContextA),
-                localContextB = localContext,  ///
-                nonTerminalNodeUnified = metaLevelUnifier.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
-                  const verifiedAhead = true;
-
-                  return verifiedAhead;
-                });
+        subproofUnified = match(subproofAssertionStatementNodes, subproofStatementNodes, (subproofAssertionStatementNode, subproofStatementNode) => {
+          const nodeA = subproofAssertionStatementNode,  ///
+                nodeB = subproofStatementNode, ///
+                unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-          if (nonTerminalNodeUnified) {
+          if (unified) {
             return true;
           }
         });
       }
     }
 
-    return matchesSubproofNode;
+    return subproofUnified;
   }
 
   toJSON(tokens) {

package/src/topLevelAssertion.js

@@ -36,20 +36,20 @@ export default class TopLevelAssertion {
     return this.fileContext;
   }
 
-  matchStatement(statementNode, localContext) {
-    let statementNatches = false;
+  unifyStatement(statementNode, localContext) {
+    let statementUnified = false;
 
     const proofSteps = localContext.getProofSteps(),
           substitutions = [],
-          suppositionsMatch = matchSuppositions(this.suppositions, proofSteps, substitutions, this.fileContext, localContext);
+          suppositionsUnified = unifySuppositions(this.suppositions, proofSteps, substitutions, this.fileContext, localContext);
 
-    if (suppositionsMatch) {
-      const consequentMatches = matchConsequent(this.consequent, statementNode, substitutions, this.fileContext, localContext);
+    if (suppositionsUnified) {
+      const consequentUnified = unifyConsequent(this.consequent, statementNode, substitutions, this.fileContext, localContext);
 
-      statementNatches = consequentMatches;  ///
+      statementUnified = consequentUnified;  ///
     }
 
-    return statementNatches;
+    return statementUnified;
   }
 
   matchMetavariableNode(metavariableNode) {
@@ -140,39 +140,46 @@ export default class TopLevelAssertion {
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Class, labels, suppositions, consequent, substitutions, fileContext) { return new Class(labels, suppositions, consequent, substitutions, fileContext); }
 }
 
-function matchSuppositions(suppositions, proofSteps, substitutions, fileContext, localContext) {
+function unifySuppositions(suppositions, proofSteps, substitutions, fileContext, localContext) {
   suppositions = reverse(suppositions); ///
 
   proofSteps = reverse(proofSteps); ///
 
-  const suppositionsMatch = correlate(suppositions, proofSteps, (supposition, proofStep) => {
-    const suppositionMatches = matchSupposition(supposition, proofStep, substitutions, fileContext, localContext);
+  const suppositionsUnified = correlate(suppositions, proofSteps, (supposition, proofStep) => {
+    const suppositionUnified = unifySupposition(supposition, proofStep, substitutions, fileContext, localContext);
 
-    if (suppositionMatches) {
+    if (suppositionUnified) {
       return true;
     }
   });
 
-  return suppositionsMatch;
+  return suppositionsUnified;
 }
 
-function matchSupposition(supposition, proofStep, substitutions, fileContext, localContext) {
-  let suppositionMatches = false;
+function unifySupposition(supposition, proofStep, substitutions, fileContext, localContext) {
+  let suppositionUnified = false;
 
-  const statementNode = proofStep.getStatementNode();
+  const subproofNode = proofStep.getSubproofNode(),
+        statementNode = proofStep.getStatementNode();
+
+  if (subproofNode !== null) {
+    const subproofUnified = supposition.unifySubproof(subproofNode, substitutions, fileContext, localContext);
+
+    suppositionUnified = subproofUnified; ///
+  }
 
   if (statementNode !== null) {
-    const suppositionMatchesStatementNode = supposition.matchStatementNode(statementNode, substitutions, fileContext, localContext);
+    const statementUnified = supposition.unifyStatement(statementNode, substitutions, fileContext, localContext);
 
-    suppositionMatches = suppositionMatchesStatementNode;  ///
+    suppositionUnified = statementUnified;  ///
   }
 
-  return suppositionMatches;
+  return suppositionUnified;
 }
 
-function matchConsequent(consequent, statementNode, substitutions, fileContext, localContext) {
-  const consequentMatchesStatementNode = consequent.matchStatementNode(statementNode, substitutions, fileContext, localContext),
-        consequentMatches = consequentMatchesStatementNode; ///
+function unifyConsequent(consequent, statementNode, substitutions, fileContext, localContext) {
+  const statementUnified = consequent.unifyStatement(statementNode, substitutions, fileContext, localContext),
+        consequentUnified = statementUnified; ///
 
-  return consequentMatches;
+  return consequentUnified;
 }