occam-verify-cli 0.0.847 → 0.0.849

package/lib/verify/containment.js

@@ -11,10 +11,10 @@ Object.defineProperty(exports, "default", {
 var _array = require("../utilities/array");
 var _constants = require("../constants");
 var _query = require("../utilities/query");
-var termNodeQuery = (0, _query.nodeQuery)("/argument/term!"), variableNodeQuery = (0, _query.nodeQuery)("/argument/term/variable!"), metaArgumentTermNodesQuery = (0, _query.nodesQuery)("/metaArgument//term"), metaArgumentVariableNodesQuery = (0, _query.nodesQuery)("/metaArgument//variable");
-function verifyContainment(argumentNode, containmentNode, metaArgumentNode, localContext) {
+var variableNodeQuery = (0, _query.nodeQuery)("/term/variable!"), metaArgumentTermNodesQuery = (0, _query.nodesQuery)("/metaArgument//term"), metaArgumentVariableNodesQuery = (0, _query.nodesQuery)("/metaArgument//variable");
+function verifyContainment(termNode, containmentNode, metaArgumentNode, localContext) {
     var containmentVerified = false;
-    var contained = containedFromContainmentNode(containmentNode), termNode = termNodeQuery(argumentNode), variableNode = variableNodeQuery(argumentNode);
+    var contained = containedFromContainmentNode(containmentNode), variableNode = variableNodeQuery(termNode);
     if (false) {
     ///
     } else if (variableNode !== null) {
@@ -59,4 +59,4 @@ function containedFromContainmentNode(containmentNode) {
     return contained;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvY29udGFpbm1lbnQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IHNlY29uZCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IENPTlRBSU5FRCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdGVybU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9hcmd1bWVudC90ZXJtIVwiKSxcbiAgICAgIHZhcmlhYmxlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2FyZ3VtZW50L3Rlcm0vdmFyaWFibGUhXCIpLFxuICAgICAgbWV0YUFyZ3VtZW50VGVybU5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL21ldGFBcmd1bWVudC8vdGVybVwiKSxcbiAgICAgIG1ldGFBcmd1bWVudFZhcmlhYmxlTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvbWV0YUFyZ3VtZW50Ly92YXJpYWJsZVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5Q29udGFpbm1lbnQoYXJndW1lbnROb2RlLCBjb250YWlubWVudE5vZGUsIG1ldGFBcmd1bWVudE5vZGUsIGxvY2FsQ29udGV4dCkge1xuICBsZXQgY29udGFpbm1lbnRWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IGNvbnRhaW5lZCA9IGNvbnRhaW5lZEZyb21Db250YWlubWVudE5vZGUoY29udGFpbm1lbnROb2RlKSxcbiAgICAgICAgdGVybU5vZGUgPSB0ZXJtTm9kZVF1ZXJ5KGFyZ3VtZW50Tm9kZSksXG4gICAgICAgIHZhcmlhYmxlTm9kZSA9IHZhcmlhYmxlTm9kZVF1ZXJ5KGFyZ3VtZW50Tm9kZSk7XG5cbiAgaWYgKGZhbHNlKSB7XG4gICAgLy8vXG4gIH0gZWxzZSBpZiAodmFyaWFibGVOb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgbWV0YUFyZ3VtZW50VmFyaWFibGVOb2RlcyA9IG1ldGFBcmd1bWVudFZhcmlhYmxlTm9kZXNRdWVyeShtZXRhQXJndW1lbnROb2RlKSxcbiAgICAgICAgICB2YXJpYWJsZU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VmFyaWFibGVOb2RlID0gbWV0YUFyZ3VtZW50VmFyaWFibGVOb2Rlcy5zb21lKChtZXRhQXJndW1lbnRWYXJpYWJsZU5vZGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHZhcmlhYmxlTm9kZU1hdGNoZXNNZXRhQXJndW1lbnRWYXJpYWJsZU5vZGUgPSB2YXJpYWJsZU5vZGUubWF0Y2gobWV0YUFyZ3VtZW50VmFyaWFibGVOb2RlKTtcblxuICAgICAgICAgICAgaWYgKHZhcmlhYmxlTm9kZU1hdGNoZXNNZXRhQXJndW1lbnRWYXJpYWJsZU5vZGUpIHtcbiAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfSk7XG5cbiAgICBpZiAoY29udGFpbmVkKSB7XG4gICAgICBpZiAodmFyaWFibGVOb2RlTWF0Y2hlc01ldGFBcmd1bWVudFZhcmlhYmxlTm9kZSkge1xuICAgICAgICBjb250YWlubWVudFZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICBpZiAoIWNvbnRhaW5lZCkge1xuICAgICAgaWYgKCF2YXJpYWJsZU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VmFyaWFibGVOb2RlKSB7XG4gICAgICAgIGNvbnRhaW5tZW50VmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cbiAgfSBlbHNlIGlmICh0ZXJtTm9kZSAhPT0gbnVsbCkge1xuICAgIGNvbnN0IG1ldGFBcmd1bWVudFRlcm1Ob2RlcyA9IG1ldGFBcmd1bWVudFRlcm1Ob2Rlc1F1ZXJ5KG1ldGFBcmd1bWVudE5vZGUpLFxuICAgICAgICAgIHRlcm1Ob2RlTWF0Y2hlc01ldGFBcmd1bWVudFRlcm1Ob2RlID0gbWV0YUFyZ3VtZW50VGVybU5vZGVzLnNvbWUoKG1ldGFBcmd1bWVudFRlcm1Ob2RlKSA9PiB7XG4gICAgICAgICAgICBjb25zdCB0ZXJtTm9kZU1hdGNoZXNNZXRhQXJndW1lbnRUZXJtTm9kZSA9IHRlcm1Ob2RlLm1hdGNoKG1ldGFBcmd1bWVudFRlcm1Ob2RlKTtcblxuICAgICAgICAgICAgaWYgKHRlcm1Ob2RlTWF0Y2hlc01ldGFBcmd1bWVudFRlcm1Ob2RlKSB7XG4gICAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH0pO1xuXG4gICAgaWYgKGNvbnRhaW5lZCkge1xuICAgICAgaWYgKHRlcm1Ob2RlTWF0Y2hlc01ldGFBcmd1bWVudFRlcm1Ob2RlKSB7XG4gICAgICAgIGNvbnRhaW5tZW50VmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICghY29udGFpbmVkKSB7XG4gICAgICBpZiAoIXRlcm1Ob2RlTWF0Y2hlc01ldGFBcmd1bWVudFRlcm1Ob2RlKSB7XG4gICAgICAgIGNvbnRhaW5tZW50VmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIHJldHVybiBjb250YWlubWVudFZlcmlmaWVkO1xufVxuXG5mdW5jdGlvbiBjb250YWluZWRGcm9tQ29udGFpbm1lbnROb2RlKGNvbnRhaW5tZW50Tm9kZSkge1xuICBjb25zdCBjaGlsZE5vZGVzID0gY29udGFpbm1lbnROb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgc2Vjb25kQ2hpbGROb2RlID0gc2Vjb25kKGNoaWxkTm9kZXMpLFxuICAgICAgICB0ZXJtaW5hbE5vZGUgPSBzZWNvbmRDaGlsZE5vZGUsICAvLy9cbiAgICAgICAgY29udGVudCA9IHRlcm1pbmFsTm9kZS5nZXRDb250ZW50KCksXG4gICAgICAgIGNvbnRhaW5lZCA9IChjb250ZW50ID09PSBDT05UQUlORUQpO1xuXG4gIHJldHVybiBjb250YWluZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5Q29udGFpbm1lbnQiLCJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidmFyaWFibGVOb2RlUXVlcnkiLCJtZXRhQXJndW1lbnRUZXJtTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJtZXRhQXJndW1lbnRWYXJpYWJsZU5vZGVzUXVlcnkiLCJhcmd1bWVudE5vZGUiLCJjb250YWlubWVudE5vZGUiLCJtZXRhQXJndW1lbnROb2RlIiwibG9jYWxDb250ZXh0IiwiY29udGFpbm1lbnRWZXJpZmllZCIsImNvbnRhaW5lZCIsImNvbnRhaW5lZEZyb21Db250YWlubWVudE5vZGUiLCJ0ZXJtTm9kZSIsInZhcmlhYmxlTm9kZSIsIm1ldGFBcmd1bWVudFZhcmlhYmxlTm9kZXMiLCJ2YXJpYWJsZU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VmFyaWFibGVOb2RlIiwic29tZSIsIm1ldGFBcmd1bWVudFZhcmlhYmxlTm9kZSIsIm1hdGNoIiwibWV0YUFyZ3VtZW50VGVybU5vZGVzIiwidGVybU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VGVybU5vZGUiLCJtZXRhQXJndW1lbnRUZXJtTm9kZSIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwic2Vjb25kQ2hpbGROb2RlIiwic2Vjb25kIiwidGVybWluYWxOb2RlIiwiY29udGVudCIsImdldENvbnRlbnQiLCJDT05UQUlORUQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBd0JBOzs7cUJBVEQ7eUJBQ0c7cUJBQ1k7QUFFdEMsSUFBTUMsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDLG9CQUMxQkMsb0JBQW9CRCxJQUFBQSxnQkFBUyxFQUFDLDZCQUM5QkUsNkJBQTZCQyxJQUFBQSxpQkFBVSxFQUFDLHdCQUN4Q0MsaUNBQWlDRCxJQUFBQSxpQkFBVSxFQUFDO0FBRW5DLFNBQVNMLGtCQUFrQk8sWUFBWSxFQUFFQyxlQUFlLEVBQUVDLGdCQUFnQixFQUFFQyxZQUFZO0lBQ3JHLElBQUlDLHNCQUFzQjtJQUUxQixJQUFNQyxZQUFZQyw2QkFBNkJMLGtCQUN6Q00sV0FBV2IsY0FBY00sZUFDekJRLGVBQWVaLGtCQUFrQkk7SUFFdkMsSUFBSSxPQUFPO0lBQ1QsR0FBRztJQUNMLE9BQU8sSUFBSVEsaUJBQWlCLE1BQU07UUFDaEMsSUFBTUMsNEJBQTRCViwrQkFBK0JHLG1CQUMzRFEsOENBQThDRCwwQkFBMEJFLElBQUksQ0FBQyxTQUFDQztZQUM1RSxJQUFNRiw4Q0FBOENGLGFBQWFLLEtBQUssQ0FBQ0Q7WUFFdkUsSUFBSUYsNkNBQTZDO2dCQUMvQyxPQUFPO1lBQ1Q7UUFDRjtRQUVOLElBQUlMLFdBQVc7WUFDYixJQUFJSyw2Q0FBNkM7Z0JBQy9DTixzQkFBc0I7WUFDeEI7UUFDRjtRQUVBLElBQUksQ0FBQ0MsV0FBVztZQUNkLElBQUksQ0FBQ0ssNkNBQTZDO2dCQUNoRE4sc0JBQXNCO1lBQ3hCO1FBQ0Y7SUFDRixPQUFPLElBQUlHLGFBQWEsTUFBTTtRQUM1QixJQUFNTyx3QkFBd0JqQiwyQkFBMkJLLG1CQUNuRGEsc0NBQXNDRCxzQkFBc0JILElBQUksQ0FBQyxTQUFDSztZQUNoRSxJQUFNRCxzQ0FBc0NSLFNBQVNNLEtBQUssQ0FBQ0c7WUFFM0QsSUFBSUQscUNBQXFDO2dCQUN2QyxPQUFPO1lBQ1Q7UUFDRjtRQUVOLElBQUlWLFdBQVc7WUFDYixJQUFJVSxxQ0FBcUM7Z0JBQ3ZDWCxzQkFBc0I7WUFDeEI7UUFDRjtRQUVBLElBQUksQ0FBQ0MsV0FBVztZQUNkLElBQUksQ0FBQ1UscUNBQXFDO2dCQUN4Q1gsc0JBQXNCO1lBQ3hCO1FBQ0Y7SUFDRjtJQUVBLE9BQU9BO0FBQ1Q7QUFFQSxTQUFTRSw2QkFBNkJMLGVBQWU7SUFDbkQsSUFBTWdCLGFBQWFoQixnQkFBZ0JpQixhQUFhLElBQzFDQyxrQkFBa0JDLElBQUFBLGFBQU0sRUFBQ0gsYUFDekJJLGVBQWVGLGlCQUNmRyxVQUFVRCxhQUFhRSxVQUFVLElBQ2pDbEIsWUFBYWlCLFlBQVlFLG9CQUFTO0lBRXhDLE9BQU9uQjtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvY29udGFpbm1lbnQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IHNlY29uZCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IENPTlRBSU5FRCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdmFyaWFibGVOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGVybS92YXJpYWJsZSFcIiksXG4gICAgICBtZXRhQXJndW1lbnRUZXJtTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvbWV0YUFyZ3VtZW50Ly90ZXJtXCIpLFxuICAgICAgbWV0YUFyZ3VtZW50VmFyaWFibGVOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi9tZXRhQXJndW1lbnQvL3ZhcmlhYmxlXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlDb250YWlubWVudCh0ZXJtTm9kZSwgY29udGFpbm1lbnROb2RlLCBtZXRhQXJndW1lbnROb2RlLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IGNvbnRhaW5tZW50VmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBjb250YWluZWQgPSBjb250YWluZWRGcm9tQ29udGFpbm1lbnROb2RlKGNvbnRhaW5tZW50Tm9kZSksXG4gICAgICAgIHZhcmlhYmxlTm9kZSA9IHZhcmlhYmxlTm9kZVF1ZXJ5KHRlcm1Ob2RlKTtcblxuICBpZiAoZmFsc2UpIHtcbiAgICAvLy9cbiAgfSBlbHNlIGlmICh2YXJpYWJsZU5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBtZXRhQXJndW1lbnRWYXJpYWJsZU5vZGVzID0gbWV0YUFyZ3VtZW50VmFyaWFibGVOb2Rlc1F1ZXJ5KG1ldGFBcmd1bWVudE5vZGUpLFxuICAgICAgICAgIHZhcmlhYmxlTm9kZU1hdGNoZXNNZXRhQXJndW1lbnRWYXJpYWJsZU5vZGUgPSBtZXRhQXJndW1lbnRWYXJpYWJsZU5vZGVzLnNvbWUoKG1ldGFBcmd1bWVudFZhcmlhYmxlTm9kZSkgPT4ge1xuICAgICAgICAgICAgY29uc3QgdmFyaWFibGVOb2RlTWF0Y2hlc01ldGFBcmd1bWVudFZhcmlhYmxlTm9kZSA9IHZhcmlhYmxlTm9kZS5tYXRjaChtZXRhQXJndW1lbnRWYXJpYWJsZU5vZGUpO1xuXG4gICAgICAgICAgICBpZiAodmFyaWFibGVOb2RlTWF0Y2hlc01ldGFBcmd1bWVudFZhcmlhYmxlTm9kZSkge1xuICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KTtcblxuICAgIGlmIChjb250YWluZWQpIHtcbiAgICAgIGlmICh2YXJpYWJsZU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VmFyaWFibGVOb2RlKSB7XG4gICAgICAgIGNvbnRhaW5tZW50VmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICghY29udGFpbmVkKSB7XG4gICAgICBpZiAoIXZhcmlhYmxlTm9kZU1hdGNoZXNNZXRhQXJndW1lbnRWYXJpYWJsZU5vZGUpIHtcbiAgICAgICAgY29udGFpbm1lbnRWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9IGVsc2UgaWYgKHRlcm1Ob2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgbWV0YUFyZ3VtZW50VGVybU5vZGVzID0gbWV0YUFyZ3VtZW50VGVybU5vZGVzUXVlcnkobWV0YUFyZ3VtZW50Tm9kZSksXG4gICAgICAgICAgdGVybU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VGVybU5vZGUgPSBtZXRhQXJndW1lbnRUZXJtTm9kZXMuc29tZSgobWV0YUFyZ3VtZW50VGVybU5vZGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHRlcm1Ob2RlTWF0Y2hlc01ldGFBcmd1bWVudFRlcm1Ob2RlID0gdGVybU5vZGUubWF0Y2gobWV0YUFyZ3VtZW50VGVybU5vZGUpO1xuXG4gICAgICAgICAgICBpZiAodGVybU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VGVybU5vZGUpIHtcbiAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfSk7XG5cbiAgICBpZiAoY29udGFpbmVkKSB7XG4gICAgICBpZiAodGVybU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VGVybU5vZGUpIHtcbiAgICAgICAgY29udGFpbm1lbnRWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKCFjb250YWluZWQpIHtcbiAgICAgIGlmICghdGVybU5vZGVNYXRjaGVzTWV0YUFyZ3VtZW50VGVybU5vZGUpIHtcbiAgICAgICAgY29udGFpbm1lbnRWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIGNvbnRhaW5tZW50VmVyaWZpZWQ7XG59XG5cbmZ1bmN0aW9uIGNvbnRhaW5lZEZyb21Db250YWlubWVudE5vZGUoY29udGFpbm1lbnROb2RlKSB7XG4gIGNvbnN0IGNoaWxkTm9kZXMgPSBjb250YWlubWVudE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICBzZWNvbmRDaGlsZE5vZGUgPSBzZWNvbmQoY2hpbGROb2RlcyksXG4gICAgICAgIHRlcm1pbmFsTm9kZSA9IHNlY29uZENoaWxkTm9kZSwgIC8vL1xuICAgICAgICBjb250ZW50ID0gdGVybWluYWxOb2RlLmdldENvbnRlbnQoKSxcbiAgICAgICAgY29udGFpbmVkID0gKGNvbnRlbnQgPT09IENPTlRBSU5FRCk7XG5cbiAgcmV0dXJuIGNvbnRhaW5lZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlDb250YWlubWVudCIsInZhcmlhYmxlTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwibWV0YUFyZ3VtZW50VGVybU5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5IiwibWV0YUFyZ3VtZW50VmFyaWFibGVOb2Rlc1F1ZXJ5IiwidGVybU5vZGUiLCJjb250YWlubWVudE5vZGUiLCJtZXRhQXJndW1lbnROb2RlIiwibG9jYWxDb250ZXh0IiwiY29udGFpbm1lbnRWZXJpZmllZCIsImNvbnRhaW5lZCIsImNvbnRhaW5lZEZyb21Db250YWlubWVudE5vZGUiLCJ2YXJpYWJsZU5vZGUiLCJtZXRhQXJndW1lbnRWYXJpYWJsZU5vZGVzIiwidmFyaWFibGVOb2RlTWF0Y2hlc01ldGFBcmd1bWVudFZhcmlhYmxlTm9kZSIsInNvbWUiLCJtZXRhQXJndW1lbnRWYXJpYWJsZU5vZGUiLCJtYXRjaCIsIm1ldGFBcmd1bWVudFRlcm1Ob2RlcyIsInRlcm1Ob2RlTWF0Y2hlc01ldGFBcmd1bWVudFRlcm1Ob2RlIiwibWV0YUFyZ3VtZW50VGVybU5vZGUiLCJjaGlsZE5vZGVzIiwiZ2V0Q2hpbGROb2RlcyIsInNlY29uZENoaWxkTm9kZSIsInNlY29uZCIsInRlcm1pbmFsTm9kZSIsImNvbnRlbnQiLCJnZXRDb250ZW50IiwiQ09OVEFJTkVEIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFVQTs7O2VBQXdCQTs7O3FCQVJEO3lCQUNHO3FCQUNZO0FBRXRDLElBQU1DLG9CQUFvQkMsSUFBQUEsZ0JBQVMsRUFBQyxvQkFDOUJDLDZCQUE2QkMsSUFBQUEsaUJBQVUsRUFBQyx3QkFDeENDLGlDQUFpQ0QsSUFBQUEsaUJBQVUsRUFBQztBQUVuQyxTQUFTSixrQkFBa0JNLFFBQVEsRUFBRUMsZUFBZSxFQUFFQyxnQkFBZ0IsRUFBRUMsWUFBWTtJQUNqRyxJQUFJQyxzQkFBc0I7SUFFMUIsSUFBTUMsWUFBWUMsNkJBQTZCTCxrQkFDekNNLGVBQWVaLGtCQUFrQks7SUFFdkMsSUFBSSxPQUFPO0lBQ1QsR0FBRztJQUNMLE9BQU8sSUFBSU8saUJBQWlCLE1BQU07UUFDaEMsSUFBTUMsNEJBQTRCVCwrQkFBK0JHLG1CQUMzRE8sOENBQThDRCwwQkFBMEJFLElBQUksQ0FBQyxTQUFDQztZQUM1RSxJQUFNRiw4Q0FBOENGLGFBQWFLLEtBQUssQ0FBQ0Q7WUFFdkUsSUFBSUYsNkNBQTZDO2dCQUMvQyxPQUFPO1lBQ1Q7UUFDRjtRQUVOLElBQUlKLFdBQVc7WUFDYixJQUFJSSw2Q0FBNkM7Z0JBQy9DTCxzQkFBc0I7WUFDeEI7UUFDRjtRQUVBLElBQUksQ0FBQ0MsV0FBVztZQUNkLElBQUksQ0FBQ0ksNkNBQTZDO2dCQUNoREwsc0JBQXNCO1lBQ3hCO1FBQ0Y7SUFDRixPQUFPLElBQUlKLGFBQWEsTUFBTTtRQUM1QixJQUFNYSx3QkFBd0JoQiwyQkFBMkJLLG1CQUNuRFksc0NBQXNDRCxzQkFBc0JILElBQUksQ0FBQyxTQUFDSztZQUNoRSxJQUFNRCxzQ0FBc0NkLFNBQVNZLEtBQUssQ0FBQ0c7WUFFM0QsSUFBSUQscUNBQXFDO2dCQUN2QyxPQUFPO1lBQ1Q7UUFDRjtRQUVOLElBQUlULFdBQVc7WUFDYixJQUFJUyxxQ0FBcUM7Z0JBQ3ZDVixzQkFBc0I7WUFDeEI7UUFDRjtRQUVBLElBQUksQ0FBQ0MsV0FBVztZQUNkLElBQUksQ0FBQ1MscUNBQXFDO2dCQUN4Q1Ysc0JBQXNCO1lBQ3hCO1FBQ0Y7SUFDRjtJQUVBLE9BQU9BO0FBQ1Q7QUFFQSxTQUFTRSw2QkFBNkJMLGVBQWU7SUFDbkQsSUFBTWUsYUFBYWYsZ0JBQWdCZ0IsYUFBYSxJQUMxQ0Msa0JBQWtCQyxJQUFBQSxhQUFNLEVBQUNILGFBQ3pCSSxlQUFlRixpQkFDZkcsVUFBVUQsYUFBYUUsVUFBVSxJQUNqQ2pCLFlBQWFnQixZQUFZRSxvQkFBUztJQUV4QyxPQUFPbEI7QUFDVCJ9

package/lib/verify/defining.js

@@ -17,10 +17,10 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-var termNodeQuery = (0, _query.nodeQuery)("/argument/term!"), variableNodeQuery = (0, _query.nodeQuery)("/argument/term/variable!");
-function verifyDefining(argumentNode, definingNode, localContext) {
+var variableNodeQuery = (0, _query.nodeQuery)("/term/variable!");
+function verifyDefining(termNode, definingNode, localContext) {
     var definingVerified = false;
-    var defined = definedFromDefiningNode(definingNode), termNode = termNodeQuery(argumentNode), variableNode = variableNodeQuery(argumentNode);
+    var defined = definedFromDefiningNode(definingNode), variableNode = variableNodeQuery(termNode);
     if (false) {
     ///
     } else if (variableNode !== null) {
@@ -63,4 +63,4 @@ function definedFromDefiningNode(definingNode) {
     return defined;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZGVmaW5pbmcuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlUZXJtIGZyb20gXCIuL3Rlcm1cIjtcblxuaW1wb3J0IHsgREVGSU5FRCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IGZpcnN0LCBzZWNvbmQgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvYXJndW1lbnQvdGVybSFcIiksXG4gICAgICB2YXJpYWJsZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9hcmd1bWVudC90ZXJtL3ZhcmlhYmxlIVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5RGVmaW5pbmcoYXJndW1lbnROb2RlLCBkZWZpbmluZ05vZGUsIGxvY2FsQ29udGV4dCkge1xuICBsZXQgZGVmaW5pbmdWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IGRlZmluZWQgPSBkZWZpbmVkRnJvbURlZmluaW5nTm9kZShkZWZpbmluZ05vZGUpLFxuICAgICAgICB0ZXJtTm9kZSA9IHRlcm1Ob2RlUXVlcnkoYXJndW1lbnROb2RlKSxcbiAgICAgICAgdmFyaWFibGVOb2RlID0gdmFyaWFibGVOb2RlUXVlcnkoYXJndW1lbnROb2RlKTtcblxuICBpZiAoZmFsc2UpIHtcbiAgICAvLy9cbiAgfSBlbHNlIGlmICh2YXJpYWJsZU5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCB2YXJpYWJsZSA9IGxvY2FsQ29udGV4dC5maW5kVmFyaWFibGVCeVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpO1xuXG4gICAgaWYgKHZhcmlhYmxlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCB2YXJpYWJsZURlZmluZWQgPSBsb2NhbENvbnRleHQuaXNWYXJpYWJsZURlZmluZWQodmFyaWFibGUpO1xuXG4gICAgICBpZiAoZGVmaW5lZCkge1xuICAgICAgICBpZiAodmFyaWFibGVEZWZpbmVkKSB7XG4gICAgICAgICAgZGVmaW5pbmdWZXJpZmllZCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cblxuICAgICAgaWYgKCFkZWZpbmVkKSB7XG4gICAgICAgIGlmICghdmFyaWFibGVEZWZpbmVkKSB7XG4gICAgICAgICAgZGVmaW5pbmdWZXJpZmllZCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gIH0gZWxzZSBpZiAodGVybU5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCB0ZXJtcyA9IFtdLFxuICAgICAgICAgIHRlcm1WZXJpZmllZCA9IHZlcmlmeVRlcm0odGVybU5vZGUsIHRlcm1zLCBsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICAgIGxldCB2ZXJpZmllZEFoZWFkO1xuXG4gICAgICAgICAgICBjb25zdCBmaXJzdFRlcm0gPSBmaXJzdCh0ZXJtcyksXG4gICAgICAgICAgICAgICAgICB0ZXJtID0gZmlyc3RUZXJtLCAvLy9cbiAgICAgICAgICAgICAgICAgIHRlcm1Hcm91bmRlZCA9IGxvY2FsQ29udGV4dC5pc1Rlcm1Hcm91bmRlZCh0ZXJtKTtcblxuICAgICAgICAgICAgaWYgKGRlZmluZWQpIHtcbiAgICAgICAgICAgICAgaWYgKHRlcm1Hcm91bmRlZCkge1xuICAgICAgICAgICAgICAgIHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIGlmICghZGVmaW5lZCkge1xuICAgICAgICAgICAgICBpZiAoIXRlcm1Hcm91bmRlZCkge1xuICAgICAgICAgICAgICAgIHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgIH0pO1xuXG4gICAgZGVmaW5pbmdWZXJpZmllZCA9IHRlcm1WZXJpZmllZDsgIC8vL1xuXG4gIH1cblxuICByZXR1cm4gZGVmaW5pbmdWZXJpZmllZDtcbn1cblxuZnVuY3Rpb24gZGVmaW5lZEZyb21EZWZpbmluZ05vZGUoZGVmaW5pbmdOb2RlKSB7XG4gIGNvbnN0IGNoaWxkTm9kZXMgPSBkZWZpbmluZ05vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICBzZWNvbmRDaGlsZE5vZGUgPSBzZWNvbmQoY2hpbGROb2RlcyksXG4gICAgICAgIHRlcm1pbmFsTm9kZSA9IHNlY29uZENoaWxkTm9kZSwgIC8vL1xuICAgICAgICBjb250ZW50ID0gdGVybWluYWxOb2RlLmdldENvbnRlbnQoKSxcbiAgICAgICAgZGVmaW5lZCA9IChjb250ZW50ID09PSBERUZJTkVEKTtcblxuICByZXR1cm4gZGVmaW5lZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlEZWZpbmluZyIsInRlcm1Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ2YXJpYWJsZU5vZGVRdWVyeSIsImFyZ3VtZW50Tm9kZSIsImRlZmluaW5nTm9kZSIsImxvY2FsQ29udGV4dCIsImRlZmluaW5nVmVyaWZpZWQiLCJkZWZpbmVkIiwiZGVmaW5lZEZyb21EZWZpbmluZ05vZGUiLCJ0ZXJtTm9kZSIsInZhcmlhYmxlTm9kZSIsInZhcmlhYmxlIiwiZmluZFZhcmlhYmxlQnlWYXJpYWJsZU5vZGUiLCJ2YXJpYWJsZURlZmluZWQiLCJpc1ZhcmlhYmxlRGVmaW5lZCIsInRlcm1zIiwidGVybVZlcmlmaWVkIiwidmVyaWZ5VGVybSIsInZlcmlmaWVkQWhlYWQiLCJmaXJzdFRlcm0iLCJmaXJzdCIsInRlcm0iLCJ0ZXJtR3JvdW5kZWQiLCJpc1Rlcm1Hcm91bmRlZCIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwic2Vjb25kQ2hpbGROb2RlIiwic2Vjb25kIiwidGVybWluYWxOb2RlIiwiY29udGVudCIsImdldENvbnRlbnQiLCJERUZJTkVEIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFXQTs7O2VBQXdCQTs7OzJEQVREO3lCQUVDO3FCQUNFO3FCQUNJOzs7Ozs7QUFFOUIsSUFBTUMsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDLG9CQUMxQkMsb0JBQW9CRCxJQUFBQSxnQkFBUyxFQUFDO0FBRXJCLFNBQVNGLGVBQWVJLFlBQVksRUFBRUMsWUFBWSxFQUFFQyxZQUFZO0lBQzdFLElBQUlDLG1CQUFtQjtJQUV2QixJQUFNQyxVQUFVQyx3QkFBd0JKLGVBQ2xDSyxXQUFXVCxjQUFjRyxlQUN6Qk8sZUFBZVIsa0JBQWtCQztJQUV2QyxJQUFJLE9BQU87SUFDVCxHQUFHO0lBQ0wsT0FBTyxJQUFJTyxpQkFBaUIsTUFBTTtRQUNoQyxJQUFNQyxXQUFXTixhQUFhTywwQkFBMEIsQ0FBQ0Y7UUFFekQsSUFBSUMsYUFBYSxNQUFNO1lBQ3JCLElBQU1FLGtCQUFrQlIsYUFBYVMsaUJBQWlCLENBQUNIO1lBRXZELElBQUlKLFNBQVM7Z0JBQ1gsSUFBSU0saUJBQWlCO29CQUNuQlAsbUJBQW1CO2dCQUNyQjtZQUNGO1lBRUEsSUFBSSxDQUFDQyxTQUFTO2dCQUNaLElBQUksQ0FBQ00saUJBQWlCO29CQUNwQlAsbUJBQW1CO2dCQUNyQjtZQUNGO1FBQ0Y7SUFDRixPQUFPLElBQUlHLGFBQWEsTUFBTTtRQUM1QixJQUFNTSxRQUFRLEVBQUUsRUFDVkMsZUFBZUMsSUFBQUEsYUFBVSxFQUFDUixVQUFVTSxPQUFPVixjQUFjO1lBQ3ZELElBQUlhO1lBRUosSUFBTUMsWUFBWUMsSUFBQUEsWUFBSyxFQUFDTCxRQUNsQk0sT0FBT0YsV0FDUEcsZUFBZWpCLGFBQWFrQixjQUFjLENBQUNGO1lBRWpELElBQUlkLFNBQVM7Z0JBQ1gsSUFBSWUsY0FBYztvQkFDaEJKLGdCQUFnQjtnQkFDbEI7WUFDRjtZQUVBLElBQUksQ0FBQ1gsU0FBUztnQkFDWixJQUFJLENBQUNlLGNBQWM7b0JBQ2pCSixnQkFBZ0I7Z0JBQ2xCO1lBQ0Y7WUFFQSxPQUFPQTtRQUNUO1FBRU5aLG1CQUFtQlUsY0FBZSxHQUFHO0lBRXZDO0lBRUEsT0FBT1Y7QUFDVDtBQUVBLFNBQVNFLHdCQUF3QkosWUFBWTtJQUMzQyxJQUFNb0IsYUFBYXBCLGFBQWFxQixhQUFhLElBQ3ZDQyxrQkFBa0JDLElBQUFBLGFBQU0sRUFBQ0gsYUFDekJJLGVBQWVGLGlCQUNmRyxVQUFVRCxhQUFhRSxVQUFVLElBQ2pDdkIsVUFBV3NCLFlBQVlFLGtCQUFPO0lBRXBDLE9BQU94QjtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZGVmaW5pbmcuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlUZXJtIGZyb20gXCIuL3Rlcm1cIjtcblxuaW1wb3J0IHsgREVGSU5FRCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IGZpcnN0LCBzZWNvbmQgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5cbmNvbnN0IHZhcmlhYmxlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0vdmFyaWFibGUhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlEZWZpbmluZyh0ZXJtTm9kZSwgZGVmaW5pbmdOb2RlLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IGRlZmluaW5nVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBkZWZpbmVkID0gZGVmaW5lZEZyb21EZWZpbmluZ05vZGUoZGVmaW5pbmdOb2RlKSxcbiAgICAgICAgdmFyaWFibGVOb2RlID0gdmFyaWFibGVOb2RlUXVlcnkodGVybU5vZGUpO1xuXG4gIGlmIChmYWxzZSkge1xuICAgIC8vL1xuICB9IGVsc2UgaWYgKHZhcmlhYmxlTm9kZSAhPT0gbnVsbCkge1xuICAgIGNvbnN0IHZhcmlhYmxlID0gbG9jYWxDb250ZXh0LmZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSk7XG5cbiAgICBpZiAodmFyaWFibGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHZhcmlhYmxlRGVmaW5lZCA9IGxvY2FsQ29udGV4dC5pc1ZhcmlhYmxlRGVmaW5lZCh2YXJpYWJsZSk7XG5cbiAgICAgIGlmIChkZWZpbmVkKSB7XG4gICAgICAgIGlmICh2YXJpYWJsZURlZmluZWQpIHtcbiAgICAgICAgICBkZWZpbmluZ1ZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICBpZiAoIWRlZmluZWQpIHtcbiAgICAgICAgaWYgKCF2YXJpYWJsZURlZmluZWQpIHtcbiAgICAgICAgICBkZWZpbmluZ1ZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgfSBlbHNlIGlmICh0ZXJtTm9kZSAhPT0gbnVsbCkge1xuICAgIGNvbnN0IHRlcm1zID0gW10sXG4gICAgICAgICAgdGVybVZlcmlmaWVkID0gdmVyaWZ5VGVybSh0ZXJtTm9kZSwgdGVybXMsIGxvY2FsQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgICAgbGV0IHZlcmlmaWVkQWhlYWQ7XG5cbiAgICAgICAgICAgIGNvbnN0IGZpcnN0VGVybSA9IGZpcnN0KHRlcm1zKSxcbiAgICAgICAgICAgICAgICAgIHRlcm0gPSBmaXJzdFRlcm0sIC8vL1xuICAgICAgICAgICAgICAgICAgdGVybUdyb3VuZGVkID0gbG9jYWxDb250ZXh0LmlzVGVybUdyb3VuZGVkKHRlcm0pO1xuXG4gICAgICAgICAgICBpZiAoZGVmaW5lZCkge1xuICAgICAgICAgICAgICBpZiAodGVybUdyb3VuZGVkKSB7XG4gICAgICAgICAgICAgICAgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG4gICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgaWYgKCFkZWZpbmVkKSB7XG4gICAgICAgICAgICAgIGlmICghdGVybUdyb3VuZGVkKSB7XG4gICAgICAgICAgICAgICAgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG4gICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgICAgfSk7XG5cbiAgICBkZWZpbmluZ1ZlcmlmaWVkID0gdGVybVZlcmlmaWVkOyAgLy8vXG5cbiAgfVxuXG4gIHJldHVybiBkZWZpbmluZ1ZlcmlmaWVkO1xufVxuXG5mdW5jdGlvbiBkZWZpbmVkRnJvbURlZmluaW5nTm9kZShkZWZpbmluZ05vZGUpIHtcbiAgY29uc3QgY2hpbGROb2RlcyA9IGRlZmluaW5nTm9kZS5nZXRDaGlsZE5vZGVzKCksXG4gICAgICAgIHNlY29uZENoaWxkTm9kZSA9IHNlY29uZChjaGlsZE5vZGVzKSxcbiAgICAgICAgdGVybWluYWxOb2RlID0gc2Vjb25kQ2hpbGROb2RlLCAgLy8vXG4gICAgICAgIGNvbnRlbnQgPSB0ZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpLFxuICAgICAgICBkZWZpbmVkID0gKGNvbnRlbnQgPT09IERFRklORUQpO1xuXG4gIHJldHVybiBkZWZpbmVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeURlZmluaW5nIiwidmFyaWFibGVOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ0ZXJtTm9kZSIsImRlZmluaW5nTm9kZSIsImxvY2FsQ29udGV4dCIsImRlZmluaW5nVmVyaWZpZWQiLCJkZWZpbmVkIiwiZGVmaW5lZEZyb21EZWZpbmluZ05vZGUiLCJ2YXJpYWJsZU5vZGUiLCJ2YXJpYWJsZSIsImZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOb2RlIiwidmFyaWFibGVEZWZpbmVkIiwiaXNWYXJpYWJsZURlZmluZWQiLCJ0ZXJtcyIsInRlcm1WZXJpZmllZCIsInZlcmlmeVRlcm0iLCJ2ZXJpZmllZEFoZWFkIiwiZmlyc3RUZXJtIiwiZmlyc3QiLCJ0ZXJtIiwidGVybUdyb3VuZGVkIiwiaXNUZXJtR3JvdW5kZWQiLCJjaGlsZE5vZGVzIiwiZ2V0Q2hpbGROb2RlcyIsInNlY29uZENoaWxkTm9kZSIsInNlY29uZCIsInRlcm1pbmFsTm9kZSIsImNvbnRlbnQiLCJnZXRDb250ZW50IiwiREVGSU5FRCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBVUE7OztlQUF3QkE7OzsyREFSRDt5QkFFQztxQkFDRTtxQkFDSTs7Ozs7O0FBRTlCLElBQU1DLG9CQUFvQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUVyQixTQUFTRixlQUFlRyxRQUFRLEVBQUVDLFlBQVksRUFBRUMsWUFBWTtJQUN6RSxJQUFJQyxtQkFBbUI7SUFFdkIsSUFBTUMsVUFBVUMsd0JBQXdCSixlQUNsQ0ssZUFBZVIsa0JBQWtCRTtJQUV2QyxJQUFJLE9BQU87SUFDVCxHQUFHO0lBQ0wsT0FBTyxJQUFJTSxpQkFBaUIsTUFBTTtRQUNoQyxJQUFNQyxXQUFXTCxhQUFhTSwwQkFBMEIsQ0FBQ0Y7UUFFekQsSUFBSUMsYUFBYSxNQUFNO1lBQ3JCLElBQU1FLGtCQUFrQlAsYUFBYVEsaUJBQWlCLENBQUNIO1lBRXZELElBQUlILFNBQVM7Z0JBQ1gsSUFBSUssaUJBQWlCO29CQUNuQk4sbUJBQW1CO2dCQUNyQjtZQUNGO1lBRUEsSUFBSSxDQUFDQyxTQUFTO2dCQUNaLElBQUksQ0FBQ0ssaUJBQWlCO29CQUNwQk4sbUJBQW1CO2dCQUNyQjtZQUNGO1FBQ0Y7SUFDRixPQUFPLElBQUlILGFBQWEsTUFBTTtRQUM1QixJQUFNVyxRQUFRLEVBQUUsRUFDVkMsZUFBZUMsSUFBQUEsYUFBVSxFQUFDYixVQUFVVyxPQUFPVCxjQUFjO1lBQ3ZELElBQUlZO1lBRUosSUFBTUMsWUFBWUMsSUFBQUEsWUFBSyxFQUFDTCxRQUNsQk0sT0FBT0YsV0FDUEcsZUFBZWhCLGFBQWFpQixjQUFjLENBQUNGO1lBRWpELElBQUliLFNBQVM7Z0JBQ1gsSUFBSWMsY0FBYztvQkFDaEJKLGdCQUFnQjtnQkFDbEI7WUFDRjtZQUVBLElBQUksQ0FBQ1YsU0FBUztnQkFDWixJQUFJLENBQUNjLGNBQWM7b0JBQ2pCSixnQkFBZ0I7Z0JBQ2xCO1lBQ0Y7WUFFQSxPQUFPQTtRQUNUO1FBRU5YLG1CQUFtQlMsY0FBZSxHQUFHO0lBRXZDO0lBRUEsT0FBT1Q7QUFDVDtBQUVBLFNBQVNFLHdCQUF3QkosWUFBWTtJQUMzQyxJQUFNbUIsYUFBYW5CLGFBQWFvQixhQUFhLElBQ3ZDQyxrQkFBa0JDLElBQUFBLGFBQU0sRUFBQ0gsYUFDekJJLGVBQWVGLGlCQUNmRyxVQUFVRCxhQUFhRSxVQUFVLElBQ2pDdEIsVUFBV3FCLFlBQVlFLGtCQUFPO0lBRXBDLE9BQU92QjtBQUNUIn0=

package/lib/verify/statement.js

@@ -53,7 +53,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-var equalityNodeQuery = (0, _query.nodeQuery)("/statement/equality!"), argumentNodeQuery = (0, _query.nodeQuery)("/statement/argument!"), definingNodeQuery = (0, _query.nodeQuery)("/statement/defining!"), statementNodeQuery = (0, _query.nodeQuery)("/metaArgument/statement!"), containmentNodeQuery = (0, _query.nodeQuery)("/statement/containment!"), metaArgumentNodeQuery = (0, _query.nodeQuery)("/statement/metaArgument!"), typeAssertionNodeQuery = (0, _query.nodeQuery)("/statement/typeAssertion!");
+var termNodeQuery = (0, _query.nodeQuery)("/statement/term!"), equalityNodeQuery = (0, _query.nodeQuery)("/statement/equality!"), definingNodeQuery = (0, _query.nodeQuery)("/statement/defining!"), statementNodeQuery = (0, _query.nodeQuery)("/metaArgument/statement!"), containmentNodeQuery = (0, _query.nodeQuery)("/statement/containment!"), metaArgumentNodeQuery = (0, _query.nodeQuery)("/statement/metaArgument!"), typeAssertionNodeQuery = (0, _query.nodeQuery)("/statement/typeAssertion!");
 function verifyStatement(statementNode, assignments, derived, localContext, verifyAhead) {
     var statementVerified;
     var statementString = localContext.nodeAsString(statementNode);
@@ -111,7 +111,7 @@ function verifyStatementAboutDefining(statementNode, assignments, derived, local
     if (definingNode !== null) {
         var statementString = localContext.nodeAsString(statementNode);
         localContext.trace("Verifying the '".concat(statementString, "' statement about defining..."), statementNode);
-        var argumentNode = argumentNodeQuery(statementNode), definingVerified = (0, _defining.default)(argumentNode, definingNode, localContext);
+        var termNode = termNodeQuery(statementNode), definingVerified = (0, _defining.default)(termNode, definingNode, localContext);
         statementVerifiedAboutDefining = definingVerified; ///
         if (statementVerifiedAboutDefining) {
             localContext.debug("...verified the '".concat(statementString, "' statement about defining."), statementNode);
@@ -139,7 +139,7 @@ function verifyStatementAboutContainment(statementNode, assignments, derived, lo
     if (containmentNode !== null) {
         var statementString = localContext.nodeAsString(statementNode);
         localContext.trace("Verifying the '".concat(statementString, "' statement about containment..."), statementNode);
-        var argumentNode = argumentNodeQuery(statementNode), metaArgumentNode = metaArgumentNodeQuery(statementNode), containmentVerified = (0, _containment.default)(argumentNode, containmentNode, metaArgumentNode, localContext);
+        var termNode = termNodeQuery(statementNode), metaArgumentNode = metaArgumentNodeQuery(statementNode), containmentVerified = (0, _containment.default)(termNode, containmentNode, metaArgumentNode, localContext);
         if (containmentVerified) {
             statementNode = statementNodeQuery(metaArgumentNode); ///
             var verifyStatementFunctions = [
@@ -189,4 +189,4 @@ function verifyStatementAgainstCombinators(statementNode, assignments, derived,
     return statementVerifiedAgainstCombinators;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statement.js"],"sourcesContent":["\"use strict\";\n\nimport verifyEquality from \"../verify/equality\";\nimport verifyDefining from \"../verify/defining\";\nimport verifyContainment from \"../verify/containment\";\nimport bracketedCombinator from \"../ocmbinator/bracketed\";\nimport verifyTypeAssertion from \"../verify/typeAssertion\";\nimport statementAgainstCombinatorNodesVerifier from \"../verifier/nodes/statementAgainstCombinator\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst equalityNodeQuery = nodeQuery(\"/statement/equality!\"),\n      argumentNodeQuery = nodeQuery(\"/statement/argument!\"),\n      definingNodeQuery = nodeQuery(\"/statement/defining!\"),\n      statementNodeQuery = nodeQuery(\"/metaArgument/statement!\"),\n      containmentNodeQuery = nodeQuery(\"/statement/containment!\"),\n      metaArgumentNodeQuery = nodeQuery(\"/statement/metaArgument!\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nfunction verifyStatement(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerified;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);\n\n  const verifyStatementFunctions = [\n    verifyStatementAsEquality,\n    verifyStatementAboutDefining,\n    verifyStatementAsTypeAssertion,\n    verifyStatementAboutContainment,\n    verifyStatementAgainstCombinators\n  ];\n\n  statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {\n    const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext, verifyAhead);\n\n    if (statementVerified) {\n      return true;\n    }\n  });\n\n  if (statementVerified) {\n    localContext.debug(`...verified the '${statementString}' statement.`, statementNode);\n  }\n\n  return statementVerified;\n}\n\nexport function verifyStandaloneStatement(statementNode, localContext, verifyAhead) {\n  let standaloneStatementVerified;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' standalone statement...`, statementNode);\n\n  const derived = false,\n        assignments = [],\n        statementVerified = verifyStatement(statementNode, assignments, derived, localContext, verifyAhead);\n\n  standaloneStatementVerified = statementVerified;  ///\n\n  if (standaloneStatementVerified) {\n    localContext.debug(`...verified the '${statementString}' standalone statement.`, statementNode);\n  }\n\n  return standaloneStatementVerified;\n}\n\nObject.assign(statementAgainstCombinatorNodesVerifier, {\n  verifyStatement\n});\n\nexport default verifyStatement;\n\nfunction verifyStatementAsEquality(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsEquality = false;\n\n  const equalityNode = equalityNodeQuery(statementNode);\n\n  if (equalityNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as an equality...`, statementNode);\n\n    const equalityVerified = verifyEquality(equalityNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsEquality = equalityVerified; ///\n\n    if (statementVerifiedAsEquality) {\n      localContext.debug(`...verified the '${statementString}' statement as an equality.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsEquality;\n}\n\nfunction verifyStatementAboutDefining(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAboutDefining = false;\n\n  const definingNode = definingNodeQuery(statementNode);\n\n  if (definingNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement about defining...`, statementNode);\n\n    const argumentNode = argumentNodeQuery(statementNode),\n          definingVerified = verifyDefining(argumentNode, definingNode, localContext);\n\n    statementVerifiedAboutDefining = definingVerified; ///\n\n    if (statementVerifiedAboutDefining) {\n      localContext.debug(`...verified the '${statementString}' statement about defining.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAboutDefining;\n}\n\nfunction verifyStatementAsTypeAssertion(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsTypeAssertion = false;\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a type assertion...`, statementNode);\n\n    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (statementVerifiedAsTypeAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a type assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsTypeAssertion;\n}\n\nfunction verifyStatementAboutContainment(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAboutContainment = false;\n\n  const containmentNode = containmentNodeQuery(statementNode);\n\n  if (containmentNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement about containment...`, statementNode);\n\n    const argumentNode = argumentNodeQuery(statementNode),\n          metaArgumentNode = metaArgumentNodeQuery(statementNode),\n          containmentVerified = verifyContainment(argumentNode, containmentNode, metaArgumentNode, localContext);\n\n    if (containmentVerified) {\n      statementNode = statementNodeQuery(metaArgumentNode); ///\n\n      const verifyStatementFunctions = [\n        verifyStatementAsEquality,\n        verifyStatementAgainstCombinators\n      ];\n\n      const statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {\n        const derived = false,\n              assignments = [],\n              statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext, verifyAhead);\n\n        if (statementVerified) {\n          return true;\n        }\n      });\n\n      statementVerifiedAboutContainment = statementVerified; ///\n    }\n\n    if (statementVerifiedAboutContainment) {\n      localContext.debug(`...verified the '${statementString}' statement about containment.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAboutContainment;\n}\n\nfunction verifyStatementAgainstCombinator(statementNode, combinator, localContext, verifyAhead) {\n  let statementVerifiedAgainstCombinator;\n\n  const statementString = localContext.nodeAsString(statementNode),\n        combinatorString = combinator.getString();\n\n  localContext.trace(`Verifying the '${statementString}' statement against the '${combinatorString}' combinator...`, statementNode);\n\n  const combinatorStatementNode = combinator.getStatementNode(),\n        nonTerminalNodeA = statementNode, ///\n        nonTerminalNodeB = combinatorStatementNode, ///\n        nonTerminalNodeVerified = statementAgainstCombinatorNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, localContext, verifyAhead);\n\n  statementVerifiedAgainstCombinator = nonTerminalNodeVerified;  ///\n\n  if (statementVerifiedAgainstCombinator) {\n    localContext.debug(`...verified the '${statementString}' statement against the '${combinatorString}' combinator.`, statementNode);\n  }\n\n  return statementVerifiedAgainstCombinator;\n}\n\nfunction verifyStatementAgainstCombinators(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAgainstCombinators = false;\n\n  const equalityNode = equalityNodeQuery(statementNode),\n        definingNode = definingNodeQuery(statementNode),\n        containmentNode = containmentNodeQuery(statementNode),\n        typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if ((equalityNode === null) && (definingNode === null) && (containmentNode === null) && (typeAssertionNode === null)) {\n    let combinators = localContext.getCombinators();\n\n    combinators = [ ///\n      bracketedCombinator,\n      ...combinators\n    ];\n\n    statementVerifiedAgainstCombinators = combinators.some((combinator) => {\n      const statementVerifiedAgainstCombinator = verifyStatementAgainstCombinator(statementNode, combinator, localContext, verifyAhead);\n\n      if (statementVerifiedAgainstCombinator) {\n        return true;\n      }\n    });\n  }\n\n  return statementVerifiedAgainstCombinators;\n}\n"],"names":["verifyStandaloneStatement","equalityNodeQuery","nodeQuery","argumentNodeQuery","definingNodeQuery","statementNodeQuery","containmentNodeQuery","metaArgumentNodeQuery","typeAssertionNodeQuery","verifyStatement","statementNode","assignments","derived","localContext","verifyAhead","statementVerified","statementString","nodeAsString","trace","verifyStatementFunctions","verifyStatementAsEquality","verifyStatementAboutDefining","verifyStatementAsTypeAssertion","verifyStatementAboutContainment","verifyStatementAgainstCombinators","some","verifyStatementFunction","debug","standaloneStatementVerified","Object","assign","statementAgainstCombinatorNodesVerifier","statementVerifiedAsEquality","equalityNode","equalityVerified","verifyEquality","statementVerifiedAboutDefining","definingNode","argumentNode","definingVerified","verifyDefining","statementVerifiedAsTypeAssertion","typeAssertionNode","typeAssertionVerified","verifyTypeAssertion","statementVerifiedAboutContainment","containmentNode","metaArgumentNode","containmentVerified","verifyContainment","verifyStatementAgainstCombinator","combinator","statementVerifiedAgainstCombinator","combinatorString","getString","combinatorStatementNode","getStatementNode","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeVerified","verifyNonTerminalNode","statementVerifiedAgainstCombinators","combinators","getCombinators","bracketedCombinator"],"mappings":"AAAA;;;;;;;;;;;IAyEA,OAA+B;eAA/B;;IAxBgBA,yBAAyB;eAAzBA;;;+DA/CW;+DACA;kEACG;gEACE;oEACA;iFACoB;qBAE1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1B,IAAMC,oBAAoBC,IAAAA,gBAAS,EAAC,yBAC9BC,oBAAoBD,IAAAA,gBAAS,EAAC,yBAC9BE,oBAAoBF,IAAAA,gBAAS,EAAC,yBAC9BG,qBAAqBH,IAAAA,gBAAS,EAAC,6BAC/BI,uBAAuBJ,IAAAA,gBAAS,EAAC,4BACjCK,wBAAwBL,IAAAA,gBAAS,EAAC,6BAClCM,yBAAyBN,IAAAA,gBAAS,EAAC;AAEzC,SAASO,gBAAgBC,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY,EAAEC,WAAW;IACrF,IAAIC;IAEJ,IAAMC,kBAAkBH,aAAaI,YAAY,CAACP;IAElDG,aAAaK,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,mBAAiBN;IAEtE,IAAMS,2BAA2B;QAC/BC;QACAC;QACAC;QACAC;QACAC;KACD;IAEDT,oBAAoBI,yBAAyBM,IAAI,CAAC,SAACC;QACjD,IAAMX,oBAAoBW,wBAAwBhB,eAAeC,aAAaC,SAASC,cAAcC;QAErG,IAAIC,mBAAmB;YACrB,OAAO;QACT;IACF;IAEA,IAAIA,mBAAmB;QACrBF,aAAac,KAAK,CAAC,AAAC,oBAAmC,OAAhBX,iBAAgB,iBAAeN;IACxE;IAEA,OAAOK;AACT;AAEO,SAASf,0BAA0BU,aAAa,EAAEG,YAAY,EAAEC,WAAW;IAChF,IAAIc;IAEJ,IAAMZ,kBAAkBH,aAAaI,YAAY,CAACP;IAElDG,aAAaK,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,8BAA4BN;IAEjF,IAAME,UAAU,OACVD,cAAc,EAAE,EAChBI,oBAAoBN,gBAAgBC,eAAeC,aAAaC,SAASC,cAAcC;IAE7Fc,8BAA8Bb,mBAAoB,GAAG;IAErD,IAAIa,6BAA6B;QAC/Bf,aAAac,KAAK,CAAC,AAAC,oBAAmC,OAAhBX,iBAAgB,4BAA0BN;IACnF;IAEA,OAAOkB;AACT;AAEAC,OAAOC,MAAM,CAACC,mCAAuC,EAAE;IACrDtB,iBAAAA;AACF;IAEA,WAAeA;AAEf,SAASW,0BAA0BV,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY,EAAEC,WAAW;IAC/F,IAAIkB,8BAA8B;IAElC,IAAMC,eAAehC,kBAAkBS;IAEvC,IAAIuB,iBAAiB,MAAM;QACzB,IAAMjB,kBAAkBH,aAAaI,YAAY,CAACP;QAElDG,aAAaK,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,kCAAgCN;QAErF,IAAMwB,mBAAmBC,IAAAA,iBAAc,EAACF,cAActB,aAAaC,SAASC,cAAcC;QAE1FkB,8BAA8BE,kBAAkB,GAAG;QAEnD,IAAIF,6BAA6B;YAC/BnB,aAAac,KAAK,CAAC,AAAC,oBAAmC,OAAhBX,iBAAgB,gCAA8BN;QACvF;IACF;IAEA,OAAOsB;AACT;AAEA,SAASX,6BAA6BX,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY,EAAEC,WAAW;IAClG,IAAIsB,iCAAiC;IAErC,IAAMC,eAAejC,kBAAkBM;IAEvC,IAAI2B,iBAAiB,MAAM;QACzB,IAAMrB,kBAAkBH,aAAaI,YAAY,CAACP;QAElDG,aAAaK,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,kCAAgCN;QAErF,IAAM4B,eAAenC,kBAAkBO,gBACjC6B,mBAAmBC,IAAAA,iBAAc,EAACF,cAAcD,cAAcxB;QAEpEuB,iCAAiCG,kBAAkB,GAAG;QAEtD,IAAIH,gCAAgC;YAClCvB,aAAac,KAAK,CAAC,AAAC,oBAAmC,OAAhBX,iBAAgB,gCAA8BN;QACvF;IACF;IAEA,OAAO0B;AACT;AAEA,SAASd,+BAA+BZ,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY,EAAEC,WAAW;IACpG,IAAI2B,mCAAmC;IAEvC,IAAMC,oBAAoBlC,uBAAuBE;IAEjD,IAAIgC,sBAAsB,MAAM;QAC9B,IAAM1B,kBAAkBH,aAAaI,YAAY,CAACP;QAElDG,aAAaK,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,uCAAqCN;QAE1F,IAAMiC,wBAAwBC,IAAAA,sBAAmB,EAACF,mBAAmB/B,aAAaC,SAASC,cAAcC;QAEzG2B,mCAAmCE,uBAAuB,GAAG;QAE7D,IAAIF,kCAAkC;YACpC5B,aAAac,KAAK,CAAC,AAAC,oBAAmC,OAAhBX,iBAAgB,qCAAmCN;QAC5F;IACF;IAEA,OAAO+B;AACT;AAEA,SAASlB,gCAAgCb,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY,EAAEC,WAAW;IACrG,IAAI+B,oCAAoC;IAExC,IAAMC,kBAAkBxC,qBAAqBI;IAE7C,IAAIoC,oBAAoB,MAAM;QAC5B,IAAM9B,kBAAkBH,aAAaI,YAAY,CAACP;QAElDG,aAAaK,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,qCAAmCN;QAExF,IAAM4B,eAAenC,kBAAkBO,gBACjCqC,mBAAmBxC,sBAAsBG,gBACzCsC,sBAAsBC,IAAAA,oBAAiB,EAACX,cAAcQ,iBAAiBC,kBAAkBlC;QAE/F,IAAImC,qBAAqB;YACvBtC,gBAAgBL,mBAAmB0C,mBAAmB,GAAG;YAEzD,IAAM5B,2BAA2B;gBAC/BC;gBACAI;aACD;YAED,IAAMT,oBAAoBI,yBAAyBM,IAAI,CAAC,SAACC;gBACvD,IAAMd,UAAU,OACVD,cAAc,EAAE,EAChBI,oBAAoBW,wBAAwBhB,eAAeC,aAAaC,SAASC,cAAcC;gBAErG,IAAIC,mBAAmB;oBACrB,OAAO;gBACT;YACF;YAEA8B,oCAAoC9B,mBAAmB,GAAG;QAC5D;QAEA,IAAI8B,mCAAmC;YACrChC,aAAac,KAAK,CAAC,AAAC,oBAAmC,OAAhBX,iBAAgB,mCAAiCN;QAC1F;IACF;IAEA,OAAOmC;AACT;AAEA,SAASK,iCAAiCxC,aAAa,EAAEyC,UAAU,EAAEtC,YAAY,EAAEC,WAAW;IAC5F,IAAIsC;IAEJ,IAAMpC,kBAAkBH,aAAaI,YAAY,CAACP,gBAC5C2C,mBAAmBF,WAAWG,SAAS;IAE7CzC,aAAaK,KAAK,CAAC,AAAC,kBAA4DmC,OAA3CrC,iBAAgB,6BAA4C,OAAjBqC,kBAAiB,oBAAkB3C;IAEnH,IAAM6C,0BAA0BJ,WAAWK,gBAAgB,IACrDC,mBAAmB/C,eACnBgD,mBAAmBH,yBACnBI,0BAA0B5B,mCAAuC,CAAC6B,qBAAqB,CAACH,kBAAkBC,kBAAkB7C,cAAcC;IAEhJsC,qCAAqCO,yBAA0B,GAAG;IAElE,IAAIP,oCAAoC;QACtCvC,aAAac,KAAK,CAAC,AAAC,oBAA8D0B,OAA3CrC,iBAAgB,6BAA4C,OAAjBqC,kBAAiB,kBAAgB3C;IACrH;IAEA,OAAO0C;AACT;AAEA,SAAS5B,kCAAkCd,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY,EAAEC,WAAW;IACvG,IAAI+C,sCAAsC;IAE1C,IAAM5B,eAAehC,kBAAkBS,gBACjC2B,eAAejC,kBAAkBM,gBACjCoC,kBAAkBxC,qBAAqBI,gBACvCgC,oBAAoBlC,uBAAuBE;IAEjD,IAAI,AAACuB,iBAAiB,QAAUI,iBAAiB,QAAUS,oBAAoB,QAAUJ,sBAAsB,MAAO;QACpH,IAAIoB,cAAcjD,aAAakD,cAAc;QAE7CD,cAAc;YACZE,kBAAmB;SAEpB,CAHa,OAEZ,qBAAGF;QAGLD,sCAAsCC,YAAYrC,IAAI,CAAC,SAAC0B;YACtD,IAAMC,qCAAqCF,iCAAiCxC,eAAeyC,YAAYtC,cAAcC;YAErH,IAAIsC,oCAAoC;gBACtC,OAAO;YACT;QACF;IACF;IAEA,OAAOS;AACT"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statement.js"],"sourcesContent":["\"use strict\";\n\nimport verifyEquality from \"../verify/equality\";\nimport verifyDefining from \"../verify/defining\";\nimport verifyContainment from \"../verify/containment\";\nimport bracketedCombinator from \"../ocmbinator/bracketed\";\nimport verifyTypeAssertion from \"../verify/typeAssertion\";\nimport statementAgainstCombinatorNodesVerifier from \"../verifier/nodes/statementAgainstCombinator\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/statement/term!\"),\n      equalityNodeQuery = nodeQuery(\"/statement/equality!\"),\n      definingNodeQuery = nodeQuery(\"/statement/defining!\"),\n      statementNodeQuery = nodeQuery(\"/metaArgument/statement!\"),\n      containmentNodeQuery = nodeQuery(\"/statement/containment!\"),\n      metaArgumentNodeQuery = nodeQuery(\"/statement/metaArgument!\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nfunction verifyStatement(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerified;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);\n\n  const verifyStatementFunctions = [\n    verifyStatementAsEquality,\n    verifyStatementAboutDefining,\n    verifyStatementAsTypeAssertion,\n    verifyStatementAboutContainment,\n    verifyStatementAgainstCombinators\n  ];\n\n  statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {\n    const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext, verifyAhead);\n\n    if (statementVerified) {\n      return true;\n    }\n  });\n\n  if (statementVerified) {\n    localContext.debug(`...verified the '${statementString}' statement.`, statementNode);\n  }\n\n  return statementVerified;\n}\n\nexport function verifyStandaloneStatement(statementNode, localContext, verifyAhead) {\n  let standaloneStatementVerified;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' standalone statement...`, statementNode);\n\n  const derived = false,\n        assignments = [],\n        statementVerified = verifyStatement(statementNode, assignments, derived, localContext, verifyAhead);\n\n  standaloneStatementVerified = statementVerified;  ///\n\n  if (standaloneStatementVerified) {\n    localContext.debug(`...verified the '${statementString}' standalone statement.`, statementNode);\n  }\n\n  return standaloneStatementVerified;\n}\n\nObject.assign(statementAgainstCombinatorNodesVerifier, {\n  verifyStatement\n});\n\nexport default verifyStatement;\n\nfunction verifyStatementAsEquality(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsEquality = false;\n\n  const equalityNode = equalityNodeQuery(statementNode);\n\n  if (equalityNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as an equality...`, statementNode);\n\n    const equalityVerified = verifyEquality(equalityNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsEquality = equalityVerified; ///\n\n    if (statementVerifiedAsEquality) {\n      localContext.debug(`...verified the '${statementString}' statement as an equality.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsEquality;\n}\n\nfunction verifyStatementAboutDefining(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAboutDefining = false;\n\n  const definingNode = definingNodeQuery(statementNode);\n\n  if (definingNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement about defining...`, statementNode);\n\n    const termNode = termNodeQuery(statementNode),\n          definingVerified = verifyDefining(termNode, definingNode, localContext);\n\n    statementVerifiedAboutDefining = definingVerified; ///\n\n    if (statementVerifiedAboutDefining) {\n      localContext.debug(`...verified the '${statementString}' statement about defining.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAboutDefining;\n}\n\nfunction verifyStatementAsTypeAssertion(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsTypeAssertion = false;\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a type assertion...`, statementNode);\n\n    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (statementVerifiedAsTypeAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a type assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsTypeAssertion;\n}\n\nfunction verifyStatementAboutContainment(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAboutContainment = false;\n\n  const containmentNode = containmentNodeQuery(statementNode);\n\n  if (containmentNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement about containment...`, statementNode);\n\n    const termNode = termNodeQuery(statementNode),\n          metaArgumentNode = metaArgumentNodeQuery(statementNode),\n          containmentVerified = verifyContainment(termNode, containmentNode, metaArgumentNode, localContext);\n\n    if (containmentVerified) {\n      statementNode = statementNodeQuery(metaArgumentNode); ///\n\n      const verifyStatementFunctions = [\n        verifyStatementAsEquality,\n        verifyStatementAgainstCombinators\n      ];\n\n      const statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {\n        const derived = false,\n              assignments = [],\n              statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext, verifyAhead);\n\n        if (statementVerified) {\n          return true;\n        }\n      });\n\n      statementVerifiedAboutContainment = statementVerified; ///\n    }\n\n    if (statementVerifiedAboutContainment) {\n      localContext.debug(`...verified the '${statementString}' statement about containment.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAboutContainment;\n}\n\nfunction verifyStatementAgainstCombinator(statementNode, combinator, localContext, verifyAhead) {\n  let statementVerifiedAgainstCombinator;\n\n  const statementString = localContext.nodeAsString(statementNode),\n        combinatorString = combinator.getString();\n\n  localContext.trace(`Verifying the '${statementString}' statement against the '${combinatorString}' combinator...`, statementNode);\n\n  const combinatorStatementNode = combinator.getStatementNode(),\n        nonTerminalNodeA = statementNode, ///\n        nonTerminalNodeB = combinatorStatementNode, ///\n        nonTerminalNodeVerified = statementAgainstCombinatorNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, localContext, verifyAhead);\n\n  statementVerifiedAgainstCombinator = nonTerminalNodeVerified;  ///\n\n  if (statementVerifiedAgainstCombinator) {\n    localContext.debug(`...verified the '${statementString}' statement against the '${combinatorString}' combinator.`, statementNode);\n  }\n\n  return statementVerifiedAgainstCombinator;\n}\n\nfunction verifyStatementAgainstCombinators(statementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAgainstCombinators = false;\n\n  const equalityNode = equalityNodeQuery(statementNode),\n        definingNode = definingNodeQuery(statementNode),\n        containmentNode = containmentNodeQuery(statementNode),\n        typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if ((equalityNode === null) && (definingNode === null) && (containmentNode === null) && (typeAssertionNode === null)) {\n    let combinators = localContext.getCombinators();\n\n    combinators = [ ///\n      bracketedCombinator,\n      ...combinators\n    ];\n\n    statementVerifiedAgainstCombinators = combinators.some((combinator) => {\n      const statementVerifiedAgainstCombinator = verifyStatementAgainstCombinator(statementNode, combinator, localContext, verifyAhead);\n\n      if (statementVerifiedAgainstCombinator) {\n        return true;\n      }\n    });\n  }\n\n  return statementVerifiedAgainstCombinators;\n}\n"],"names":["verifyStandaloneStatement","termNodeQuery","nodeQuery","equalityNodeQuery","definingNodeQuery","statementNodeQuery","containmentNodeQuery","metaArgumentNodeQuery","typeAssertionNodeQuery","verifyStatement","statementNode","assignments","derived","localContext","verifyAhead","statementVerified","statementString","nodeAsString","trace","verifyStatementFunctions","verifyStatementAsEquality","verifyStatementAboutDefining","verifyStatementAsTypeAssertion","verifyStatementAboutContainment","verifyStatementAgainstCombinators","some","verifyStatementFunction","debug","standaloneStatementVerified","Object","assign","statementAgainstCombinatorNodesVerifier","statementVerifiedAsEquality","equalityNode","equalityVerified","verifyEquality","statementVerifiedAboutDefining","definingNode","termNode","definingVerified","verifyDefining","statementVerifiedAsTypeAssertion","typeAssertionNode","typeAssertionVerified","verifyTypeAssertion","statementVerifiedAboutContainment","containmentNode","metaArgumentNode","containmentVerified","verifyContainment","verifyStatementAgainstCombinator","combinator","statementVerifiedAgainstCombinator","combinatorString","getString","combinatorStatementNode","getStatementNode","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeVerified","verifyNonTerminalNode","statementVerifiedAgainstCombinators","combinators","getCombinators","bracketedCombinator"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.847",
+  "version": "0.0.849",
   "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.744",
+    "occam-custom-grammars": "^5.0.746",
     "occam-entities": "^1.0.125",
     "occam-file-system": "^6.0.167",
     "occam-grammar-utilities": "^8.0.201",

package/src/verify/containment.js

@@ -4,17 +4,15 @@ import { second } from "../utilities/array";
 import { CONTAINED } from "../constants";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const termNodeQuery = nodeQuery("/argument/term!"),
-      variableNodeQuery = nodeQuery("/argument/term/variable!"),
+const variableNodeQuery = nodeQuery("/term/variable!"),
       metaArgumentTermNodesQuery = nodesQuery("/metaArgument//term"),
       metaArgumentVariableNodesQuery = nodesQuery("/metaArgument//variable");
 
-export default function verifyContainment(argumentNode, containmentNode, metaArgumentNode, localContext) {
+export default function verifyContainment(termNode, containmentNode, metaArgumentNode, localContext) {
   let containmentVerified = false;
 
   const contained = containedFromContainmentNode(containmentNode),
-        termNode = termNodeQuery(argumentNode),
-        variableNode = variableNodeQuery(argumentNode);
+        variableNode = variableNodeQuery(termNode);
 
   if (false) {
     ///

package/src/verify/defining.js

@@ -6,15 +6,13 @@ import { DEFINED } from "../constants";
 import { nodeQuery } from "../utilities/query";
 import { first, second } from "../utilities/array";
 
-const termNodeQuery = nodeQuery("/argument/term!"),
-      variableNodeQuery = nodeQuery("/argument/term/variable!");
+const variableNodeQuery = nodeQuery("/term/variable!");
 
-export default function verifyDefining(argumentNode, definingNode, localContext) {
+export default function verifyDefining(termNode, definingNode, localContext) {
   let definingVerified = false;
 
   const defined = definedFromDefiningNode(definingNode),
-        termNode = termNodeQuery(argumentNode),
-        variableNode = variableNodeQuery(argumentNode);
+        variableNode = variableNodeQuery(termNode);
 
   if (false) {
     ///

package/src/verify/statement.js

@@ -9,8 +9,8 @@ import statementAgainstCombinatorNodesVerifier from "../verifier/nodes/statement
 
 import { nodeQuery } from "../utilities/query";
 
-const equalityNodeQuery = nodeQuery("/statement/equality!"),
-      argumentNodeQuery = nodeQuery("/statement/argument!"),
+const termNodeQuery = nodeQuery("/statement/term!"),
+      equalityNodeQuery = nodeQuery("/statement/equality!"),
       definingNodeQuery = nodeQuery("/statement/defining!"),
       statementNodeQuery = nodeQuery("/metaArgument/statement!"),
       containmentNodeQuery = nodeQuery("/statement/containment!"),
@@ -105,8 +105,8 @@ function verifyStatementAboutDefining(statementNode, assignments, derived, local
 
     localContext.trace(`Verifying the '${statementString}' statement about defining...`, statementNode);
 
-    const argumentNode = argumentNodeQuery(statementNode),
-          definingVerified = verifyDefining(argumentNode, definingNode, localContext);
+    const termNode = termNodeQuery(statementNode),
+          definingVerified = verifyDefining(termNode, definingNode, localContext);
 
     statementVerifiedAboutDefining = definingVerified; ///
 
@@ -150,9 +150,9 @@ function verifyStatementAboutContainment(statementNode, assignments, derived, lo
 
     localContext.trace(`Verifying the '${statementString}' statement about containment...`, statementNode);
 
-    const argumentNode = argumentNodeQuery(statementNode),
+    const termNode = termNodeQuery(statementNode),
           metaArgumentNode = metaArgumentNodeQuery(statementNode),
-          containmentVerified = verifyContainment(argumentNode, containmentNode, metaArgumentNode, localContext);
+          containmentVerified = verifyContainment(termNode, containmentNode, metaArgumentNode, localContext);
 
     if (containmentVerified) {
       statementNode = statementNodeQuery(metaArgumentNode); ///