occam-verify-cli 0.0.960 → 0.0.961

package/lib/verify/term.js

@@ -10,30 +10,36 @@ Object.defineProperty(exports, "default", {
 });
 var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _term = /*#__PURE__*/ _interop_require_default(require("../term"));
-var _bracketed = /*#__PURE__*/ _interop_require_default(require("../constructor/bracketed"));
-var _termWithConstructor = /*#__PURE__*/ _interop_require_default(require("../unifier/termWithConstructor"));
+var _termWithConstructors = /*#__PURE__*/ _interop_require_default(require("../unify/termWithConstructors"));
+var _termWithBracketedConstructor = /*#__PURE__*/ _interop_require_default(require("../unify/termWithBracketedConstructor"));
 var _query = require("../utilities/query");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-var termNodeQuery = (0, _query.nodeQuery)("/term/argument/term"), variableNodeQuery = (0, _query.nodeQuery)("/term/variable!");
+var variableNodeQuery = (0, _query.nodeQuery)("/term/variable!");
+var unifyTermFunctions = [
+    _termWithBracketedConstructor.default,
+    _termWithConstructors.default
+];
 function verifyTerm(termNode, terms, localContext, verifyAhead) {
-    var termVerified;
+    var termVerified = false;
     var termString = localContext.nodeAsString(termNode);
     localContext.trace("Verifying the '".concat(termString, "' term..."), termNode);
-    var verifyTermFunctions = [
-        verifyTermAsVariable,
-        unifyTermWithConstructors,
-        unifyTermWithBracketedConstructor
-    ];
-    termVerified = verifyTermFunctions.some(function(verifyTermFunction) {
-        var termVerified = verifyTermFunction(termNode, terms, localContext, verifyAhead);
-        if (termVerified) {
-            return true;
-        }
-    });
+    if (!termVerified) {
+        var termVerifiedAsVariable = verifyTermAsVariable(termNode, terms, localContext, verifyAhead);
+        termVerified = termVerifiedAsVariable; ///
+    }
+    if (!termVerified) {
+        var termUnified = unifyTermFunctions.some(function(unifyTermFunction) {
+            var termUnified = unifyTermFunction(termNode, terms, localContext, verifyAhead);
+            if (termUnified) {
+                return true;
+            }
+        });
+        termVerified = termUnified; ///
+    }
     if (termVerified) {
         localContext.debug("...verified the '".concat(termString, "' term."), termNode);
     }
@@ -49,8 +55,8 @@ function verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {
     if (variableNode !== null) {
         var termString = localContext.nodeAsString(termNode);
         localContext.trace("Verifying the '".concat(termString, "' term as a variable..."), termNode);
-        var variable = localContext.findVariableByVariableNode(variableNode);
-        if (variable !== null) {
+        var variableVerified = verifyVariable(variableNode, localContext);
+        if (variableVerified) {
             var verifiedAhead;
             var type = variable.getType(), term = _term.default.fromTermNodeAndType(termNode, type);
             terms.push(term);
@@ -64,54 +70,20 @@ function verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {
     }
     return termVerifiedAsVariable;
 }
-function unifyTermWithConstructors(termNode, terms, localContext, verifyAhead) {
-    var termUnifiedWithConstructors = false;
-    var variableNode = variableNodeQuery(termNode);
-    if (variableNode === null) {
-        var constructors = localContext.getConstructors();
-        termUnifiedWithConstructors = constructors.some(function(constructor) {
-            var termUnifiedWithConstructor = unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead);
-            if (termUnifiedWithConstructor) {
-                return true;
-            }
-        });
-    }
-    return termUnifiedWithConstructors;
-}
-function unifyTermWithBracketedConstructor(termNode, terms, localContext, verifyAhead) {
-    var termUnifiedWithBracketedConstructor;
-    var termString = localContext.nodeAsString(termNode), bracketedTerms = [];
-    localContext.trace("Unifying the '".concat(termString, "' term with the bracketed constructor..."), termNode);
-    termUnifiedWithBracketedConstructor = unifyTermWithConstructor(termNode, bracketedTerms, _bracketed.default, localContext, function() {
-        var verifiedAhead;
-        var bracketedTermNode = termNode; ///
-        termNode = termNodeQuery(bracketedTermNode); ///
-        var termVVerified = verifyTerm(termNode, terms, localContext, verifyAhead);
-        verifiedAhead = termVVerified; ///
-        return verifiedAhead;
-    });
-    if (termUnifiedWithBracketedConstructor) {
-        localContext.debug("...unified the '".concat(termString, "' term with the bracketed constructor."), termNode);
-    }
-    return termUnifiedWithBracketedConstructor;
-}
-function unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead) {
-    var termUnifiedWithConstructor = false;
-    var termString = localContext.nodeAsString(termNode), constructorString = constructor.getString(), constructorTermNode = constructor.getTermNode();
-    localContext.trace("Unifying the '".concat(termString, "' term with the '").concat(constructorString, "' constructor..."), termNode);
-    var termNodeA = termNode, constructorTermNodeB = constructorTermNode, unified = _termWithConstructor.default.unify(termNodeA, constructorTermNodeB, localContext);
-    if (unified) {
-        var verifiedAhead;
-        var type = constructor.getType(), term = _term.default.fromTermNodeAndType(termNode, type);
-        terms.push(term);
-        verifiedAhead = verifyAhead();
-        terms.pop();
-        termUnifiedWithConstructor = verifiedAhead; ///
+function verifyVariable(variableNode, localContext) {
+    var variableVerified = false;
+    var variableString = localContext.nodeAsString(variableNode);
+    localContext.trace("Verifying the '".concat(variableString, "' variable..."), variableNode);
+    var variablePresent = localContext.isVariablePresentByVariableNode(variableNode);
+    if (!variablePresent) {
+        localContext.trace("The '".concat(variableString, "' variable is not present."), variableNode);
+    } else {
+        variableVerified = true;
     }
-    if (termUnifiedWithConstructor) {
-        localContext.debug("...unified the '".concat(termString, "' term with the '").concat(constructorString, "' constructor."), termNode);
+    if (variableVerified) {
+        localContext.debug("...verified the '".concat(variableString, "' variable."), variableNode);
     }
-    return termUnifiedWithConstructor;
+    return variableVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Term from \"../term\";\nimport bracketedConstructor from \"../constructor/bracketed\";\nimport termWithConstructorUnifier from \"../unifier/termWithConstructor\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/term/argument/term\"),\n      variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, terms, localContext, verifyAhead) {\n  let termVerified;\n\n  const termString = localContext.nodeAsString(termNode);\n\n  localContext.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsVariable,\n    unifyTermWithConstructors,\n    unifyTermWithBracketedConstructor\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, terms, localContext, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    localContext.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(shim, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nfunction verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = localContext.nodeAsString(termNode);\n\n    localContext.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variable = localContext.findVariableByVariableNode(variableNode);\n\n    if (variable !== null) {\n      let verifiedAhead;\n\n      const type = variable.getType(),\n            term = Term.fromTermNodeAndType(termNode, type);\n\n      terms.push(term);\n\n      verifiedAhead = verifyAhead();\n\n      terms.pop();\n\n      termVerifiedAsVariable = verifiedAhead; ///\n    }\n\n    if (termVerifiedAsVariable) {\n      localContext.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction unifyTermWithConstructors(termNode, terms, localContext, verifyAhead) {\n  let termUnifiedWithConstructors = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode === null) {\n    const constructors = localContext.getConstructors();\n\n    termUnifiedWithConstructors = constructors.some((constructor) => {\n      const termUnifiedWithConstructor = unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead);\n\n      if (termUnifiedWithConstructor) {\n        return true;\n      }\n    });\n  }\n\n  return termUnifiedWithConstructors;\n}\n\nfunction unifyTermWithBracketedConstructor(termNode, terms, localContext, verifyAhead) {\n  let termUnifiedWithBracketedConstructor;\n\n  const termString = localContext.nodeAsString(termNode),\n        bracketedTerms = [];\n\n  localContext.trace(`Unifying the '${termString}' term with the bracketed constructor...`, termNode);\n\n  termUnifiedWithBracketedConstructor = unifyTermWithConstructor(termNode, bracketedTerms, bracketedConstructor, localContext, () => {\n    let verifiedAhead;\n\n    const bracketedTermNode = termNode; ///\n\n    termNode = termNodeQuery(bracketedTermNode); ///\n\n    const termVVerified = verifyTerm(termNode, terms, localContext, verifyAhead);\n\n    verifiedAhead = termVVerified;  ///\n\n    return verifiedAhead;\n  });\n\n  if (termUnifiedWithBracketedConstructor) {\n    localContext.debug(`...unified the '${termString}' term with the bracketed constructor.`, termNode);\n  }\n\n  return termUnifiedWithBracketedConstructor;\n}\n\nfunction unifyTermWithConstructor(termNode, terms, constructor, localContext, verifyAhead) {\n  let termUnifiedWithConstructor = false;\n\n  const termString = localContext.nodeAsString(termNode),\n        constructorString = constructor.getString(),\n        constructorTermNode = constructor.getTermNode();\n\n  localContext.trace(`Unifying the '${termString}' term with the '${constructorString}' constructor...`, termNode);\n\n  const termNodeA = termNode,  ///\n        constructorTermNodeB = constructorTermNode,  ///\n        unified = termWithConstructorUnifier.unify(termNodeA, constructorTermNodeB, localContext);\n\n  if (unified) {\n    let verifiedAhead;\n\n    const type = constructor.getType(),\n          term = Term.fromTermNodeAndType(termNode, type);\n\n    terms.push(term);\n\n    verifiedAhead = verifyAhead();\n\n    terms.pop();\n\n    termUnifiedWithConstructor = verifiedAhead;  ///\n  }\n\n  if (termUnifiedWithConstructor) {\n    localContext.debug(`...unified the '${termString}' term with the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termUnifiedWithConstructor;\n}\n\n"],"names":["termNodeQuery","nodeQuery","variableNodeQuery","verifyTerm","termNode","terms","localContext","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsVariable","unifyTermWithConstructors","unifyTermWithBracketedConstructor","some","verifyTermFunction","debug","Object","assign","shim","termVerifiedAsVariable","variableNode","variable","findVariableByVariableNode","verifiedAhead","type","getType","term","Term","fromTermNodeAndType","push","pop","termUnifiedWithConstructors","constructors","getConstructors","constructor","termUnifiedWithConstructor","unifyTermWithConstructor","termUnifiedWithBracketedConstructor","bracketedTerms","bracketedConstructor","bracketedTermNode","termVVerified","constructorString","getString","constructorTermNode","getTermNode","termNodeA","constructorTermNodeB","unified","termWithConstructorUnifier","unify"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBUZXJtIGZyb20gXCIuLi90ZXJtXCI7XG5pbXBvcnQgdW5pZnlUZXJtV2l0aENvbnN0cnVjdG9ycyBmcm9tIFwiLi4vdW5pZnkvdGVybVdpdGhDb25zdHJ1Y3RvcnNcIjtcbmltcG9ydCB1bmlmeVRlcm1XaXRoQnJhY2tldGVkQ29uc3RydWN0b3IgZnJvbSBcIi4uL3VuaWZ5L3Rlcm1XaXRoQnJhY2tldGVkQ29uc3RydWN0b3JcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB2YXJpYWJsZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtL3ZhcmlhYmxlIVwiKTtcblxuY29uc3QgdW5pZnlUZXJtRnVuY3Rpb25zID0gW1xuICAgICAgICB1bmlmeVRlcm1XaXRoQnJhY2tldGVkQ29uc3RydWN0b3IsXG4gICAgICAgIHVuaWZ5VGVybVdpdGhDb25zdHJ1Y3RvcnMsXG4gICAgICBdO1xuXG5mdW5jdGlvbiB2ZXJpZnlUZXJtKHRlcm1Ob2RlLCB0ZXJtcywgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgdGVybVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgY29uc3QgdGVybVN0cmluZyA9IGxvY2FsQ29udGV4dC5ub2RlQXNTdHJpbmcodGVybU5vZGUpO1xuXG4gIGxvY2FsQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHt0ZXJtU3RyaW5nfScgdGVybS4uLmAsIHRlcm1Ob2RlKTtcblxuICBpZiAoIXRlcm1WZXJpZmllZCkge1xuICAgIGNvbnN0IHRlcm1WZXJpZmllZEFzVmFyaWFibGUgPSB2ZXJpZnlUZXJtQXNWYXJpYWJsZSh0ZXJtTm9kZSwgdGVybXMsIGxvY2FsQ29udGV4dCwgdmVyaWZ5QWhlYWQpO1xuXG4gICAgdGVybVZlcmlmaWVkID0gdGVybVZlcmlmaWVkQXNWYXJpYWJsZTsgLy8vXG4gIH1cblxuICBpZiAoIXRlcm1WZXJpZmllZCkge1xuICAgIGNvbnN0IHRlcm1VbmlmaWVkID0gdW5pZnlUZXJtRnVuY3Rpb25zLnNvbWUoKHVuaWZ5VGVybUZ1bmN0aW9uKSA9PiB7XG4gICAgICBjb25zdCB0ZXJtVW5pZmllZCA9IHVuaWZ5VGVybUZ1bmN0aW9uKHRlcm1Ob2RlLCB0ZXJtcywgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCk7XG5cbiAgICAgIGlmICh0ZXJtVW5pZmllZCkge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cbiAgICB9KTtcblxuICAgIHRlcm1WZXJpZmllZCA9IHRlcm1VbmlmaWVkOyAvLy9cbiAgfVxuXG4gIGlmICh0ZXJtVmVyaWZpZWQpIHtcbiAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt0ZXJtU3RyaW5nfScgdGVybS5gLCB0ZXJtTm9kZSk7XG4gIH1cblxuICByZXR1cm4gdGVybVZlcmlmaWVkO1xufVxuXG5PYmplY3QuYXNzaWduKHNoaW0sIHtcbiAgdmVyaWZ5VGVybVxufSk7XG5cbmV4cG9ydCBkZWZhdWx0IHZlcmlmeVRlcm07XG5cbmZ1bmN0aW9uIHZlcmlmeVRlcm1Bc1ZhcmlhYmxlKHRlcm1Ob2RlLCB0ZXJtcywgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgdGVybVZlcmlmaWVkQXNWYXJpYWJsZSA9IGZhbHNlO1xuXG4gIGNvbnN0IHZhcmlhYmxlTm9kZSA9IHZhcmlhYmxlTm9kZVF1ZXJ5KHRlcm1Ob2RlKTtcblxuICBpZiAodmFyaWFibGVOb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgdGVybVN0cmluZyA9IGxvY2FsQ29udGV4dC5ub2RlQXNTdHJpbmcodGVybU5vZGUpO1xuXG4gICAgbG9jYWxDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgdmFyaWFibGUuLi5gLCB0ZXJtTm9kZSk7XG5cbiAgICBjb25zdCB2YXJpYWJsZVZlcmlmaWVkID0gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCBsb2NhbENvbnRleHQpO1xuXG4gICAgaWYgKHZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICAgIGxldCB2ZXJpZmllZEFoZWFkO1xuXG4gICAgICBjb25zdCB0eXBlID0gdmFyaWFibGUuZ2V0VHlwZSgpLFxuICAgICAgICAgICAgdGVybSA9IFRlcm0uZnJvbVRlcm1Ob2RlQW5kVHlwZSh0ZXJtTm9kZSwgdHlwZSk7XG5cbiAgICAgIHRlcm1zLnB1c2godGVybSk7XG5cbiAgICAgIHZlcmlmaWVkQWhlYWQgPSB2ZXJpZnlBaGVhZCgpO1xuXG4gICAgICB0ZXJtcy5wb3AoKTtcblxuICAgICAgdGVybVZlcmlmaWVkQXNWYXJpYWJsZSA9IHZlcmlmaWVkQWhlYWQ7IC8vL1xuICAgIH1cblxuICAgIGlmICh0ZXJtVmVyaWZpZWRBc1ZhcmlhYmxlKSB7XG4gICAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt0ZXJtU3RyaW5nfScgdGVybSBhcyBhIHZhcmlhYmxlLmAsIHRlcm1Ob2RlKTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gdGVybVZlcmlmaWVkQXNWYXJpYWJsZTtcbn1cblxuZnVuY3Rpb24gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IHZhcmlhYmxlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB2YXJpYWJsZVN0cmluZyA9IGxvY2FsQ29udGV4dC5ub2RlQXNTdHJpbmcodmFyaWFibGVOb2RlKTtcblxuICBsb2NhbENvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZS4uLmAsIHZhcmlhYmxlTm9kZSk7XG5cbiAgY29uc3QgdmFyaWFibGVQcmVzZW50ID0gbG9jYWxDb250ZXh0LmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5vZGUodmFyaWFibGVOb2RlKTtcblxuICBpZiAoIXZhcmlhYmxlUHJlc2VudCkge1xuICAgIGxvY2FsQ29udGV4dC50cmFjZShgVGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUgaXMgbm90IHByZXNlbnQuYCwgdmFyaWFibGVOb2RlKTtcbiAgfSBlbHNlIHtcbiAgICB2YXJpYWJsZVZlcmlmaWVkID0gdHJ1ZTtcbiAgfVxuXG4gIGlmICh2YXJpYWJsZVZlcmlmaWVkKSB7XG4gICAgbG9jYWxDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZS5gLCB2YXJpYWJsZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHZhcmlhYmxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmFyaWFibGVOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ1bmlmeVRlcm1GdW5jdGlvbnMiLCJ1bmlmeVRlcm1XaXRoQnJhY2tldGVkQ29uc3RydWN0b3IiLCJ1bmlmeVRlcm1XaXRoQ29uc3RydWN0b3JzIiwidmVyaWZ5VGVybSIsInRlcm1Ob2RlIiwidGVybXMiLCJsb2NhbENvbnRleHQiLCJ2ZXJpZnlBaGVhZCIsInRlcm1WZXJpZmllZCIsInRlcm1TdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsInRlcm1WZXJpZmllZEFzVmFyaWFibGUiLCJ2ZXJpZnlUZXJtQXNWYXJpYWJsZSIsInRlcm1VbmlmaWVkIiwic29tZSIsInVuaWZ5VGVybUZ1bmN0aW9uIiwiZGVidWciLCJPYmplY3QiLCJhc3NpZ24iLCJzaGltIiwidmFyaWFibGVOb2RlIiwidmFyaWFibGVWZXJpZmllZCIsInZlcmlmeVZhcmlhYmxlIiwidmVyaWZpZWRBaGVhZCIsInR5cGUiLCJ2YXJpYWJsZSIsImdldFR5cGUiLCJ0ZXJtIiwiVGVybSIsImZyb21UZXJtTm9kZUFuZFR5cGUiLCJwdXNoIiwicG9wIiwidmFyaWFibGVTdHJpbmciLCJ2YXJpYWJsZVBy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

package/lib/verify/termAsConstructor.js

@@ -25,7 +25,7 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
     if (typeVerified) {
         var firstType = (0, _array.first)(types);
         type = firstType; ///
-        termVerifiedAsConstructor = _termAsConstructor.default.verify(termNode, fileContext);
+        termVerifiedAsConstructor = _termAsConstructor.default.verifyTerm(termNode, fileContext);
     }
     if (termVerifiedAsConstructor) {
         var tokens = fileContext.getTokens(), constructor = _constructor.default.fromTermNodeTypeAndTokens(termNode, type, tokens);
@@ -55,4 +55,4 @@ function verifyType(typeNode, types, fileContext) {
     return typeVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIGZyb20gXCIuLi92ZXJpZmllci90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5pbXBvcnQgeyBmaXJzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VGVybUFzQ29uc3RydWN0b3IodGVybU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IGZhbHNlO1xuXG4gIGNvbnN0IHRlcm1TdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodGVybU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuLi5gLCB0ZXJtTm9kZSk7XG5cbiAgY29uc3QgdHlwZXMgPSBbXSxcbiAgICAgICAgdHlwZVZlcmlmaWVkID0gdmVyaWZ5VHlwZSh0eXBlTm9kZSwgdHlwZXMsIGZpbGVDb250ZXh0KTtcblxuICBsZXQgdHlwZTtcblxuICBpZiAodHlwZVZlcmlmaWVkKSB7XG4gICAgY29uc3QgZmlyc3RUeXBlID0gZmlyc3QodHlwZXMpO1xuXG4gICAgdHlwZSA9IGZpcnN0VHlwZTsgLy8vXG5cbiAgICB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gdGVybUFzQ29uc3RydWN0b3JWZXJpZmllci52ZXJpZnkodGVybU5vZGUsIGZpbGVDb250ZXh0KTtcbiAgfVxuXG4gIGlmICh0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yKSB7XG4gICAgY29uc3QgdG9rZW5zID0gZmlsZUNvbnRleHQuZ2V0VG9rZW5zKCksXG4gICAgICAgICAgY29uc3RydWN0b3IgPSBDb25zdHJ1Y3Rvci5mcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpO1xuXG4gICAgZmlsZUNvbnRleHQuYWRkQ29uc3RydWN0b3IoY29uc3RydWN0b3IpO1xuICB9XG5cbiAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuYCwgdGVybU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG59XG5cbmZ1bmN0aW9uIHZlcmlmeVR5cGUodHlwZU5vZGUsIHR5cGVzLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdHlwZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgaWYgKHR5cGVOb2RlID09PSBudWxsKSB7XG4gICAgY29uc3QgdHlwZSA9IG51bGw7XG5cbiAgICB0eXBlcy5wdXNoKHR5cGUpO1xuXG4gICAgdHlwZVZlcmlmaWVkID0gdHJ1ZTtcbiAgfSBlbHNlIHtcbiAgICBjb25zdCB0eXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOb2RlKHR5cGVOb2RlKTtcblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICB0eXBlcy5wdXNoKHR5cGUpO1xuXG4gICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCB0eXBlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHR5cGVOb2RlKTtcblxuICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB0eXBlTm9kZSk7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUZXJtQXNDb25zdHJ1Y3RvciIsInRlcm1Ob2RlIiwidHlwZU5vZGUiLCJmaWxlQ29udGV4dCIsInRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IiLCJ0ZXJtU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJ0eXBlcyIsInR5cGVWZXJpZmllZCIsInZlcmlmeVR5cGUiLCJ0eXBlIiwiZmlyc3RUeXBlIiwiZmlyc3QiLCJ0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIiwidmVyaWZ5IiwidG9rZW5zIiwiZ2V0VG9rZW5zIiwiY29uc3RydWN0b3IiLCJDb25zdHJ1Y3RvciIsImZyb21UZXJtTm9kZVR5cGVBbmRUb2tlbnMiLCJhZGRDb25zdHJ1Y3RvciIsInB1c2giLCJmaW5kVHlwZUJ5VHlwZU5vZGUiLCJ0eXBlU3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7O2tFQUxBO3dFQUNjO3FCQUVoQjs7Ozs7O0FBRVAsU0FBU0Esd0JBQXdCQyxRQUFRLEVBQUVDLFFBQVEsRUFBRUMsV0FBVztJQUM3RSxJQUFJQyw0QkFBNEI7SUFFaEMsSUFBTUMsYUFBYUYsWUFBWUcsWUFBWSxDQUFDTDtJQUU1Q0UsWUFBWUksS0FBSyxDQUFDLEFBQUMsa0JBQTRCLE9BQVhGLFlBQVcsK0JBQTZCSjtJQUU1RSxJQUFNTyxRQUFRLEVBQUUsRUFDVkMsZUFBZUMsV0FBV1IsVUFBVU0sT0FBT0w7SUFFakQsSUFBSVE7SUFFSixJQUFJRixjQUFjO1FBQ2hCLElBQU1HLFlBQVlDLElBQUFBLFlBQUssRUFBQ0w7UUFFeEJHLE9BQU9DLFdBQVcsR0FBRztRQUVyQlIsNEJBQTRCVSwwQkFBeUIsQ0FBQ0MsTUFBTSxDQUFDZCxVQUFVRTtJQUN6RTtJQUVBLElBQUlDLDJCQUEyQjtRQUM3QixJQUFNWSxTQUFTYixZQUFZYyxTQUFTLElBQzlCQyxjQUFjQyxvQkFBVyxDQUFDQyx5QkFBeUIsQ0FBQ25CLFVBQVVVLE1BQU1LO1FBRTFFYixZQUFZa0IsY0FBYyxDQUFDSDtJQUM3QjtJQUVBLElBQUlkLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1Q7QUFFQSxTQUFTTSxXQUFXUixRQUFRLEVBQUVNLEtBQUssRUFBRUwsV0FBVztJQUM5QyxJQUFJTSxlQUFlO0lBRW5CLElBQUlQLGFBQWEsTUFBTTtRQUNyQixJQUFNUyxPQUFPO1FBRWJILE1BQU1jLElBQUksQ0FBQ1g7UUFFWEYsZUFBZTtJQUNqQixPQUFPO1FBQ0wsSUFBTUUsUUFBT1IsWUFBWW9CLGtCQUFrQixDQUFDckI7UUFFNUMsSUFBSVMsVUFBUyxNQUFNO1lBQ2pCSCxNQUFNYyxJQUFJLENBQUNYO1lBRVhGLGVBQWU7UUFDakIsT0FBTztZQUNMLElBQU1lLGFBQWFyQixZQUFZRyxZQUFZLENBQUNKO1lBRTVDQyxZQUFZSSxLQUFLLENBQUMsQUFBQyxRQUFrQixPQUFYaUIsWUFBVywyQkFBeUJ0QjtRQUNoRTtJQUNGO0lBRUEsT0FBT087QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIGZyb20gXCIuLi92ZXJpZmllci90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5pbXBvcnQgeyBmaXJzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VGVybUFzQ29uc3RydWN0b3IodGVybU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IGZhbHNlO1xuXG4gIGNvbnN0IHRlcm1TdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodGVybU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuLi5gLCB0ZXJtTm9kZSk7XG5cbiAgY29uc3QgdHlwZXMgPSBbXSxcbiAgICAgICAgdHlwZVZlcmlmaWVkID0gdmVyaWZ5VHlwZSh0eXBlTm9kZSwgdHlwZXMsIGZpbGVDb250ZXh0KTtcblxuICBsZXQgdHlwZTtcblxuICBpZiAodHlwZVZlcmlmaWVkKSB7XG4gICAgY29uc3QgZmlyc3RUeXBlID0gZmlyc3QodHlwZXMpO1xuXG4gICAgdHlwZSA9IGZpcnN0VHlwZTsgLy8vXG5cbiAgICB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gdGVybUFzQ29uc3RydWN0b3JWZXJpZmllci52ZXJpZnlUZXJtKHRlcm1Ob2RlLCBmaWxlQ29udGV4dCk7XG4gIH1cblxuICBpZiAodGVybVZlcmlmaWVkQXNDb25zdHJ1Y3Rvcikge1xuICAgIGNvbnN0IHRva2VucyA9IGZpbGVDb250ZXh0LmdldFRva2VucygpLFxuICAgICAgICAgIGNvbnN0cnVjdG9yID0gQ29uc3RydWN0b3IuZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2Vucyh0ZXJtTm9kZSwgdHlwZSwgdG9rZW5zKTtcblxuICAgIGZpbGVDb250ZXh0LmFkZENvbnN0cnVjdG9yKGNvbnN0cnVjdG9yKTtcbiAgfVxuXG4gIGlmICh0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yKSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt0ZXJtU3RyaW5nfScgdGVybSBhcyBhIGNvbnN0cnVjdG9yLmAsIHRlcm1Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yO1xufVxuXG5mdW5jdGlvbiB2ZXJpZnlUeXBlKHR5cGVOb2RlLCB0eXBlcywgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHR5cGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGlmICh0eXBlTm9kZSA9PT0gbnVsbCkge1xuICAgIGNvbnN0IHR5cGUgPSBudWxsO1xuXG4gICAgdHlwZXMucHVzaCh0eXBlKTtcblxuICAgIHR5cGVWZXJpZmllZCA9IHRydWU7XG4gIH0gZWxzZSB7XG4gICAgY29uc3QgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICBpZiAodHlwZSAhPT0gbnVsbCkge1xuICAgICAgdHlwZXMucHVzaCh0eXBlKTtcblxuICAgICAgdHlwZVZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgdHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgICAgIGZpbGVDb250ZXh0LmRlYnVnKGBUaGUgJyR7dHlwZVN0cmluZ30nIHR5cGUgaXMgbm90IHByZXNlbnQuYCwgdHlwZU5vZGUpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiB0eXBlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VGVybUFzQ29uc3RydWN0b3IiLCJ0ZXJtTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwidHlwZXMiLCJ0eXBlVmVyaWZpZWQiLCJ2ZXJpZnlUeXBlIiwidHlwZSIsImZpcnN0VHlwZSIsImZpcnN0IiwidGVybUFzQ29uc3RydWN0b3JWZXJpZmllciIsInZlcmlmeVRlcm0iLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJjb25zdHJ1Y3RvciIsIkNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2VucyIsImFkZENvbnN0cnVjdG9yIiwicHVzaCIsImZpbmRUeXBlQnlUeXBlTm9kZSIsInR5cGVTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU9BOzs7ZUFBd0JBOzs7a0VBTEE7d0VBQ2M7cUJBRWhCOzs7Ozs7QUFFUCxTQUFTQSx3QkFBd0JDLFFBQVEsRUFBRUMsUUFBUSxFQUFFQyxXQUFXO0lBQzdFLElBQUlDLDRCQUE0QjtJQUVoQyxJQUFNQyxhQUFhRixZQUFZRyxZQUFZLENBQUNMO0lBRTVDRSxZQUFZSSxLQUFLLENBQUMsQUFBQyxrQkFBNEIsT0FBWEYsWUFBVywrQkFBNkJKO0lBRTVFLElBQU1PLFFBQVEsRUFBRSxFQUNWQyxlQUFlQyxXQUFXUixVQUFVTSxPQUFPTDtJQUVqRCxJQUFJUTtJQUVKLElBQUlGLGNBQWM7UUFDaEIsSUFBTUcsWUFBWUMsSUFBQUEsWUFBSyxFQUFDTDtRQUV4QkcsT0FBT0MsV0FBVyxHQUFHO1FBRXJCUiw0QkFBNEJVLDBCQUF5QixDQUFDQyxVQUFVLENBQUNkLFVBQVVFO0lBQzdFO0lBRUEsSUFBSUMsMkJBQTJCO1FBQzdCLElBQU1ZLFNBQVNiLFlBQVljLFNBQVMsSUFDOUJDLGNBQWNDLG9CQUFXLENBQUNDLHlCQUF5QixDQUFDbkIsVUFBVVUsTUFBTUs7UUFFMUViLFlBQVlrQixjQUFjLENBQUNIO0lBQzdCO0lBRUEsSUFBSWQsMkJBQTJCO1FBQzdCRCxZQUFZSSxLQUFLLENBQUMsQUFBQyxvQkFBOEIsT0FBWEYsWUFBVyw2QkFBMkJKO0lBQzlFO0lBRUEsT0FBT0c7QUFDVDtBQUVBLFNBQVNNLFdBQVdSLFFBQVEsRUFBRU0sS0FBSyxFQUFFTCxXQUFXO0lBQzlDLElBQUlNLGVBQWU7SUFFbkIsSUFBSVAsYUFBYSxNQUFNO1FBQ3JCLElBQU1TLE9BQU87UUFFYkgsTUFBTWMsSUFBSSxDQUFDWDtRQUVYRixlQUFlO0lBQ2pCLE9BQU87UUFDTCxJQUFNRSxRQUFPUixZQUFZb0Isa0JBQWtCLENBQUNyQjtRQUU1QyxJQUFJUyxVQUFTLE1BQU07WUFDakJILE1BQU1jLElBQUksQ0FBQ1g7WUFFWEYsZUFBZTtRQUNqQixPQUFPO1lBQ0wsSUFBTWUsYUFBYXJCLFlBQVlHLFlBQVksQ0FBQ0o7WUFFNUNDLFlBQVlJLEtBQUssQ0FBQyxBQUFDLFFBQWtCLE9BQVhpQixZQUFXLDJCQUF5QnRCO1FBQ2hFO0lBQ0Y7SUFFQSxPQUFPTztBQUNUIn0=

package/lib/verify/termGivenType.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return verifyTermGivenType;
+    }
+});
+var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
+var _array = require("../utilities/array");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function verifyTermGivenType(termNode, type, localContext) {
+    var termVerifiedGivenType = false;
+    if (type !== null) {
+        var verifyTerm = _shim.default.verifyTerm, terms = [], termVerified = verifyTerm(termNode, terms, localContext, function() {
+            var verifiedAhead = false;
+            var firstTerm = (0, _array.first)(terms), term = firstTerm, termType = term.getType(), termTypeEqualToOrSubTypeOfType = termType.isEqualToOrSubTypeOf(type);
+            if (termTypeEqualToOrSubTypeOfType) {
+                verifiedAhead = true;
+            }
+            return verifiedAhead;
+        });
+        termVerifiedGivenType = termVerified; ///
+    }
+    return termVerifiedGivenType;
+}
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUdpdmVuVHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcblxuaW1wb3J0IHsgZmlyc3QgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVRlcm1HaXZlblR5cGUodGVybU5vZGUsIHR5cGUsIGxvY2FsQ29udGV4dCkge1xuICBsZXQgdGVybVZlcmlmaWVkR2l2ZW5UeXBlID0gZmFsc2U7XG5cbiAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICBjb25zdCB7IHZlcmlmeVRlcm0gfSA9IHNoaW0sXG4gICAgICAgICAgdGVybXMgPSBbXSxcbiAgICAgICAgICB0ZXJtVmVyaWZpZWQgPSB2ZXJpZnlUZXJtKHRlcm1Ob2RlLCB0ZXJtcywgbG9jYWxDb250ZXh0LCAoKSA9PiB7XG4gICAgICAgICAgICBsZXQgdmVyaWZpZWRBaGVhZCA9IGZhbHNlO1xuXG4gICAgICAgICAgICBjb25zdCBmaXJzdFRlcm0gPSBmaXJzdCh0ZXJtcyksXG4gICAgICAgICAgICAgICAgICB0ZXJtID0gZmlyc3RUZXJtLCAvLy9cbiAgICAgICAgICAgICAgICAgIHRlcm1UeXBlID0gdGVybS5nZXRUeXBlKCksXG4gICAgICAgICAgICAgICAgICB0ZXJtVHlwZUVxdWFsVG9PclN1YlR5cGVPZlR5cGUgPSB0ZXJtVHlwZS5pc0VxdWFsVG9PclN1YlR5cGVPZih0eXBlKTtcblxuICAgICAgICAgICAgaWYgKHRlcm1UeXBlRXF1YWxUb09yU3ViVHlwZU9mVHlwZSkge1xuICAgICAgICAgICAgICB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgICAgfSk7XG5cbiAgICB0ZXJtVmVyaWZpZWRHaXZlblR5cGUgPSB0ZXJtVmVyaWZpZWQ7IC8vL1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEdpdmVuVHlwZTtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUZXJtR2l2ZW5UeXBlIiwidGVybU5vZGUiLCJ0eXBlIiwibG9jYWxDb250ZXh0IiwidGVybVZlcmlmaWVkR2l2ZW5UeXBlIiwidmVyaWZ5VGVybSIsInNoaW0iLCJ0ZXJtcyIsInRlcm1WZXJpZmllZCIsInZlcmlmaWVkQWhlYWQiLCJmaXJzdFRlcm0iLCJmaXJzdCIsInRlcm0iLCJ0ZXJtVHlwZSIsImdldFR5cGUiLCJ0ZXJtVHlwZUVxdWFsVG9PclN1YlR5cGVPZlR5cGUiLCJpc0VxdWFsVG9PclN1YlR5cGVPZiJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBTUE7OztlQUF3QkE7OzsyREFKUDtxQkFFSzs7Ozs7O0FBRVAsU0FBU0Esb0JBQW9CQyxRQUFRLEVBQUVDLElBQUksRUFBRUMsWUFBWTtJQUN0RSxJQUFJQyx3QkFBd0I7SUFFNUIsSUFBSUYsU0FBUyxNQUFNO1FBQ2pCLElBQU0sQUFBRUcsYUFBZUMsYUFBSSxDQUFuQkQsWUFDRkUsUUFBUSxFQUFFLEVBQ1ZDLGVBQWVILFdBQVdKLFVBQVVNLE9BQU9KLGNBQWM7WUFDdkQsSUFBSU0sZ0JBQWdCO1lBRXBCLElBQU1DLFlBQVlDLElBQUFBLFlBQUssRUFBQ0osUUFDbEJLLE9BQU9GLFdBQ1BHLFdBQVdELEtBQUtFLE9BQU8sSUFDdkJDLGlDQUFpQ0YsU0FBU0csb0JBQW9CLENBQUNkO1lBRXJFLElBQUlhLGdDQUFnQztnQkFDbENOLGdCQUFnQjtZQUNsQjtZQUVBLE9BQU9BO1FBQ1Q7UUFFTkwsd0JBQXdCSSxjQUFjLEdBQUc7SUFDM0M7SUFFQSxPQUFPSjtBQUNUIn0=

package/package.json

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

package/src/context/local.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import Variable from "../variable";
 import Equivalence from "../equivalence";
 
 import { last, reverse } from "../utilities/array";
@@ -235,26 +234,18 @@ class LocalContext {
 
     proofSteps = reverse(proofSteps); ///
 
-    const localContextA = this,  ///
-          localContextB = localContext, ///
-          statementNodeAB = statementNode, ///
-          statementStringB = localContextA.nodeAsString(statementNodeAB);
-
-    localContextB.trace(`Unifying the '${statementStringB}' statement...`, statementNodeAB);
-
     const equivalences = this.getEquivalences(),
+          localContextA = this,  ///
+          localContextB = localContext, ///
+          statementNodeB = statementNode, ///
           statementUnified = proofSteps.some((proofStep) => {
-            const statementUnified = proofStep.unifyStatement(statementNode, equivalences, localContextA, localContextB);
+            const statementUnified = proofStep.unifyStatement(statementNodeB, equivalences, localContextA, localContextB);
 
             if (statementUnified) {
               return true;
             }
           });
 
-    if (statementUnified) {
-      localContextB.debug(`...unified the '${statementStringB}' statement.`, statementNodeAB);
-    }
-
     return statementUnified;
   }
 

package/src/proofStep.js

@@ -17,22 +17,27 @@ export default class ProofStep {
     return this.statementNode;
   }
 
-  unifyStatement(statementNode, equivalences, localContextA, localContextB) {
+  unifyStatement(statementNodeB, equivalences, localContextA, localContextB) {
     let statementUnified = false;
 
     if (this.statementNode !== null) {
       let statementUnifiedWithStatement = false;
 
       if (!statementUnifiedWithStatement) {
-        const statementNodeA = statementNode, ///
-              statementNodeB = this.statementNode;  ///
+        const statementNodeA = this.statementNode;  ///
 
         statementUnifiedWithStatement = unifyStatementWithStatement(statementNodeA, statementNodeB, equivalences, localContextA, localContextB);
       }
 
       if (!statementUnifiedWithStatement) {
-        const statementNodeA = statementNode, ///
-              statementNodeB = this.statementNode;  ///
+        const statementNodeA = statementNodeB,  ///
+              localContext = localContextA; ///
+
+        statementNodeB = this.statementNode;  ///
+
+        localContextA = localContextB;  ///
+
+        localContextB = localContext; ///
 
         statementUnifiedWithStatement = unifyStatementWithStatement(statementNodeA, statementNodeB, equivalences, localContextA, localContextB);
       }

package/src/substitution/termForVariable.js

@@ -29,14 +29,21 @@ export default class TermForVariableSubstitution extends Substitution {
     return node;
   }
 
-  isTransformed(substitution) {
-    const termNod = substitution.getTermNode(),
-          variableNode = substitution.getVariableNode(),
-          termNodeMatches = this.termNode.match(termNod),
-          variableNodeMatches = this.variableNode.match(variableNode),
-          transformed = ((!termNodeMatches) && (!variableNodeMatches));
-
-    return transformed;
+  transformed(substitutions) {
+    let transformedSubstitution = null;
+
+    const transformedTermNode = transformTermNode(this.termNode, substitutions),
+          transformedVariableNode = transformVariableNode(this.variableNode, substitutions);
+
+    if ((transformedTermNode !== null) && (transformedVariableNode !== null)) {
+      const termNode = transformedTermNode, ///
+            variableNode = transformedVariableNode,
+            termForVariableSubstitution = new TermForVariableSubstitution(termNode, variableNode);
+
+      transformedSubstitution = termForVariableSubstitution;  ///
+    }
+
+    return transformedSubstitution;
   }
 
   matchTermNode(termNode) {
@@ -95,22 +102,12 @@ export default class TermForVariableSubstitution extends Substitution {
     let termNode = substitution.getTermNode(),
         variableNode = substitution.getVariableNode();
 
-    termNode = substituteTermNode(termNode, substitutions); ///
+    const transformedTermNode = transformTermNode(termNode, substitutions),
+          transformedVariableNode = transformVariableNode(variableNode, substitutions); ///
 
-    variableNode = substituteVariableNode(variableNode, substitutions); ///
+    termNode = transformedTermNode; ///
 
-    const termForVariableSubstitution = new TermForVariableSubstitution(variableNode, termNode);
-
-    return termForVariableSubstitution;
-  }
-
-  static fromSubstitutionNodeAndSubstitutions(substitutionNode, substitutions) {
-    let termNode = termNodeQuery(substitutionNode),
-        variableNode = variableNodeQuery(substitutionNode);
-
-    termNode = substituteTermNode(termNode, substitutions); ///
-
-    variableNode = substituteVariableNode(variableNode, substitutions); ///
+    variableNode = transformedVariableNode; ///
 
     const termForVariableSubstitution = new TermForVariableSubstitution(variableNode, termNode);
 
@@ -118,7 +115,9 @@ export default class TermForVariableSubstitution extends Substitution {
   }
 }
 
-function substituteTermNode(termNode, substitutions) {
+function transformTermNode(termNode, substitutions) {
+  let transformedTermNode = null;
+
   const termVariableNode = variableNodeQuery(termNode);
 
   if (termVariableNode !== null) {
@@ -126,31 +125,35 @@ function substituteTermNode(termNode, substitutions) {
       const substitutionMatchesVariableNode = substitution.matchVariableNode(termVariableNode);
 
       if (substitutionMatchesVariableNode) {
-        termNode = substitution.getTermNode();  ///
+        const termNode = substitution.getTermNode();
+
+        transformedTermNode = termNode; ////
 
         return true;
       }
     });
   }
 
-  return termNode;
+  return transformedTermNode;
 }
 
-function substituteVariableNode(variableNode, substitutions) {
+function transformVariableNode(variableNode, substitutions) {
+  let transformedVariableNode = null;
+
   substitutions.someSubstitution((substitution) => {
     const substitutionMatchesVariableNode = substitution.matchVariableNode(variableNode);
 
     if (substitutionMatchesVariableNode) {
       const termNode = substitution.getTermNode(),
-            termVariableNode = variableNodeQuery(termNode);
+            variableNode = variableNodeQuery(termNode);
 
-      if (termVariableNode !== null) {
-        variableNode = termVariableNode;  ///
+      if (variableNode !== null) {
+        transformedVariableNode = variableNode;  ///
 
         return true;
       }
     }
   });
 
-  return variableNode;
+  return transformedVariableNode;
 }

package/src/unifier/statementWithCombinator.js

@@ -12,12 +12,12 @@ const termNodeQuery = nodeQuery("/term!"),
       statementNodeQuery = nodeQuery("/statement!");
 
 class StatementWithCombinatorUnifier extends Unifier {
-  unify(statementNode, combinatorStatementNode, localContext) {
+  unify(statementNode, combinatorStatementNode, assignments, derived, localContext) {
     let statementUnifiedWithCombinator;
 
     const nonTerminalNodeA = statementNode, ///
           nonTerminalNodeB = combinatorStatementNode, ///
-          nonTerminalNodeUnified = this.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, localContext);
+          nonTerminalNodeUnified = this.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, assignments, derived, localContext);
 
     statementUnifiedWithCombinator = nonTerminalNodeUnified; ///
 
@@ -28,10 +28,10 @@ class StatementWithCombinatorUnifier extends Unifier {
     {
       nodeQueryA: statementNodeQuery,
       nodeQueryB: metaTypeNodeQuery,
-      unify: (statementNodeA, metaTypeNodeB, localContext) => {
+      unify: (statementNodeA, metaTypeNodeB, assignments, derived, localContext) => {
         const metaTypeNode = metaTypeNodeB, ///
               statementNode = statementNodeA, ///
-              statementUnifiedWithMetaType = unifyStatementWithMetaType(statementNode, metaTypeNode, localContext);
+              statementUnifiedWithMetaType = unifyStatementWithMetaType(statementNode, metaTypeNode, assignments, derived, localContext);
 
         return statementUnifiedWithMetaType;
       }
@@ -39,7 +39,7 @@ class StatementWithCombinatorUnifier extends Unifier {
     {
       nodeQueryA: termNodeQuery,
       nodeQueryB: typeNodeQuery,
-      unify: (termNodeA, typeNodeB, localContext) => {
+      unify: (termNodeA, typeNodeB, assignments, derived, localContext) => {
         const termNode = termNodeA, ///
               typeNode = typeNodeB, ///
               termUnifiedWithType = unifyTermWithType(termNode, typeNode, localContext);

package/src/unify/statementAtainstStatement.js

@@ -1,30 +1,30 @@
 "use strict";
 
+import Substitutions from "../substitutions";
 import metaLevelUnifier from "../unifier/metaLevel";
 import TermForVariableSubstitution from "../substitution/termForVariable";
 
 import { push } from "../utilities/array";
 
 export default function unifyStatementWithStatement(statementNodeA, statementNodeB, substitution, substitutions, localContextA, localContextB) {
-  let statementUnifiedWithtatement = false;
+  let statementUnifiedWithStatement = false;
 
-  const termForVariableSubstitution = TermForVariableSubstitution.fromSubstitutionAndSubstitutions(substitution, substitutions),
-        transformed = termForVariableSubstitution.isTransformed(substitution);
+  const transformedSubstitutions = Substitutions.fromNothing(),
+        transformedSubstitution = substitution.transformed(substitutions);
 
-  let substitutionsA = []; ///
-
-  if (transformed) {
-    const substitutionA = termForVariableSubstitution;  ///
-
-    substitutionsA.push(substitutionA);
+  if (transformedSubstitution !== null) {
+    transformedSubstitutions.addSubstitution(transformedSubstitution, localContextA, localContextB);
   }
 
   const nodeA = statementNodeA,  ///
         nodeB = statementNodeB,  ///
-        unified = metaLevelUnifier.unify(nodeA, nodeB, substitutionsA, localContextA, localContextB);
+        unified = metaLevelUnifier.unify(nodeA, nodeB, transformedSubstitutions, localContextA, localContextB);
 
   if (unified) {
-    if (!transformed) {
+    if (transformedSubstitution === null) {
+
+      debugger
+
       const substitutionB = termForVariableSubstitution,  ///
             substitutionsB = [
               substitutionB
@@ -35,10 +35,10 @@ export default function unifyStatementWithStatement(statementNodeA, statementNod
       push(substitutions, substitutionsA);
     }
 
-    statementUnifiedWithtatement = true;
+    statementUnifiedWithStatement = true;
   }
 
-  return statementUnifiedWithtatement;
+  return statementUnifiedWithStatement;
 }
 
 function transformSubstitutions(substitutionsA, substitutionsB) {

package/src/unify/statementWithBracketedCombinator.js

@@ -0,0 +1,22 @@
+"use strict";
+
+import bracketedCombinator from "../ocmbinator/bracketed";
+import statementWithCombinatorUnifier from "../unifier/statementWithCombinator";
+
+export default function unifyStatementWithBracketedCombinator(statementNode, assignments, derived, localContext) {
+  let statementUnifiedWithBracketedCombinator;
+
+  const statementString = localContext.nodeAsString(statementNode);
+
+  localContext.trace(`Unifying the '${statementString}' statement with the bracketed combinator...`, statementNode);
+
+  const bracketedCombinatorStatementNode = bracketedCombinator.getStatementNode();
+
+  statementUnifiedWithBracketedCombinator = statementWithCombinatorUnifier.unify(statementNode, bracketedCombinatorStatementNode, assignments, derived, localContext);
+
+  if (statementUnifiedWithBracketedCombinator) {
+    localContext.debug(`...unified the '${statementString}' statement with the bracketed combinator.`, statementNode);
+  }
+
+  return statementUnifiedWithBracketedCombinator;
+}

package/src/unify/statementWithCombinators.js

@@ -0,0 +1,38 @@
+"use strict";
+
+import statementWithCombinatorUnifier from "../unifier/statementWithCombinator";
+
+export default function unifyStatementWithCombinators(statementNode, assignments, derived, localContext) {
+  let statementUnifiedWithCombinators;
+
+  const combinators = localContext.getCombinators();
+
+  statementUnifiedWithCombinators = combinators.some((combinator) => {
+    const statementUnifiedWithCombinator = unifyStatementWithCombinator(statementNode, combinator, assignments, derived, localContext);
+
+    if (statementUnifiedWithCombinator) {
+      return true;
+    }
+  });
+
+  return statementUnifiedWithCombinators;
+}
+
+function unifyStatementWithCombinator(statementNode, combinator, assignments, derived, localContext) {
+  let statementUnifiedWithCombinator;
+
+  const statementString = localContext.nodeAsString(statementNode),
+        combinatorString = combinator.getString();
+
+  localContext.trace(`Unifying the '${statementString}' statement with the '${combinatorString}' combinator...`, statementNode);
+
+  const combinatorStatementNode = combinator.getStatementNode();
+
+  statementUnifiedWithCombinator = statementWithCombinatorUnifier.unify(statementNode, combinatorStatementNode, assignments, derived, localContext);
+
+  if (statementUnifiedWithCombinator) {
+    localContext.debug(`...unified the '${statementString}' statement with the '${combinatorString}' combinator.`, statementNode);
+  }
+
+  return statementUnifiedWithCombinator;
+}

package/src/unify/statementWithMetaType.js

@@ -1,50 +1,14 @@
 "use strict";
 
-import shim from "../shim";
+import verifyStatementGivenMetaType from "../verify/statementGivenMetaType";
 
-import { nodeQuery } from "../utilities/query";
-import { FRAME_META_TYPE_NAME, STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
+export default function unifyStatementWithMetaType(statementNode, metaTypeNode, assignments, derived, localContext) {
+  let statementUnifiedWithMetaType;
 
-const metavariableNodeQuery = nodeQuery("/statement/metavariable"),
-      metaTypeTerminalNodeQuery = nodeQuery("/metaType/@meta-type!");
+  const metaType = localContext.findMetaTypeByMetaTypeNode(metaTypeNode),
+        statementVerifiedGivenMetaType = verifyStatementGivenMetaType(statementNode, metaType, assignments, derived, localContext);
 
-export default function unifyStatementWithMetaType(statementNode, metaTypeNode, localContext) {
-  let statementUnifiedWithMetaType = false;
-
-  const metaTypeTerminalNode = metaTypeTerminalNodeQuery(metaTypeNode),
-        metaTypeTerminalNodeContent = metaTypeTerminalNode.getContent(),
-        metaTypeName = metaTypeTerminalNodeContent; ///
-
-  switch (metaTypeName) {
-    case FRAME_META_TYPE_NAME: {
-      const metavariableNode = metavariableNodeQuery(statementNode);
-
-      if (metavariableNode !== null) {
-        const metavariable = localContext.findMetavariableByMetavariableNode(metavariableNode);
-
-        if (metavariable !== null) {
-          const metavariableMetaTypeName = metavariable.getMetaTypeName();
-
-          if (metavariableMetaTypeName === metaTypeName) {
-            statementUnifiedWithMetaType = true;
-          }
-        }
-      }
-
-      break;
-    }
-
-    case STATEMENT_META_TYPE_NAME: {
-      const { verifyStatement } = shim,
-            derived = false,
-            assignments = [],
-            statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
-
-      statementUnifiedWithMetaType = statementVerified;
-
-      break;
-    }
-  }
+  statementUnifiedWithMetaType = statementVerifiedGivenMetaType;  ///
 
   return statementUnifiedWithMetaType;
 }