occam-verify-cli 0.0.843 → 0.0.844

package/lib/term.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "default", {
         return Term;
     }
 });
+var _array = require("./utilities/array");
 var _query = require("./utilities/query");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -57,8 +58,8 @@ var Term = /*#__PURE__*/ function() {
         },
         {
             key: "getVariables",
-            value: function getVariables(variables, context) {
-                var variableNodes = variableNodesQuery(this.node);
+            value: function getVariables(context) {
+                var variables = [], variableNodes = variableNodesQuery(this.node);
                 variableNodes.forEach(function(variableNode) {
                     var variable = context.findVariableByVariableNode(variableNode), variablesIncludesVariable = variables.includes(variable);
                     if (!variablesIncludesVariable) {
@@ -68,27 +69,31 @@ var Term = /*#__PURE__*/ function() {
                 return variables;
             }
         },
+        {
+            key: "isGrounded",
+            value: function isGrounded(definedVariables, context) {
+                var variables = this.getVariables(context);
+                (0, _array.filter)(variables, function(variable) {
+                    var definedVariablesIncludesVariable = definedVariables.includes(variable);
+                    if (!definedVariablesIncludesVariable) {
+                        return true;
+                    }
+                });
+                var undefinedVariables = variables, undefinedVariablesLength = undefinedVariables.length, grounded = undefinedVariablesLength <= 1;
+                return grounded;
+            }
+        },
         {
             key: "isInitiallyGrounded",
-            value: function isInitiallyGrounded() {
-                var definedVariables = [], implicitlyGrounded = this.isImplicitlyGrounded(definedVariables), initiallyGrounded = implicitlyGrounded; ///
+            value: function isInitiallyGrounded(context) {
+                var variables = this.getVariables(context), variablesLength = variables.length, initiallyGrounded = variablesLength === 0;
                 return initiallyGrounded;
             }
         },
         {
             key: "isImplicitlyGrounded",
-            value: function isImplicitlyGrounded(definedVariables) {
-                var variableNodes = variableNodesQuery(this.node), variables = definedVariables, nodes = variableNodes, implicitlyGrounded = nodes.every(function(node) {
-                    var variableMatchesNode = variables.some(function(variable) {
-                        var variableMatchesNode = variable.matchNode(node);
-                        if (variableMatchesNode) {
-                            return true;
-                        }
-                    });
-                    if (variableMatchesNode) {
-                        return true;
-                    }
-                });
+            value: function isImplicitlyGrounded(definedVariables, context) {
+                var grounded = this.isGrounded(definedVariables, context), implicitlyGrounded = grounded; ///
                 return implicitlyGrounded;
             }
         }
@@ -104,4 +109,4 @@ var Term = /*#__PURE__*/ function() {
     return Term;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXJtLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4vdXRpbGl0aWVzL3F1ZXJ5XCJcblxuY29uc3QgdmFyaWFibGVOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi8vdmFyaWFibGVcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFRlcm0ge1xuICBjb25zdHJ1Y3Rvcihub2RlLCB0eXBlKSB7XG4gICAgdGhpcy5ub2RlID0gbm9kZTtcbiAgICB0aGlzLnR5cGUgPSB0eXBlO1xuICB9XG5cbiAgZ2V0Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5ub2RlO1xuICB9XG5cbiAgZ2V0VHlwZSgpIHtcbiAgICByZXR1cm4gdGhpcy50eXBlO1xuICB9XG5cbiAgbWF0Y2godGVybSkge1xuICAgIGNvbnN0IG5vZGUgPSB0ZXJtLmdldE5vZGUoKSxcbiAgICAgICAgICBtYXRjaGVzID0gdGhpcy5ub2RlLm1hdGNoKG5vZGUpO1xuXG4gICAgcmV0dXJuIG1hdGNoZXM7XG4gIH1cblxuICBnZXRWYXJpYWJsZXModmFyaWFibGVzLCBjb250ZXh0KSB7XG4gICAgY29uc3QgdmFyaWFibGVOb2RlcyA9IHZhcmlhYmxlTm9kZXNRdWVyeSh0aGlzLm5vZGUpO1xuXG4gICAgdmFyaWFibGVOb2Rlcy5mb3JFYWNoKCh2YXJpYWJsZU5vZGUpID0+IHtcbiAgICAgIGNvbnN0IHZhcmlhYmxlID0gY29udGV4dC5maW5kVmFyaWFibGVCeVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpLFxuICAgICAgICAgICAgdmFyaWFibGVzSW5jbHVkZXNWYXJpYWJsZSA9IHZhcmlhYmxlcy5pbmNsdWRlcyh2YXJpYWJsZSk7XG5cbiAgICAgIGlmICghdmFyaWFibGVzSW5jbHVkZXNWYXJpYWJsZSkge1xuICAgICAgICB2YXJpYWJsZXMucHVzaCh2YXJpYWJsZSk7XG4gICAgICB9XG4gICAgfSk7XG5cbiAgICByZXR1cm4gdmFyaWFibGVzO1xuICB9XG5cbiAgaXNJbml0aWFsbHlHcm91bmRlZCgpIHtcbiAgICBjb25zdCBkZWZpbmVkVmFyaWFibGVzID0gW10sXG4gICAgICAgICAgaW1wbGljaXRseUdyb3VuZGVkID0gdGhpcy5pc0ltcGxpY2l0bHlHcm91bmRlZChkZWZpbmVkVmFyaWFibGVzKSxcbiAgICAgICAgICBpbml0aWFsbHlHcm91bmRlZCA9IGltcGxpY2l0bHlHcm91bmRlZDsgLy8vXG5cbiAgICByZXR1cm4gaW5pdGlhbGx5R3JvdW5kZWQ7XG4gIH1cblxuICBpc0ltcGxpY2l0bHlHcm91bmRlZChkZWZpbmVkVmFyaWFibGVzKSB7XG4gICAgY29uc3QgdmFyaWFibGVOb2RlcyA9IHZhcmlhYmxlTm9kZXNRdWVyeSh0aGlzLm5vZGUpLFxuICAgICAgICAgIHZhcmlhYmxlcyA9IGRlZmluZWRWYXJpYWJsZXMsIC8vL1xuICAgICAgICAgIG5vZGVzID0gdmFyaWFibGVOb2RlcywgIC8vL1xuICAgICAgICAgIGltcGxpY2l0bHlHcm91bmRlZCA9IG5vZGVzLmV2ZXJ5KChub2RlKSA9PiB7XG4gICAgICAgICAgICBjb25zdCB2YXJpYWJsZU1hdGNoZXNOb2RlID0gdmFyaWFibGVzLnNvbWUoKHZhcmlhYmxlKSA9PiB7XG4gICAgICAgICAgICAgIGNvbnN0IHZhcmlhYmxlTWF0Y2hlc05vZGUgPSB2YXJpYWJsZS5tYXRjaE5vZGUobm9kZSk7XG5cbiAgICAgICAgICAgICAgaWYgKHZhcmlhYmxlTWF0Y2hlc05vZGUpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfSk7XG5cbiAgICAgICAgICAgIGlmICh2YXJpYWJsZU1hdGNoZXNOb2RlKSB7XG4gICAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH0pO1xuXG4gICAgcmV0dXJuIGltcGxpY2l0bHlHcm91bmRlZDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tVGVybU5vZGVBbmRUeXBlKHRlcm1Ob2RlLCB0eXBlKSB7XG4gICAgY29uc3Qgbm9kZSA9IHRlcm1Ob2RlLCAgLy8vXG4gICAgICAgICAgdGVybSA9IG5ldyBUZXJtKG5vZGUsIHR5cGUpO1xuXG4gICAgcmV0dXJuIHRlcm07XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJUZXJtIiwidmFyaWFibGVOb2Rlc1F1ZXJ5Iiwibm9kZXNRdWVyeSIsIm5vZGUiLCJ0eXBlIiwiZ2V0Tm9kZSIsImdldFR5cGUiLCJtYXRjaCIsInRlcm0iLCJtYXRjaGVzIiwiZ2V0VmFyaWFibGVzIiwidmFyaWFibGVzIiwiY29udGV4dCIsInZhcmlhYmxlTm9kZXMiLCJmb3JFYWNoIiwidmFyaWFibGVOb2RlIiwidmFyaWFibGUiLCJmaW5kVmFyaWFibGVCeVZhcmlhYmxlTm9kZSIsInZhcmlhYmxlc0luY2x1ZGVzVmFyaWFibGUiLCJpbmNsdWRlcyIsInB1c2giLCJpc0luaXRpYWxseUdyb3VuZGVkIiwiZGVmaW5lZFZhcmlhYmxlcyIsImltcGxpY2l0bHlHcm91bmRlZCIsImlzSW1wbGljaXRseUdyb3VuZGVkIiwiaW5pdGlhbGx5R3JvdW5kZWQiLCJub2RlcyIsImV2ZXJ5IiwidmFyaWFibGVNYXRjaGVzTm9kZSIsInNvbWUiLCJtYXRjaE5vZGUiLCJmcm9tVGVybU5vZGVBbmRUeXBlIiwidGVybU5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O3FCQUpNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUzQixJQUFNQyxxQkFBcUJDLElBQUFBLGlCQUFVLEVBQUM7QUFFdkIsSUFBQSxBQUFNRixxQkFBRCxBQUFMO2FBQU1BLEtBQ1BHLElBQUksRUFBRUMsSUFBSTtnQ0FESEo7UUFFakIsSUFBSSxDQUFDRyxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDQyxJQUFJLEdBQUdBOztrQkFIS0o7O1lBTW5CSyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLElBQUk7WUFDbEI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLElBQUk7WUFDbEI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsTUFBTUMsSUFBSTtnQkFDUixJQUFNTCxPQUFPSyxLQUFLSCxPQUFPLElBQ25CSSxVQUFVLElBQUksQ0FBQ04sSUFBSSxDQUFDSSxLQUFLLENBQUNKO2dCQUVoQyxPQUFPTTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBLGFBQWFDLFNBQVMsRUFBRUMsT0FBTztnQkFDN0IsSUFBTUMsZ0JBQWdCWixtQkFBbUIsSUFBSSxDQUFDRSxJQUFJO2dCQUVsRFUsY0FBY0MsT0FBTyxDQUFDLFNBQUNDO29CQUNyQixJQUFNQyxXQUFXSixRQUFRSywwQkFBMEIsQ0FBQ0YsZUFDOUNHLDRCQUE0QlAsVUFBVVEsUUFBUSxDQUFDSDtvQkFFckQsSUFBSSxDQUFDRSwyQkFBMkI7d0JBQzlCUCxVQUFVUyxJQUFJLENBQUNKO29CQUNqQjtnQkFDRjtnQkFFQSxPQUFPTDtZQUNUOzs7WUFFQVUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLG1CQUFtQixFQUFFLEVBQ3JCQyxxQkFBcUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0YsbUJBQy9DRyxvQkFBb0JGLG9CQUFvQixHQUFHO2dCQUVqRCxPQUFPRTtZQUNUOzs7WUFFQUQsS0FBQUE7bUJBQUFBLFNBQUFBLHFCQUFxQkYsZ0JBQWdCO2dCQUNuQyxJQUFNVCxnQkFBZ0JaLG1CQUFtQixJQUFJLENBQUNFLElBQUksR0FDNUNRLFlBQVlXLGtCQUNaSSxRQUFRYixlQUNSVSxxQkFBcUJHLE1BQU1DLEtBQUssQ0FBQyxTQUFDeEI7b0JBQ2hDLElBQU15QixzQkFBc0JqQixVQUFVa0IsSUFBSSxDQUFDLFNBQUNiO3dCQUMxQyxJQUFNWSxzQkFBc0JaLFNBQVNjLFNBQVMsQ0FBQzNCO3dCQUUvQyxJQUFJeUIscUJBQXFCOzRCQUN2QixPQUFPO3dCQUNUO29CQUNGO29CQUVBLElBQUlBLHFCQUFxQjt3QkFDdkIsT0FBTztvQkFDVDtnQkFDRjtnQkFFTixPQUFPTDtZQUNUOzs7O1lBRU9RLEtBQUFBO21CQUFQLFNBQU9BLG9CQUFvQkMsUUFBUSxFQUFFNUIsSUFBSTtnQkFDdkMsSUFBTUQsT0FBTzZCLFVBQ1B4QixPQUFPLElBbkVJUixLQW1FS0csTUFBTUM7Z0JBRTVCLE9BQU9JO1lBQ1Q7OztXQXRFbUJSIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXJtLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBmaWx0ZXIgfSBmcm9tIFwiLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IG5vZGVzUXVlcnkgfSBmcm9tIFwiLi91dGlsaXRpZXMvcXVlcnlcIlxuXG5jb25zdCB2YXJpYWJsZU5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiLy92YXJpYWJsZVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVGVybSB7XG4gIGNvbnN0cnVjdG9yKG5vZGUsIHR5cGUpIHtcbiAgICB0aGlzLm5vZGUgPSBub2RlO1xuICAgIHRoaXMudHlwZSA9IHR5cGU7XG4gIH1cblxuICBnZXROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLm5vZGU7XG4gIH1cblxuICBnZXRUeXBlKCkge1xuICAgIHJldHVybiB0aGlzLnR5cGU7XG4gIH1cblxuICBtYXRjaCh0ZXJtKSB7XG4gICAgY29uc3Qgbm9kZSA9IHRlcm0uZ2V0Tm9kZSgpLFxuICAgICAgICAgIG1hdGNoZXMgPSB0aGlzLm5vZGUubWF0Y2gobm9kZSk7XG5cbiAgICByZXR1cm4gbWF0Y2hlcztcbiAgfVxuXG4gIGdldFZhcmlhYmxlcyhjb250ZXh0KSB7XG4gICAgY29uc3QgdmFyaWFibGVzID0gW10sXG4gICAgICAgICAgdmFyaWFibGVOb2RlcyA9IHZhcmlhYmxlTm9kZXNRdWVyeSh0aGlzLm5vZGUpO1xuXG4gICAgdmFyaWFibGVOb2Rlcy5mb3JFYWNoKCh2YXJpYWJsZU5vZGUpID0+IHtcbiAgICAgIGNvbnN0IHZhcmlhYmxlID0gY29udGV4dC5maW5kVmFyaWFibGVCeVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpLFxuICAgICAgICAgICAgdmFyaWFibGVzSW5jbHVkZXNWYXJpYWJsZSA9IHZhcmlhYmxlcy5pbmNsdWRlcyh2YXJpYWJsZSk7XG5cbiAgICAgIGlmICghdmFyaWFibGVzSW5jbHVkZXNWYXJpYWJsZSkge1xuICAgICAgICB2YXJpYWJsZXMucHVzaCh2YXJpYWJsZSk7XG4gICAgICB9XG4gICAgfSk7XG5cbiAgICByZXR1cm4gdmFyaWFibGVzO1xuICB9XG5cbiAgaXNHcm91bmRlZChkZWZpbmVkVmFyaWFibGVzLCBjb250ZXh0KSB7XG4gICAgY29uc3QgdmFyaWFibGVzID0gdGhpcy5nZXRWYXJpYWJsZXMoY29udGV4dCk7XG5cbiAgICBmaWx0ZXIodmFyaWFibGVzLCAodmFyaWFibGUpID0+IHtcbiAgICAgIGNvbnN0IGRlZmluZWRWYXJpYWJsZXNJbmNsdWRlc1ZhcmlhYmxlID0gZGVmaW5lZFZhcmlhYmxlcy5pbmNsdWRlcyh2YXJpYWJsZSk7XG5cbiAgICAgIGlmICghZGVmaW5lZFZhcmlhYmxlc0luY2x1ZGVzVmFyaWFibGUpIHtcbiAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICB9XG4gICAgfSk7XG5cbiAgICBjb25zdCB1bmRlZmluZWRWYXJpYWJsZXMgPSB2YXJpYWJsZXMsIC8vL1xuICAgICAgICAgIHVuZGVmaW5lZFZhcmlhYmxlc0xlbmd0aCA9IHVuZGVmaW5lZFZhcmlhYmxlcy5sZW5ndGgsXG4gICAgICAgICAgZ3JvdW5kZWQgPSAodW5kZWZpbmVkVmFyaWFibGVzTGVuZ3RoIDw9IDEpO1xuXG4gICAgcmV0dXJuIGdyb3VuZGVkO1xuICB9XG5cbiAgaXNJbml0aWFsbHlHcm91bmRlZChjb250ZXh0KSB7XG4gICAgY29uc3QgdmFyaWFibGVzID0gdGhpcy5nZXRWYXJpYWJsZXMoY29udGV4dCksXG4gICAgICAgICAgdmFyaWFibGVzTGVuZ3RoID0gdmFyaWFibGVzLmxlbmd0aCxcbiAgICAgICAgICBpbml0aWFsbHlHcm91bmRlZCA9ICh2YXJpYWJsZXNMZW5ndGggPT09IDApO1xuXG4gICAgcmV0dXJuIGluaXRpYWxseUdyb3VuZGVkO1xuICB9XG5cbiAgaXNJbXBsaWNpdGx5R3JvdW5kZWQoZGVmaW5lZFZhcmlhYmxlcywgY29udGV4dCkge1xuICAgIGNvbnN0IGdyb3VuZGVkID0gdGhpcy5pc0dyb3VuZGVkKGRlZmluZWRWYXJpYWJsZXMsIGNvbnRleHQpLFxuICAgICAgICAgIGltcGxpY2l0bHlHcm91bmRlZCA9IGdyb3VuZGVkOyAgLy8vXG5cbiAgICByZXR1cm4gaW1wbGljaXRseUdyb3VuZGVkO1xuICB9XG5cbiAgc3RhdGljIGZyb21UZXJtTm9kZUFuZFR5cGUodGVybU5vZGUsIHR5cGUpIHtcbiAgICBjb25zdCBub2RlID0gdGVybU5vZGUsICAvLy9cbiAgICAgICAgICB0ZXJtID0gbmV3IFRlcm0obm9kZSwgdHlwZSk7XG5cbiAgICByZXR1cm4gdGVybTtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIlRlcm0iLCJ2YXJpYWJsZU5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5Iiwibm9kZSIsInR5cGUiLCJnZXROb2RlIiwiZ2V0VHlwZSIsIm1hdGNoIiwidGVybSIsIm1hdGNoZXMiLCJnZXRWYXJpYWJsZXMiLCJjb250ZXh0IiwidmFyaWFibGVzIiwidmFyaWFibGVOb2RlcyIsImZvckVhY2giLCJ2YXJpYWJsZU5vZGUiLCJ2YXJpYWJsZSIsImZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOb2RlIiwidmFyaWFibGVzSW5jbHVkZXNWYXJpYWJsZSIsImluY2x1ZGVzIiwicHVzaCIsImlzR3JvdW5kZWQiLCJkZWZpbmVkVmFyaWFibGVzIiwiZmlsdGVyIiwiZGVmaW5lZFZhcmlhYmxlc0luY2x1ZGVzVmFyaWFibGUiLCJ1bmRlZmluZWRWYXJpYWJsZXMiLCJ1bmRlZmluZWRWYXJpYWJsZXNMZW5ndGgiLCJsZW5ndGgiLCJncm91bmRlZCIsImlzSW5pdGlhbGx5R3JvdW5kZWQiLCJ2YXJpYWJsZXNMZW5ndGgiLCJpbml0aWFsbHlHcm91bmRlZCIsImlzSW1wbGljaXRseUdyb3VuZGVkIiwiaW1wbGljaXRseUdyb3VuZGVkIiwiZnJvbVRlcm1Ob2RlQW5kVHlwZSIsInRlcm1Ob2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU9xQkE7OztxQkFMRTtxQkFDSTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFM0IsSUFBTUMscUJBQXFCQyxJQUFBQSxpQkFBVSxFQUFDO0FBRXZCLElBQUEsQUFBTUYscUJBQUQsQUFBTDthQUFNQSxLQUNQRyxJQUFJLEVBQUVDLElBQUk7Z0NBREhKO1FBRWpCLElBQUksQ0FBQ0csSUFBSSxHQUFHQTtRQUNaLElBQUksQ0FBQ0MsSUFBSSxHQUFHQTs7a0JBSEtKOztZQU1uQkssS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRixJQUFJO1lBQ2xCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRixJQUFJO1lBQ2xCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLE1BQU1DLElBQUk7Z0JBQ1IsSUFBTUwsT0FBT0ssS0FBS0gsT0FBTyxJQUNuQkksVUFBVSxJQUFJLENBQUNOLElBQUksQ0FBQ0ksS0FBSyxDQUFDSjtnQkFFaEMsT0FBT007WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSxhQUFhQyxPQUFPO2dCQUNsQixJQUFNQyxZQUFZLEVBQUUsRUFDZEMsZ0JBQWdCWixtQkFBbUIsSUFBSSxDQUFDRSxJQUFJO2dCQUVsRFUsY0FBY0MsT0FBTyxDQUFDLFNBQUNDO29CQUNyQixJQUFNQyxXQUFXTCxRQUFRTSwwQkFBMEIsQ0FBQ0YsZUFDOUNHLDRCQUE0Qk4sVUFBVU8sUUFBUSxDQUFDSDtvQkFFckQsSUFBSSxDQUFDRSwyQkFBMkI7d0JBQzlCTixVQUFVUSxJQUFJLENBQUNKO29CQUNqQjtnQkFDRjtnQkFFQSxPQUFPSjtZQUNUOzs7WUFFQVMsS0FBQUE7bUJBQUFBLFNBQUFBLFdBQVdDLGdCQUFnQixFQUFFWCxPQUFPO2dCQUNsQyxJQUFNQyxZQUFZLElBQUksQ0FBQ0YsWUFBWSxDQUFDQztnQkFFcENZLElBQUFBLGFBQU0sRUFBQ1gsV0FBVyxTQUFDSTtvQkFDakIsSUFBTVEsbUNBQW1DRixpQkFBaUJILFFBQVEsQ0FBQ0g7b0JBRW5FLElBQUksQ0FBQ1Esa0NBQWtDO3dCQUNyQyxPQUFPO29CQUNUO2dCQUNGO2dCQUVBLElBQU1DLHFCQUFxQmIsV0FDckJjLDJCQUEyQkQsbUJBQW1CRSxNQUFNLEVBQ3BEQyxXQUFZRiw0QkFBNEI7Z0JBRTlDLE9BQU9FO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsb0JBQW9CbEIsT0FBTztnQkFDekIsSUFBTUMsWUFBWSxJQUFJLENBQUNGLFlBQVksQ0FBQ0MsVUFDOUJtQixrQkFBa0JsQixVQUFVZSxNQUFNLEVBQ2xDSSxvQkFBcUJELG9CQUFvQjtnQkFFL0MsT0FBT0M7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSxxQkFBcUJWLGdCQUFnQixFQUFFWCxPQUFPO2dCQUM1QyxJQUFNaUIsV0FBVyxJQUFJLENBQUNQLFVBQVUsQ0FBQ0Msa0JBQWtCWCxVQUM3Q3NCLHFCQUFxQkwsVUFBVyxHQUFHO2dCQUV6QyxPQUFPSztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLG9CQUFvQkMsUUFBUSxFQUFFL0IsSUFBSTtnQkFDdkMsSUFBTUQsT0FBT2dDLFVBQ1AzQixPQUFPLElBeEVJUixLQXdFS0csTUFBTUM7Z0JBRTVCLE9BQU9JO1lBQ1Q7OztXQTNFbUJSIn0=

package/lib/utilities/array.js

@@ -67,6 +67,16 @@ function someSubArray(array, subArrayLength, callback) {
             offset = 0;
             permutations = _permutationsMatrix.default[indexesLength][permutationLength];
         }
+        if (subArrayLength === 4) {
+            permutations = [
+                [
+                    0,
+                    2,
+                    3,
+                    4
+                ]
+            ];
+        }
         if (permutations !== null) {
             found = permutations.some(function(permutation) {
                 if (permutation !== null) {
@@ -102,4 +112,4 @@ function rightDifference(arrayA, arrayB) {
     });
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYXJyYXkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgcGVybXV0YXRpb25zTWF0cml4IGZyb20gXCIuLi9wZXJtdXRhdGlvbnNNYXRyaXhcIjtcblxuaW1wb3J0IHsgTUFYSU1VTV9JTkRFWEVTX0xFTkdUSCwgTUFYSU1VTV9QRVJNVVRBVElPTl9MRU5HVEggfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5cbmV4cG9ydCBjb25zdCB7IGZpcnN0LCBzZWNvbmQsIGxhc3QsIHB1c2gsIHBydW5lLCBtYXRjaCwgZmlsdGVyLCBjb21wcmVzcywgc2VwYXJhdGUgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gc29tZVN1YkFycmF5KGFycmF5LCBzdWJBcnJheUxlbmd0aCwgY2FsbGJhY2spIHtcbiAgbGV0IGZvdW5kID0gZmFsc2U7XG5cbiAgY29uc3QgYXJyYXlMZW5ndGggPSBhcnJheS5sZW5ndGgsXG4gICAgICAgIGluZGV4ZXNMZW5ndGggPSBhcnJheUxlbmd0aCwgLy8vXG4gICAgICAgIHBlcm11dGF0aW9uTGVuZ3RoID0gc3ViQXJyYXlMZW5ndGg7IC8vL1xuXG4gIGlmIChwZXJtdXRhdGlvbkxlbmd0aCA8PSBNQVhJTVVNX1BFUk1VVEFUSU9OX0xFTkdUSCkge1xuICAgIGxldCBvZmZzZXQsXG4gICAgICAgIHBlcm11dGF0aW9ucztcblxuICAgIGlmIChpbmRleGVzTGVuZ3RoID4gTUFYSU1VTV9JTkRFWEVTX0xFTkdUSCkge1xuICAgICAgb2Zmc2V0ID0gaW5kZXhlc0xlbmd0aCAtIE1BWElNVU1fSU5ERVhFU19MRU5HVEg7XG5cbiAgICAgIHBlcm11dGF0aW9ucyA9IHBlcm11dGF0aW9uc01hdHJpeFtNQVhJTVVNX0lOREVYRVNfTEVOR1RIXVtwZXJtdXRhdGlvbkxlbmd0aF07XG4gICAgfSBlbHNlIHtcbiAgICAgIG9mZnNldCA9IDA7XG5cbiAgICAgIHBlcm11dGF0aW9ucyA9IHBlcm11dGF0aW9uc01hdHJpeFtpbmRleGVzTGVuZ3RoXVtwZXJtdXRhdGlvbkxlbmd0aF07XG4gICAgfVxuXG4gICAgaWYgKHBlcm11dGF0aW9ucyAhPT0gbnVsbCkge1xuICAgICAgZm91bmQgPSBwZXJtdXRhdGlvbnMuc29tZSgocGVybXV0YXRpb24pID0+IHtcbiAgICAgICAgaWYgKHBlcm11dGF0aW9uICE9PSBudWxsKSB7XG4gICAgICAgICAgY29uc3Qgc3ViQXJyYXkgPSBbXTtcblxuICAgICAgICAgIGZvciAobGV0IHBvc2l0aW9uID0gMDsgcG9zaXRpb24gPCBwZXJtdXRhdGlvbkxlbmd0aDsgcG9zaXRpb24rKykge1xuICAgICAgICAgICAgY29uc3QgaW5kZXggPSBwZXJtdXRhdGlvbltwb3NpdGlvbl0gKyBvZmZzZXQsXG4gICAgICAgICAgICAgICAgICBlbGVtZW50ID0gYXJyYXlbaW5kZXhdO1xuXG4gICAgICAgICAgICBzdWJBcnJheS5wdXNoKGVsZW1lbnQpO1xuICAgICAgICAgIH1cblxuICAgICAgICAgIGNvbnN0IHBhc3NlZCA9IGNhbGxiYWNrKHN1YkFycmF5KTtcblxuICAgICAgICAgIGlmIChwYXNzZWQpIHtcbiAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIGZvdW5kO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbGVmdERpZmZlcmVuY2UoYXJyYXlBLCBhcnJheUIpIHtcbiAgZmlsdGVyKGFycmF5QSwgKGVsZW1lbnRBKSA9PiB7XG4gICAgY29uc3QgYXJyYXlCSW5jbHVkZXNFbGVtZW50QSA9IGFycmF5Qi5pbmNsdWRlcyhlbGVtZW50QSk7XG5cbiAgICBpZiAoIWFycmF5QkluY2x1ZGVzRWxlbWVudEEpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiByaWdodERpZmZlcmVuY2UoYXJyYXlBLCBhcnJheUIpIHtcbiAgZmlsdGVyKGFycmF5QiwgKGVsZW1lbnRCKSA9PiB7XG4gICAgY29uc3QgYXJyYXlBSW5jbHVkZXNFbGVtZW50QiA9IGFycmF5QS5pbmNsdWRlcyhlbGVtZW50Qik7XG5cbiAgICBpZiAoIWFycmF5QUluY2x1ZGVzRWxlbWVudEIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG4iXSwibmFtZXMiOlsiY29tcHJlc3MiLCJmaWx0ZXIiLCJmaXJzdCIsImxhc3QiLCJsZWZ0RGlmZmVyZW5jZSIsIm1hdGNoIiwicHJ1bmUiLCJwdXNoIiwicmlnaHREaWZmZXJlbmNlIiwic2Vjb25kIiwic2VwYXJhdGUiLCJzb21lU3ViQXJyYXkiLCJhcnJheVV0aWxpdGllcyIsImFycmF5Iiwic3ViQXJyYXlMZW5ndGgiLCJjYWxsYmFjayIsImZvdW5kIiwiYXJyYXlMZW5ndGgiLCJsZW5ndGgiLCJpbmRleGVzTGVuZ3RoIiwicGVybXV0YXRpb25MZW5ndGgiLCJNQVhJTVVNX1BFUk1VVEFUSU9OX0xFTkdUSCIsIm9mZnNldCIsInBlcm11dGF0aW9ucyIsIk1BWElNVU1fSU5ERVhFU19MRU5HVEgiLCJwZXJtdXRhdGlvbnNNYXRyaXgiLCJzb21lIiwicGVybXV0YXRpb24iLCJzdWJBcnJheSIsInBvc2l0aW9uIiwiaW5kZXgiLCJlbGVtZW50IiwicGFzc2VkIiwiYXJyYXlBIiwiYXJyYXlCIiwiZWxlbWVudEEiLCJhcnJheUJJbmNsdWRlc0VsZW1lbnRBIiwiaW5jbHVkZXMiLCJlbGVtZW50QiIsImFycmF5QUluY2x1ZGVzRWxlbWVudEIiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQVFnRUEsUUFBUTtlQUFSQTs7SUFBUkMsTUFBTTtlQUFOQTs7SUFBekNDLEtBQUs7ZUFBTEE7O0lBQWVDLElBQUk7ZUFBSkE7O0lBZ0RkQyxjQUFjO2VBQWRBOztJQWhEaUNDLEtBQUs7ZUFBTEE7O0lBQVBDLEtBQUs7ZUFBTEE7O0lBQU5DLElBQUk7ZUFBSkE7O0lBMERwQkMsZUFBZTtlQUFmQTs7SUExRE1DLE1BQU07ZUFBTkE7O0lBQW9EQyxRQUFRO2VBQVJBOztJQUUxREMsWUFBWTtlQUFaQTs7O3lCQVJlO3lFQUVBO3lCQUVvQzs7Ozs7O0FBRTVELElBQVFULFFBQXdFVSx5QkFBYyxDQUF0RlYsT0FBT08sU0FBaUVHLHlCQUFjLENBQS9FSCxRQUFRTixPQUF5RFMseUJBQWMsQ0FBdkVULE1BQU1JLE9BQW1ESyx5QkFBYyxDQUFqRUwsTUFBTUQsUUFBNkNNLHlCQUFjLENBQTNETixPQUFPRCxRQUFzQ08seUJBQWMsQ0FBcERQLE9BQU9KLFNBQStCVyx5QkFBYyxDQUE3Q1gsUUFBUUQsV0FBdUJZLHlCQUFjLENBQXJDWixVQUFVVSxXQUFhRSx5QkFBYyxDQUEzQkY7QUFFbkUsU0FBU0MsYUFBYUUsS0FBSyxFQUFFQyxjQUFjLEVBQUVDLFFBQVE7SUFDMUQsSUFBSUMsUUFBUTtJQUVaLElBQU1DLGNBQWNKLE1BQU1LLE1BQU0sRUFDMUJDLGdCQUFnQkYsYUFDaEJHLG9CQUFvQk4sZ0JBQWdCLEdBQUc7SUFFN0MsSUFBSU0scUJBQXFCQyxxQ0FBMEIsRUFBRTtRQUNuRCxJQUFJQyxRQUNBQztRQUVKLElBQUlKLGdCQUFnQkssaUNBQXNCLEVBQUU7WUFDMUNGLFNBQVNILGdCQUFnQkssaUNBQXNCO1lBRS9DRCxlQUFlRSwyQkFBa0IsQ0FBQ0QsaUNBQXNCLENBQUMsQ0FBQ0osa0JBQWtCO1FBQzlFLE9BQU87WUFDTEUsU0FBUztZQUVUQyxlQUFlRSwyQkFBa0IsQ0FBQ04sY0FBYyxDQUFDQyxrQkFBa0I7UUFDckU7UUFFQSxJQUFJRyxpQkFBaUIsTUFBTTtZQUN6QlAsUUFBUU8sYUFBYUcsSUFBSSxDQUFDLFNBQUNDO2dCQUN6QixJQUFJQSxnQkFBZ0IsTUFBTTtvQkFDeEIsSUFBTUMsV0FBVyxFQUFFO29CQUVuQixJQUFLLElBQUlDLFdBQVcsR0FBR0EsV0FBV1QsbUJBQW1CUyxXQUFZO3dCQUMvRCxJQUFNQyxRQUFRSCxXQUFXLENBQUNFLFNBQVMsR0FBR1AsUUFDaENTLFVBQVVsQixLQUFLLENBQUNpQixNQUFNO3dCQUU1QkYsU0FBU3JCLElBQUksQ0FBQ3dCO29CQUNoQjtvQkFFQSxJQUFNQyxTQUFTakIsU0FBU2E7b0JBRXhCLElBQUlJLFFBQVE7d0JBQ1YsT0FBTztvQkFDVDtnQkFDRjtZQUNGO1FBQ0Y7SUFDRjtJQUVBLE9BQU9oQjtBQUNUO0FBRU8sU0FBU1osZUFBZTZCLE1BQU0sRUFBRUMsTUFBTTtJQUMzQ2pDLE9BQU9nQyxRQUFRLFNBQUNFO1FBQ2QsSUFBTUMseUJBQXlCRixPQUFPRyxRQUFRLENBQUNGO1FBRS9DLElBQUksQ0FBQ0Msd0JBQXdCO1lBQzNCLE9BQU87UUFDVDtJQUNGO0FBQ0Y7QUFFTyxTQUFTNUIsZ0JBQWdCeUIsTUFBTSxFQUFFQyxNQUFNO0lBQzVDakMsT0FBT2lDLFFBQVEsU0FBQ0k7UUFDZCxJQUFNQyx5QkFBeUJOLE9BQU9JLFFBQVEsQ0FBQ0M7UUFFL0MsSUFBSSxDQUFDQyx3QkFBd0I7WUFDM0IsT0FBTztRQUNUO0lBQ0Y7QUFDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYXJyYXkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgcGVybXV0YXRpb25zTWF0cml4IGZyb20gXCIuLi9wZXJtdXRhdGlvbnNNYXRyaXhcIjtcblxuaW1wb3J0IHsgTUFYSU1VTV9JTkRFWEVTX0xFTkdUSCwgTUFYSU1VTV9QRVJNVVRBVElPTl9MRU5HVEggfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5cbmV4cG9ydCBjb25zdCB7IGZpcnN0LCBzZWNvbmQsIGxhc3QsIHB1c2gsIHBydW5lLCBtYXRjaCwgZmlsdGVyLCBjb21wcmVzcywgc2VwYXJhdGUgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gc29tZVN1YkFycmF5KGFycmF5LCBzdWJBcnJheUxlbmd0aCwgY2FsbGJhY2spIHtcbiAgbGV0IGZvdW5kID0gZmFsc2U7XG5cbiAgY29uc3QgYXJyYXlMZW5ndGggPSBhcnJheS5sZW5ndGgsXG4gICAgICAgIGluZGV4ZXNMZW5ndGggPSBhcnJheUxlbmd0aCwgLy8vXG4gICAgICAgIHBlcm11dGF0aW9uTGVuZ3RoID0gc3ViQXJyYXlMZW5ndGg7IC8vL1xuXG4gIGlmIChwZXJtdXRhdGlvbkxlbmd0aCA8PSBNQVhJTVVNX1BFUk1VVEFUSU9OX0xFTkdUSCkge1xuICAgIGxldCBvZmZzZXQsXG4gICAgICAgIHBlcm11dGF0aW9ucztcblxuICAgIGlmIChpbmRleGVzTGVuZ3RoID4gTUFYSU1VTV9JTkRFWEVTX0xFTkdUSCkge1xuICAgICAgb2Zmc2V0ID0gaW5kZXhlc0xlbmd0aCAtIE1BWElNVU1fSU5ERVhFU19MRU5HVEg7XG5cbiAgICAgIHBlcm11dGF0aW9ucyA9IHBlcm11dGF0aW9uc01hdHJpeFtNQVhJTVVNX0lOREVYRVNfTEVOR1RIXVtwZXJtdXRhdGlvbkxlbmd0aF07XG4gICAgfSBlbHNlIHtcbiAgICAgIG9mZnNldCA9IDA7XG5cbiAgICAgIHBlcm11dGF0aW9ucyA9IHBlcm11dGF0aW9uc01hdHJpeFtpbmRleGVzTGVuZ3RoXVtwZXJtdXRhdGlvbkxlbmd0aF07XG4gICAgfVxuXG4gICAgaWYgKHN1YkFycmF5TGVuZ3RoID09PSA0KSB7XG4gICAgICBwZXJtdXRhdGlvbnMgPSBbXG4gICAgICAgIFsgMCwgMiwgMywgNCBdXG4gICAgICBdO1xuICAgIH1cblxuICAgIGlmIChwZXJtdXRhdGlvbnMgIT09IG51bGwpIHtcbiAgICAgIGZvdW5kID0gcGVybXV0YXRpb25zLnNvbWUoKHBlcm11dGF0aW9uKSA9PiB7XG4gICAgICAgIGlmIChwZXJtdXRhdGlvbiAhPT0gbnVsbCkge1xuICAgICAgICAgIGNvbnN0IHN1YkFycmF5ID0gW107XG5cbiAgICAgICAgICBmb3IgKGxldCBwb3NpdGlvbiA9IDA7IHBvc2l0aW9uIDwgcGVybXV0YXRpb25MZW5ndGg7IHBvc2l0aW9uKyspIHtcbiAgICAgICAgICAgIGNvbnN0IGluZGV4ID0gcGVybXV0YXRpb25bcG9zaXRpb25dICsgb2Zmc2V0LFxuICAgICAgICAgICAgICAgICAgZWxlbWVudCA9IGFycmF5W2luZGV4XTtcblxuICAgICAgICAgICAgc3ViQXJyYXkucHVzaChlbGVtZW50KTtcbiAgICAgICAgICB9XG5cbiAgICAgICAgICBjb25zdCBwYXNzZWQgPSBjYWxsYmFjayhzdWJBcnJheSk7XG5cbiAgICAgICAgICBpZiAocGFzc2VkKSB7XG4gICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBmb3VuZDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGxlZnREaWZmZXJlbmNlKGFycmF5QSwgYXJyYXlCKSB7XG4gIGZpbHRlcihhcnJheUEsIChlbGVtZW50QSkgPT4ge1xuICAgIGNvbnN0IGFycmF5QkluY2x1ZGVzRWxlbWVudEEgPSBhcnJheUIuaW5jbHVkZXMoZWxlbWVudEEpO1xuXG4gICAgaWYgKCFhcnJheUJJbmNsdWRlc0VsZW1lbnRBKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gcmlnaHREaWZmZXJlbmNlKGFycmF5QSwgYXJyYXlCKSB7XG4gIGZpbHRlcihhcnJheUIsIChlbGVtZW50QikgPT4ge1xuICAgIGNvbnN0IGFycmF5QUluY2x1ZGVzRWxlbWVudEIgPSBhcnJheUEuaW5jbHVkZXMoZWxlbWVudEIpO1xuXG4gICAgaWYgKCFhcnJheUFJbmNsdWRlc0VsZW1lbnRCKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xufVxuIl0sIm5hbWVzIjpbImNvbXByZXNzIiwiZmlsdGVyIiwiZmlyc3QiLCJsYXN0IiwibGVmdERpZmZlcmVuY2UiLCJtYXRjaCIsInBydW5lIiwicHVzaCIsInJpZ2h0RGlmZmVyZW5jZSIsInNlY29uZCIsInNlcGFyYXRlIiwic29tZVN1YkFycmF5IiwiYXJyYXlVdGlsaXRpZXMiLCJhcnJheSIsInN1YkFycmF5TGVuZ3RoIiwiY2FsbGJhY2siLCJmb3VuZCIsImFycmF5TGVuZ3RoIiwibGVuZ3RoIiwiaW5kZXhlc0xlbmd0aCIsInBlcm11dGF0aW9uTGVuZ3RoIiwiTUFYSU1VTV9QRVJNVVRBVElPTl9MRU5HVEgiLCJvZmZzZXQiLCJwZXJtdXRhdGlvbnMiLCJNQVhJTVVNX0lOREVYRVNfTEVOR1RIIiwicGVybXV0YXRpb25zTWF0cml4Iiwic29tZSIsInBlcm11dGF0aW9uIiwic3ViQXJyYXkiLCJwb3NpdGlvbiIsImluZGV4IiwiZWxlbWVudCIsInBhc3NlZCIsImFycmF5QSIsImFycmF5QiIsImVsZW1lbnRBIiwiYXJyYXlCSW5jbHVkZXNFbGVtZW50QSIsImluY2x1ZGVzIiwiZWxlbWVudEIiLCJhcnJheUFJbmNsdWRlc0VsZW1lbnRCIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFR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

package/lib/utilities/equivalences.js

@@ -12,26 +12,17 @@ _export(exports, {
     areTermNodesEqual: function() {
         return areTermNodesEqual;
     },
-    compressDefinedVariables: function() {
-        return compressDefinedVariables;
-    },
-    definedVariablesFromGroundedEquivalences: function() {
-        return definedVariablesFromGroundedEquivalences;
-    },
     findEquivalenceByTerm: function() {
         return findEquivalenceByTerm;
     },
     findEquivalenceByType: function() {
         return findEquivalenceByType;
     },
-    implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables: function() {
-        return implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables;
+    groundedTermsAndDefinedVariablesFromFromEquivalences: function() {
+        return groundedTermsAndDefinedVariablesFromFromEquivalences;
     },
     mergeEquivalences: function() {
         return mergeEquivalences;
-    },
-    separateEquivalences: function() {
-        return separateEquivalences;
     }
 });
 var _array = require("../utilities/array");
@@ -60,6 +51,28 @@ 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);
 }
+function mergeEquivalences(equivalencesA, equivalencesB, localContext) {
+    var typesA = typesFromEquivalences(equivalencesA, localContext), typesB = typesFromEquivalences(equivalencesB, localContext), types = _to_consumable_array(typesA).concat(_to_consumable_array(typesB));
+    (0, _array.compress)(types, function(typeA, typeB) {
+        if (typeA === typeB) {
+            return true;
+        }
+    });
+    var equivalences = types.map(function(type) {
+        var equivalence;
+        var equivalenceA = findEquivalenceByType(equivalencesA, type, localContext), equivalenceB = findEquivalenceByType(equivalencesB, type, localContext);
+        if (equivalenceA !== null && equivalenceB !== null) {
+            var leftEquivalence = equivalenceA, rightEquivalence = equivalenceB; ///
+            equivalence = Equivalence.merge(leftEquivalence, rightEquivalence);
+        } else if (equivalenceA !== null) {
+            equivalence = equivalenceA; ///
+        } else if (equivalenceB !== null) {
+            equivalence = equivalenceB; ///
+        }
+        return equivalence;
+    });
+    return equivalences;
+}
 function areTermNodesEqual(leftTermNode, rightTermNode, equivalences) {
     var termNodesEqual;
     var leftTermNodeMatchesRightTermNode = leftTermNode.match(rightTermNode);
@@ -92,78 +105,81 @@ function findEquivalenceByTerm(equivalences, term) {
     }) || null;
     return equivalence;
 }
-function mergeEquivalences(equivalencesA, equivalencesB, localContext) {
-    var typesA = typesFromEquivalences(equivalencesA, localContext), typesB = typesFromEquivalences(equivalencesB, localContext), types = _to_consumable_array(typesA).concat(_to_consumable_array(typesB));
-    (0, _array.compress)(types, function(typeA, typeB) {
-        if (typeA === typeB) {
-            return true;
+function groundedTermsAndDefinedVariablesFromFromEquivalences(equivalences, groundedTerms, definedVariables, context) {
+    var groundedEquivalences, remainingEquivalences, initiallyGroundedEquivalences, implicitlyGroundedEquivalences;
+    remainingEquivalences = [];
+    initiallyGroundedEquivalences = [];
+    separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context);
+    var initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.length;
+    if (initiallyGroundedEquivalencesLength > 0) {
+        groundedEquivalences = initiallyGroundedEquivalences; ///
+        var implicitlyGroundedEquivalencesLength = 1;
+        while(implicitlyGroundedEquivalencesLength > 0){
+            var definedVariablesLength = 0, previousDefinedVariablesLength = -1;
+            while(definedVariablesLength > previousDefinedVariablesLength){
+                previousDefinedVariablesLength = definedVariablesLength; ///
+                groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context);
+                definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context);
+                definedVariablesLength = definedVariables.length;
+            }
+            equivalences = remainingEquivalences; ///
+            remainingEquivalences = [];
+            implicitlyGroundedEquivalences = [];
+            separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context);
+            (0, _array.push)(groundedEquivalences, implicitlyGroundedEquivalences);
+            implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.length; ///
         }
-    });
-    var equivalences = types.map(function(type) {
-        var equivalence;
-        var equivalenceA = findEquivalenceByType(equivalencesA, type, localContext), equivalenceB = findEquivalenceByType(equivalencesB, type, localContext);
-        if (equivalenceA !== null && equivalenceB !== null) {
-            var leftEquivalence = equivalenceA, rightEquivalence = equivalenceB; ///
-            equivalence = Equivalence.merge(leftEquivalence, rightEquivalence);
-        } else if (equivalenceA !== null) {
-            equivalence = equivalenceA; ///
-        } else if (equivalenceB !== null) {
-            equivalence = equivalenceB; ///
-        }
-        return equivalence;
-    });
-    return equivalences;
+    }
 }
-function separateEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences) {
-    (0, _array.separate)(equivalences, remainingEquivalences, initiallyGroundedEquivalences, function(equivalence) {
-        var equivalenceInitiallyGrounded = equivalence.isInitiallyGrounded();
-        if (!equivalenceInitiallyGrounded) {
-            return true;
-        }
+function typesFromEquivalences(equivalences, localContext) {
+    var types = equivalences.map(function(equivalence) {
+        var type = equivalence.getType(localContext);
+        return type;
     });
+    return types;
 }
-function compressDefinedVariables(definedVariables) {
-    (0, _array.compress)(definedVariables, function(definedVariableA, definedVariableB) {
-        if (definedVariableA === definedVariableB) {
+function findEquivalenceByTermNodes(equivalences, termNodes) {
+    var equivalence = equivalences.find(function(equivalence) {
+        var equivalenceMatchesTerms = equivalence.matchTermNodes(termNodes);
+        if (equivalenceMatchesTerms) {
             return true;
         }
-    });
+    }) || null;
+    return equivalence;
 }
-function definedVariablesFromGroundedEquivalences(groundedEquivalences, definedVariables, context) {
-    groundedEquivalences.forEach(function(groundedEquivalence) {
-        var variables = groundedEquivalence.getVariables(context);
-        (0, _array.push)(definedVariables, variables);
+function definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context) {
+    var terms = groundedTerms, variables = definedVariables; ///
+    terms.forEach(function(term) {
+        var termVariables = term.getVariables(context);
+        termVariables.forEach(function(termVariable) {
+            var variablesIncludesTermVariable = variables.includes(termVariable);
+            if (!variablesIncludesTermVariable) {
+                var variable = termVariable; ///
+                variables.push(variable);
+            }
+        });
     });
 }
-function implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables(remainingEquivalences, definedVariables) {
-    var implicitlyGroundedEquivalences = [];
-    (0, _array.filter)(remainingEquivalences, function(remainingEquivalence) {
-        var remainingEquivalenceImplicitlyGrounded = remainingEquivalence.isImplicitlyGrounded(definedVariables);
-        if (remainingEquivalenceImplicitlyGrounded) {
-            var implicitlyGroundedEquivalence = remainingEquivalence; ///
-            implicitlyGroundedEquivalences.push(implicitlyGroundedEquivalence);
-        }
-        if (!remainingEquivalenceImplicitlyGrounded) {
+function separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context) {
+    (0, _array.separate)(equivalences, remainingEquivalences, initiallyGroundedEquivalences, function(equivalence) {
+        var equivalenceInitiallyGrounded = equivalence.isInitiallyGrounded(context);
+        if (!equivalenceInitiallyGrounded) {
             return true;
         }
     });
-    return implicitlyGroundedEquivalences;
 }
-function findEquivalenceByTermNodes(equivalences, termNodes) {
-    var equivalence = equivalences.find(function(equivalence) {
-        var equivalenceMatchesTerms = equivalence.matchTermNodes(termNodes);
-        if (equivalenceMatchesTerms) {
+function separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context) {
+    (0, _array.separate)(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, function(equivalence) {
+        var equivalenceImplicitlyGrounded = equivalence.isImplicitlyGrounded(definedVariables, context);
+        if (!equivalenceImplicitlyGrounded) {
             return true;
         }
-    }) || null;
-    return equivalence;
+    });
 }
-function typesFromEquivalences(equivalences, localContext) {
-    var types = equivalences.map(function(equivalence) {
-        var type = equivalence.getType(localContext);
-        return type;
+function groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context) {
+    groundedEquivalences.forEach(function(groundedEquivalence) {
+        groundedEquivalence.getGroundedTerms(definedVariables, groundedTerms, context);
     });
-    return types;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/equivalences.js"],"sourcesContent":["\"use strict\";\n\nimport { push, filter, compress, separate } from \"../utilities/array\";\n\nexport function areTermNodesEqual(leftTermNode, rightTermNode, equivalences) {\n  let termNodesEqual;\n\n  const leftTermNodeMatchesRightTermNode = leftTermNode.match(rightTermNode);\n\n  if (leftTermNodeMatchesRightTermNode) {\n    termNodesEqual = true;\n  } else {\n    const termNodes = [\n            leftTermNode,\n            rightTermNode\n          ],\n          equivalence = findEquivalenceByTermNodes(equivalences, termNodes);\n\n    termNodesEqual = (equivalence !== null);\n  }\n\n  return termNodesEqual;\n}\n\nexport function findEquivalenceByType(equivalences, type, localContext) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceMatchesType = equivalence.matchType(type, localContext);\n\n    if (equivalenceMatchesType) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function findEquivalenceByTerm(equivalences, term) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceMatchesTerm = equivalence.matchTerm(term);\n\n    if (equivalenceMatchesTerm) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function mergeEquivalences(equivalencesA, equivalencesB, localContext) {\n  const typesA = typesFromEquivalences(equivalencesA, localContext),\n        typesB = typesFromEquivalences(equivalencesB, localContext),\n        types = [\n          ...typesA,\n          ...typesB\n        ];\n\n  compress(types, (typeA, typeB) => {\n    if (typeA === typeB) {\n      return true;\n    }\n  });\n\n  const equivalences = types.map((type) => {\n    let equivalence;\n\n    const equivalenceA = findEquivalenceByType(equivalencesA, type, localContext),\n          equivalenceB = findEquivalenceByType(equivalencesB, type, localContext);\n\n    if ((equivalenceA !== null) && (equivalenceB !== null)) {\n      const leftEquivalence = equivalenceA, ///\n            rightEquivalence = equivalenceB;  ///\n\n      equivalence = Equivalence.merge(leftEquivalence, rightEquivalence);\n    } else if (equivalenceA !== null) {\n      equivalence = equivalenceA; ///\n    } else if (equivalenceB !== null) {\n      equivalence = equivalenceB; ///\n    }\n\n    return equivalence;\n  });\n\n  return equivalences;\n}\n\nexport function separateEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences) {\n  separate(equivalences, remainingEquivalences, initiallyGroundedEquivalences, (equivalence) => {\n    const equivalenceInitiallyGrounded = equivalence.isInitiallyGrounded();\n\n    if (!equivalenceInitiallyGrounded) {\n      return true;\n    }\n  });\n}\n\nexport function compressDefinedVariables(definedVariables) {\n  compress(definedVariables, (definedVariableA, definedVariableB) => {\n    if (definedVariableA === definedVariableB) {\n      return true;\n    }\n  });\n}\n\nexport function definedVariablesFromGroundedEquivalences(groundedEquivalences, definedVariables, context) {\n  groundedEquivalences.forEach((groundedEquivalence) => {\n    const variables = groundedEquivalence.getVariables(context);\n\n    push(definedVariables, variables);\n  });\n}\n\nexport function implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables(remainingEquivalences, definedVariables) {\n  const implicitlyGroundedEquivalences = [];\n\n  filter(remainingEquivalences, (remainingEquivalence) => {\n    const remainingEquivalenceImplicitlyGrounded = remainingEquivalence.isImplicitlyGrounded(definedVariables);\n\n    if (remainingEquivalenceImplicitlyGrounded) {\n      const implicitlyGroundedEquivalence = remainingEquivalence; ///\n\n      implicitlyGroundedEquivalences.push(implicitlyGroundedEquivalence);\n    }\n\n    if (!remainingEquivalenceImplicitlyGrounded) {\n      return true;\n    }\n  });\n\n  return implicitlyGroundedEquivalences;\n}\n\nfunction findEquivalenceByTermNodes(equivalences, termNodes) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceMatchesTerms = equivalence.matchTermNodes(termNodes);\n\n    if (equivalenceMatchesTerms) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nfunction typesFromEquivalences(equivalences, localContext) {\n  const types = equivalences.map((equivalence) => {\n    const type = equivalence.getType(localContext);\n\n    return type;\n  });\n\n  return types;\n}\n"],"names":["areTermNodesEqual","compressDefinedVariables","definedVariablesFromGroundedEquivalences","findEquivalenceByTerm","findEquivalenceByType","implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables","mergeEquivalences","separateEquivalences","leftTermNode","rightTermNode","equivalences","termNodesEqual","leftTermNodeMatchesRightTermNode","match","termNodes","equivalence","findEquivalenceByTermNodes","type","localContext","find","equivalenceMatchesType","matchType","term","equivalenceMatchesTerm","matchTerm","equivalencesA","equivalencesB","typesA","typesFromEquivalences","typesB","types","compress","typeA","typeB","map","equivalenceA","equivalenceB","leftEquivalence","rightEquivalence","Equivalence","merge","remainingEquivalences","initiallyGroundedEquivalences","separate","equivalenceInitiallyGrounded","isInitiallyGrounded","definedVariables","definedVariableA","definedVariableB","groundedEquivalences","context","forEach","groundedEquivalence","variables","getVariables","push","implicitlyGroundedEquivalences","filter","remainingEquivalence","remainingEquivalenceImplicitlyGrounded","isImplicitlyGrounded","implicitlyGroundedEquivalence","equivalenceMatchesTerms","matchTermNodes","getType"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/equivalences.js"],"sourcesContent":["\"use strict\";\n\nimport { push, compress, separate } from \"../utilities/array\";\n\nexport function mergeEquivalences(equivalencesA, equivalencesB, localContext) {\n  const typesA = typesFromEquivalences(equivalencesA, localContext),\n        typesB = typesFromEquivalences(equivalencesB, localContext),\n        types = [\n          ...typesA,\n          ...typesB\n        ];\n\n  compress(types, (typeA, typeB) => {\n    if (typeA === typeB) {\n      return true;\n    }\n  });\n\n  const equivalences = types.map((type) => {\n    let equivalence;\n\n    const equivalenceA = findEquivalenceByType(equivalencesA, type, localContext),\n          equivalenceB = findEquivalenceByType(equivalencesB, type, localContext);\n\n    if ((equivalenceA !== null) && (equivalenceB !== null)) {\n      const leftEquivalence = equivalenceA, ///\n            rightEquivalence = equivalenceB;  ///\n\n      equivalence = Equivalence.merge(leftEquivalence, rightEquivalence);\n    } else if (equivalenceA !== null) {\n      equivalence = equivalenceA; ///\n    } else if (equivalenceB !== null) {\n      equivalence = equivalenceB; ///\n    }\n\n    return equivalence;\n  });\n\n  return equivalences;\n}\n\nexport function areTermNodesEqual(leftTermNode, rightTermNode, equivalences) {\n  let termNodesEqual;\n\n  const leftTermNodeMatchesRightTermNode = leftTermNode.match(rightTermNode);\n\n  if (leftTermNodeMatchesRightTermNode) {\n    termNodesEqual = true;\n  } else {\n    const termNodes = [\n            leftTermNode,\n            rightTermNode\n          ],\n          equivalence = findEquivalenceByTermNodes(equivalences, termNodes);\n\n    termNodesEqual = (equivalence !== null);\n  }\n\n  return termNodesEqual;\n}\n\nexport function findEquivalenceByType(equivalences, type, localContext) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceMatchesType = equivalence.matchType(type, localContext);\n\n    if (equivalenceMatchesType) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function findEquivalenceByTerm(equivalences, term) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceMatchesTerm = equivalence.matchTerm(term);\n\n    if (equivalenceMatchesTerm) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function groundedTermsAndDefinedVariablesFromFromEquivalences(equivalences, groundedTerms, definedVariables, context) {\n  let groundedEquivalences,\n      remainingEquivalences,\n      initiallyGroundedEquivalences,\n      implicitlyGroundedEquivalences;\n\n  remainingEquivalences = [];\n\n  initiallyGroundedEquivalences = [];\n\n  separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context);\n\n  const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.length;\n\n  if (initiallyGroundedEquivalencesLength > 0) {\n    groundedEquivalences = initiallyGroundedEquivalences; ///\n\n    let implicitlyGroundedEquivalencesLength = 1;\n\n    while (implicitlyGroundedEquivalencesLength > 0) {\n      let definedVariablesLength = 0,\n          previousDefinedVariablesLength = -1;\n\n      while (definedVariablesLength > previousDefinedVariablesLength) {\n        previousDefinedVariablesLength = definedVariablesLength;  ///\n\n        groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context);\n\n        definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context);\n\n        definedVariablesLength = definedVariables.length;\n      }\n\n      equivalences = remainingEquivalences; ///\n\n      remainingEquivalences = [];\n\n      implicitlyGroundedEquivalences = [];\n\n      separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context);\n\n      push(groundedEquivalences, implicitlyGroundedEquivalences);\n\n      implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.length;  ///\n    }\n  }\n}\n\nfunction typesFromEquivalences(equivalences, localContext) {\n  const types = equivalences.map((equivalence) => {\n    const type = equivalence.getType(localContext);\n\n    return type;\n  });\n\n  return types;\n}\n\nfunction findEquivalenceByTermNodes(equivalences, termNodes) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceMatchesTerms = equivalence.matchTermNodes(termNodes);\n\n    if (equivalenceMatchesTerms) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nfunction definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context) {\n  const terms = groundedTerms,  ///\n        variables = definedVariables; ///\n\n  terms.forEach((term) => {\n    const termVariables = term.getVariables(context);\n\n    termVariables.forEach((termVariable) => {\n      const variablesIncludesTermVariable = variables.includes(termVariable);\n\n      if (!variablesIncludesTermVariable) {\n        const variable = termVariable;  ///\n\n        variables.push(variable);\n      }\n    });\n  });\n}\n\nfunction separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context) {\n  separate(equivalences, remainingEquivalences, initiallyGroundedEquivalences, (equivalence) => {\n    const equivalenceInitiallyGrounded = equivalence.isInitiallyGrounded(context);\n\n    if (!equivalenceInitiallyGrounded) {\n      return true;\n    }\n  });\n}\n\nfunction separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context) {\n  separate(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, (equivalence) => {\n    const equivalenceImplicitlyGrounded = equivalence.isImplicitlyGrounded(definedVariables, context);\n\n    if (!equivalenceImplicitlyGrounded) {\n      return true;\n    }\n  });\n}\n\nfunction groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context) {\n  groundedEquivalences.forEach((groundedEquivalence) => {\n    groundedEquivalence.getGroundedTerms(definedVariables, groundedTerms, context);\n  });\n}\n"],"names":["areTermNodesEqual","findEquivalenceByTerm","findEquivalenceByType","groundedTermsAndDefinedVariablesFromFromEquivalences","mergeEquivalences","equivalencesA","equivalencesB","localContext","typesA","typesFromEquivalences","typesB","types","compress","typeA","typeB","equivalences","map","type","equivalence","equivalenceA","equivalenceB","leftEquivalence","rightEquivalence","Equivalence","merge","leftTermNode","rightTermNode","termNodesEqual","leftTermNodeMatchesRightTermNode","match","termNodes","findEquivalenceByTermNodes","find","equivalenceMatchesType","matchType","term","equivalenceMatchesTerm","matchTerm","groundedTerms","definedVariables","context","groundedEquivalences","remainingEquivalences","initiallyGroundedEquivalences","implicitlyGroundedEquivalences","separateInitiallyGroundedEquivalences","initiallyGroundedEquivalencesLength","length","implicitlyGroundedEquivalencesLength","definedVariablesLength","previousDefinedVariablesLength","groundedTermsFromGroundedEquivalencesAndDefinedVariables","definedVariablesFromGroundedTerms","separateImplicitlyGroundedEquivalences","push","getType","equivalenceMatchesTerms","matchTermNodes","terms","variables","forEach","termVariables","getVariables","termVariable","variablesIncludesTermVariable","includes","variable","separate","equivalenceInitiallyGrounded","isInitiallyGrounded","equivalenceImplicitlyGrounded","isImplicitlyGrounded","groundedEquivalence","getGroundedTerms"],"mappings":"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"}

package/lib/verify/defining.js

@@ -8,25 +8,53 @@ Object.defineProperty(exports, "default", {
         return verifyDefining;
     }
 });
-var _array = require("../utilities/array");
+var _term = /*#__PURE__*/ _interop_require_default(require("./term"));
 var _constants = require("../constants");
 var _query = require("../utilities/query");
-var definedVariableNodeQuery = (0, _query.nodeQuery)("/argument/term/variable!");
+var _array = require("../utilities/array");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+var termNodeQuery = (0, _query.nodeQuery)("/argument/term!"), variableNodeQuery = (0, _query.nodeQuery)("/argument/term/variable!");
 function verifyDefining(argumentNode, definingNode, context) {
     var definingVerified = false;
-    var definedVariableNode = definedVariableNodeQuery(argumentNode);
-    if (definedVariableNode !== null) {
-        var defined = definedFromDefiningNode(definingNode), variableNode = definedVariableNode, variableDefined = context.isVariableDefined(variableNode);
-        if (defined) {
-            if (variableDefined) {
-                definingVerified = true;
+    var defined = definedFromDefiningNode(definingNode), termNode = termNodeQuery(argumentNode), variableNode = variableNodeQuery(argumentNode);
+    if (false) {
+    ///
+    } else if (variableNode !== null) {
+        var variable = context.findVariableByVariableNode(variableNode);
+        if (variable !== null) {
+            var variableDefined = context.isVariableDefined(variable);
+            if (defined) {
+                if (variableDefined) {
+                    definingVerified = true;
+                }
             }
-        }
-        if (!defined) {
-            if (!variableDefined) {
-                definingVerified = true;
+            if (!defined) {
+                if (!variableDefined) {
+                    definingVerified = true;
+                }
             }
         }
+    } else if (termNode !== null) {
+        var terms = [], termVerified = (0, _term.default)(termNode, terms, context, function() {
+            var verifiedAhead;
+            var firstTerm = (0, _array.first)(terms), term = firstTerm, termGrounded = context.isTermGrounded(term);
+            if (defined) {
+                if (termGrounded) {
+                    verifiedAhead = true;
+                }
+            }
+            if (!defined) {
+                if (!termGrounded) {
+                    verifiedAhead = true;
+                }
+            }
+            return verifiedAhead;
+        });
+        definingVerified = termVerified; ///
     }
     return definingVerified;
 }
@@ -35,4 +63,4 @@ function definedFromDefiningNode(definingNode) {
     return defined;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZGVmaW5pbmcuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IHNlY29uZCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IERFRklORUQgfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IGRlZmluZWRWYXJpYWJsZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9hcmd1bWVudC90ZXJtL3ZhcmlhYmxlIVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5RGVmaW5pbmcoYXJndW1lbnROb2RlLCBkZWZpbmluZ05vZGUsIGNvbnRleHQpIHtcbiAgbGV0IGRlZmluaW5nVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBkZWZpbmVkVmFyaWFibGVOb2RlID0gZGVmaW5lZFZhcmlhYmxlTm9kZVF1ZXJ5KGFyZ3VtZW50Tm9kZSk7XG5cbiAgaWYgKGRlZmluZWRWYXJpYWJsZU5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBkZWZpbmVkID0gZGVmaW5lZEZyb21EZWZpbmluZ05vZGUoZGVmaW5pbmdOb2RlKSxcbiAgICAgICAgICB2YXJpYWJsZU5vZGUgPSBkZWZpbmVkVmFyaWFibGVOb2RlLCAvLy9cbiAgICAgICAgICB2YXJpYWJsZURlZmluZWQgPSBjb250ZXh0LmlzVmFyaWFibGVEZWZpbmVkKHZhcmlhYmxlTm9kZSk7XG5cbiAgICBpZiAoZGVmaW5lZCkge1xuICAgICAgaWYgKHZhcmlhYmxlRGVmaW5lZCkge1xuICAgICAgICBkZWZpbmluZ1ZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICBpZiAoIWRlZmluZWQpIHtcbiAgICAgIGlmICghdmFyaWFibGVEZWZpbmVkKSB7XG4gICAgICAgIGRlZmluaW5nVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIHJldHVybiBkZWZpbmluZ1ZlcmlmaWVkO1xufVxuXG5mdW5jdGlvbiBkZWZpbmVkRnJvbURlZmluaW5nTm9kZShkZWZpbmluZ05vZGUpIHtcbiAgY29uc3QgY2hpbGROb2RlcyA9IGRlZmluaW5nTm9kZS5nZXRDaGlsZE5vZGVzKCksXG4gICAgICAgIHNlY29uZENoaWxkTm9kZSA9IHNlY29uZChjaGlsZE5vZGVzKSxcbiAgICAgICAgdGVybWluYWxOb2RlID0gc2Vjb25kQ2hpbGROb2RlLCAgLy8vXG4gICAgICAgIGNvbnRlbnQgPSB0ZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpLFxuICAgICAgICBkZWZpbmVkID0gKGNvbnRlbnQgPT09IERFRklORUQpO1xuXG4gIHJldHVybiBkZWZpbmVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeURlZmluaW5nIiwiZGVmaW5lZFZhcmlhYmxlTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiYXJndW1lbnROb2RlIiwiZGVmaW5pbmdOb2RlIiwiY29udGV4dCIsImRlZmluaW5nVmVyaWZpZWQiLCJkZWZpbmVkVmFyaWFibGVOb2RlIiwiZGVmaW5lZCIsImRlZmluZWRGcm9tRGVmaW5pbmdOb2RlIiwidmFyaWFibGVOb2RlIiwidmFyaWFibGVEZWZpbmVkIiwiaXNWYXJpYWJsZURlZmluZWQiLCJjaGlsZE5vZGVzIiwiZ2V0Q2hpbGROb2RlcyIsInNlY29uZENoaWxkTm9kZSIsInNlY29uZCIsInRlcm1pbmFsTm9kZSIsImNvbnRlbnQiLCJnZXRDb250ZW50IiwiREVGSU5FRCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBUUE7OztlQUF3QkE7OztxQkFORDt5QkFDQztxQkFDRTtBQUUxQixJQUFNQywyQkFBMkJDLElBQUFBLGdCQUFTLEVBQUM7QUFFNUIsU0FBU0YsZUFBZUcsWUFBWSxFQUFFQyxZQUFZLEVBQUVDLE9BQU87SUFDeEUsSUFBSUMsbUJBQW1CO0lBRXZCLElBQU1DLHNCQUFzQk4seUJBQXlCRTtJQUVyRCxJQUFJSSx3QkFBd0IsTUFBTTtRQUNoQyxJQUFNQyxVQUFVQyx3QkFBd0JMLGVBQ2xDTSxlQUFlSCxxQkFDZkksa0JBQWtCTixRQUFRTyxpQkFBaUIsQ0FBQ0Y7UUFFbEQsSUFBSUYsU0FBUztZQUNYLElBQUlHLGlCQUFpQjtnQkFDbkJMLG1CQUFtQjtZQUNyQjtRQUNGO1FBRUEsSUFBSSxDQUFDRSxTQUFTO1lBQ1osSUFBSSxDQUFDRyxpQkFBaUI7Z0JBQ3BCTCxtQkFBbUI7WUFDckI7UUFDRjtJQUNGO0lBRUEsT0FBT0E7QUFDVDtBQUVBLFNBQVNHLHdCQUF3QkwsWUFBWTtJQUMzQyxJQUFNUyxhQUFhVCxhQUFhVSxhQUFhLElBQ3ZDQyxrQkFBa0JDLElBQUFBLGFBQU0sRUFBQ0gsYUFDekJJLGVBQWVGLGlCQUNmRyxVQUFVRCxhQUFhRSxVQUFVLElBQ2pDWCxVQUFXVSxZQUFZRSxrQkFBTztJQUVwQyxPQUFPWjtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZGVmaW5pbmcuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlUZXJtIGZyb20gXCIuL3Rlcm1cIjtcblxuaW1wb3J0IHsgREVGSU5FRCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IGZpcnN0LCBzZWNvbmQgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvYXJndW1lbnQvdGVybSFcIiksXG4gICAgICB2YXJpYWJsZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9hcmd1bWVudC90ZXJtL3ZhcmlhYmxlIVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5RGVmaW5pbmcoYXJndW1lbnROb2RlLCBkZWZpbmluZ05vZGUsIGNvbnRleHQpIHtcbiAgbGV0IGRlZmluaW5nVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBkZWZpbmVkID0gZGVmaW5lZEZyb21EZWZpbmluZ05vZGUoZGVmaW5pbmdOb2RlKSxcbiAgICAgICAgdGVybU5vZGUgPSB0ZXJtTm9kZVF1ZXJ5KGFyZ3VtZW50Tm9kZSksXG4gICAgICAgIHZhcmlhYmxlTm9kZSA9IHZhcmlhYmxlTm9kZVF1ZXJ5KGFyZ3VtZW50Tm9kZSk7XG5cbiAgaWYgKGZhbHNlKSB7XG4gICAgLy8vXG4gIH0gZWxzZSBpZiAodmFyaWFibGVOb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgdmFyaWFibGUgPSBjb250ZXh0LmZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSk7XG5cbiAgICBpZiAodmFyaWFibGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHZhcmlhYmxlRGVmaW5lZCA9IGNvbnRleHQuaXNWYXJpYWJsZURlZmluZWQodmFyaWFibGUpO1xuXG4gICAgICBpZiAoZGVmaW5lZCkge1xuICAgICAgICBpZiAodmFyaWFibGVEZWZpbmVkKSB7XG4gICAgICAgICAgZGVmaW5pbmdWZXJpZmllZCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cblxuICAgICAgaWYgKCFkZWZpbmVkKSB7XG4gICAgICAgIGlmICghdmFyaWFibGVEZWZpbmVkKSB7XG4gICAgICAgICAgZGVmaW5pbmdWZXJpZmllZCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gIH0gZWxzZSBpZiAodGVybU5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCB0ZXJtcyA9IFtdLFxuICAgICAgICAgIHRlcm1WZXJpZmllZCA9IHZlcmlmeVRlcm0odGVybU5vZGUsIHRlcm1zLCBjb250ZXh0LCAoKSA9PiB7XG4gICAgICAgICAgICBsZXQgdmVyaWZpZWRBaGVhZDtcblxuICAgICAgICAgICAgY29uc3QgZmlyc3RUZXJtID0gZmlyc3QodGVybXMpLFxuICAgICAgICAgICAgICAgICAgdGVybSA9IGZpcnN0VGVybSwgLy8vXG4gICAgICAgICAgICAgICAgICB0ZXJtR3JvdW5kZWQgPSBjb250ZXh0LmlzVGVybUdyb3VuZGVkKHRlcm0pO1xuXG4gICAgICAgICAgICBpZiAoZGVmaW5lZCkge1xuICAgICAgICAgICAgICBpZiAodGVybUdyb3VuZGVkKSB7XG4gICAgICAgICAgICAgICAgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG4gICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgaWYgKCFkZWZpbmVkKSB7XG4gICAgICAgICAgICAgIGlmICghdGVybUdyb3VuZGVkKSB7XG4gICAgICAgICAgICAgICAgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG4gICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgICAgfSk7XG5cbiAgICBkZWZpbmluZ1ZlcmlmaWVkID0gdGVybVZlcmlmaWVkOyAgLy8vXG5cbiAgfVxuXG4gIHJldHVybiBkZWZpbmluZ1ZlcmlmaWVkO1xufVxuXG5mdW5jdGlvbiBkZWZpbmVkRnJvbURlZmluaW5nTm9kZShkZWZpbmluZ05vZGUpIHtcbiAgY29uc3QgY2hpbGROb2RlcyA9IGRlZmluaW5nTm9kZS5nZXRDaGlsZE5vZGVzKCksXG4gICAgICAgIHNlY29uZENoaWxkTm9kZSA9IHNlY29uZChjaGlsZE5vZGVzKSxcbiAgICAgICAgdGVybWluYWxOb2RlID0gc2Vjb25kQ2hpbGROb2RlLCAgLy8vXG4gICAgICAgIGNvbnRlbnQgPSB0ZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpLFxuICAgICAgICBkZWZpbmVkID0gKGNvbnRlbnQgPT09IERFRklORUQpO1xuXG4gIHJldHVybiBkZWZpbmVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeURlZmluaW5nIiwidGVybU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInZhcmlhYmxlTm9kZVF1ZXJ5IiwiYXJndW1lbnROb2RlIiwiZGVmaW5pbmdOb2RlIiwiY29udGV4dCIsImRlZmluaW5nVmVyaWZpZWQiLCJkZWZpbmVkIiwiZGVmaW5lZEZyb21EZWZpbmluZ05vZGUiLCJ0ZXJtTm9kZSIsInZhcmlhYmxlTm9kZSIsInZhcmlhYmxlIiwiZmluZFZhcmlhYmxlQnlWYXJpYWJsZU5vZGUiLCJ2YXJpYWJsZURlZmluZWQiLCJpc1ZhcmlhYmxlRGVmaW5lZCIsInRlcm1zIiwidGVybVZlcmlmaWVkIiwidmVyaWZ5VGVybSIsInZlcmlmaWVkQWhlYWQiLCJmaXJzdFRlcm0iLCJmaXJzdCIsInRlcm0iLCJ0ZXJtR3JvdW5kZWQiLCJpc1Rlcm1Hcm91bmRlZCIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwic2Vjb25kQ2hpbGROb2RlIiwic2Vjb25kIiwidGVybWluYWxOb2RlIiwiY29udGVudCIsImdldENvbnRlbnQiLCJERUZJTkVEIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFXQTs7O2VBQXdCQTs7OzJEQVREO3lCQUVDO3FCQUNFO3FCQUNJOzs7Ozs7QUFFOUIsSUFBTUMsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDLG9CQUMxQkMsb0JBQW9CRCxJQUFBQSxnQkFBUyxFQUFDO0FBRXJCLFNBQVNGLGVBQWVJLFlBQVksRUFBRUMsWUFBWSxFQUFFQyxPQUFPO0lBQ3hFLElBQUlDLG1CQUFtQjtJQUV2QixJQUFNQyxVQUFVQyx3QkFBd0JKLGVBQ2xDSyxXQUFXVCxjQUFjRyxlQUN6Qk8sZUFBZVIsa0JBQWtCQztJQUV2QyxJQUFJLE9BQU87SUFDVCxHQUFHO0lBQ0wsT0FBTyxJQUFJTyxpQkFBaUIsTUFBTTtRQUNoQyxJQUFNQyxXQUFXTixRQUFRTywwQkFBMEIsQ0FBQ0Y7UUFFcEQsSUFBSUMsYUFBYSxNQUFNO1lBQ3JCLElBQU1FLGtCQUFrQlIsUUFBUVMsaUJBQWlCLENBQUNIO1lBRWxELElBQUlKLFNBQVM7Z0JBQ1gsSUFBSU0saUJBQWlCO29CQUNuQlAsbUJBQW1CO2dCQUNyQjtZQUNGO1lBRUEsSUFBSSxDQUFDQyxTQUFTO2dCQUNaLElBQUksQ0FBQ00saUJBQWlCO29CQUNwQlAsbUJBQW1CO2dCQUNyQjtZQUNGO1FBQ0Y7SUFDRixPQUFPLElBQUlHLGFBQWEsTUFBTTtRQUM1QixJQUFNTSxRQUFRLEVBQUUsRUFDVkMsZUFBZUMsSUFBQUEsYUFBVSxFQUFDUixVQUFVTSxPQUFPVixTQUFTO1lBQ2xELElBQUlhO1lBRUosSUFBTUMsWUFBWUMsSUFBQUEsWUFBSyxFQUFDTCxRQUNsQk0sT0FBT0YsV0FDUEcsZUFBZWpCLFFBQVFrQixjQUFjLENBQUNGO1lBRTVDLElBQUlkLFNBQVM7Z0JBQ1gsSUFBSWUsY0FBYztvQkFDaEJKLGdCQUFnQjtnQkFDbEI7WUFDRjtZQUVBLElBQUksQ0FBQ1gsU0FBUztnQkFDWixJQUFJLENBQUNlLGNBQWM7b0JBQ2pCSixnQkFBZ0I7Z0JBQ2xCO1lBQ0Y7WUFFQSxPQUFPQTtRQUNUO1FBRU5aLG1CQUFtQlUsY0FBZSxHQUFHO0lBRXZDO0lBRUEsT0FBT1Y7QUFDVDtBQUVBLFNBQVNFLHdCQUF3QkosWUFBWTtJQUMzQyxJQUFNb0IsYUFBYXBCLGFBQWFxQixhQUFhLElBQ3ZDQyxrQkFBa0JDLElBQUFBLGFBQU0sRUFBQ0gsYUFDekJJLGVBQWVGLGlCQUNmRyxVQUFVRCxhQUFhRSxVQUFVLElBQ2pDdkIsVUFBV3NCLFlBQVlFLGtCQUFPO0lBRXBDLE9BQU94QjtBQUNUIn0=

package/package.json

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

package/src/context/file.js

@@ -395,6 +395,12 @@ export default class FileContext {
     return termGrounded;
   }
 
+  isVariableDefined(variable) {
+    const variableDefined = false;  ///
+
+    return variableDefined;
+  }
+
   isTypePresentByTypeName(typeName) {
     const type = this.findTypeByTypeName(typeName),
           typePresent = (type !== null);

package/src/context/local.js

@@ -5,12 +5,7 @@ import Equivalence from "../equivalence";
 import contextMixins from "../mixins/context";
 
 import { last } from "../utilities/array";
-import { mergeEquivalences,
-         separateEquivalences,
-         findEquivalenceByTerm,
-         compressDefinedVariables,
-         definedVariablesFromGroundedEquivalences,
-         implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables } from "../utilities/equivalences";
+import { mergeEquivalences, findEquivalenceByTerm, groundedTermsAndDefinedVariablesFromFromEquivalences } from "../utilities/equivalences";
 
 class LocalContext {
   constructor(context, variables, proofSteps, equivalences) {
@@ -90,49 +85,42 @@ class LocalContext {
     return termType;
   }
 
-  isVariableDefined(variable) {
-    let variableDefined = false;
-
-    const equivalences = this.getEquivalences(),
-          remainingEquivalences = [],
-          initiallyGroundedEquivalences = [];
-
-    separateEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences);
-
-    const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.length;
-
-    if (initiallyGroundedEquivalencesLength > 0) {
-      let groundedEquivalences,
-          implicitlyGroundedEquivalences,
-          implicitlyGroundedEquivalencesLength;
-
-      const context = this,
-            definedVariables = [];
-
-      groundedEquivalences = initiallyGroundedEquivalences; ///
-
-      definedVariablesFromGroundedEquivalences(groundedEquivalences, definedVariables, context);
-
-      implicitlyGroundedEquivalences = implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables(remainingEquivalences, definedVariables);
+  isTermGrounded(term) {
+    const context = this,
+          equivalences = this.getEquivalences(),
+          groundedTerms = [],
+          definedVariables = [];
 
-      implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.length;
+    groundedTermsAndDefinedVariablesFromFromEquivalences(equivalences, groundedTerms, definedVariables, context);
 
-      while (implicitlyGroundedEquivalencesLength > 0) {
-        groundedEquivalences = implicitlyGroundedEquivalences;  ///
+    const termMatchesGroundedTerm = groundedTerms.some((groundedTerm) => {
+            const termMatchesGroundedTerm = term.match(groundedTerm);
 
-        definedVariablesFromGroundedEquivalences(groundedEquivalences, definedVariables, context);
+            if (termMatchesGroundedTerm) {
+              return true;
+            }
+          }),
+          termGrounded = termMatchesGroundedTerm; ///
 
-        implicitlyGroundedEquivalences = implicitlyGroundedEquivalencesFromRemainingEquivalencesAndDefinedVariables(remainingEquivalences, definedVariables);
+    return termGrounded;
+  }
 
-        implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.length;
-      }
+  isVariableDefined(variable) {
+    const context = this,
+          equivalences = this.getEquivalences(),
+          groundedTerms = [],
+          definedVariables = [];
 
-      compressDefinedVariables(definedVariables);
+    groundedTermsAndDefinedVariablesFromFromEquivalences(equivalences, groundedTerms, definedVariables, context);
 
-      const definedVariablesIncludesVariable = definedVariables.includes(variable);
+    const variableMatchesDefinedVariable = definedVariables.some((definedVariable) => {
+            const variableMatchesDefinedVariable = variable.match(definedVariable);
 
-      variableDefined = definedVariablesIncludesVariable;  ///
-    }
+            if (variableMatchesDefinedVariable) {
+              return true;
+            }
+          }),
+          variableDefined = variableMatchesDefinedVariable; ///
 
     return variableDefined;
   }