occam-verify-cli 0.0.869 → 0.0.871

package/lib/verify/variableAgainstTerm.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return verifyVariableAgainstTerm;
+    }
+});
+var _term = /*#__PURE__*/ _interop_require_default(require("../verify/term"));
+var _termForVariable = /*#__PURE__*/ _interop_require_default(require("../substitution/termForVariable"));
+var _array = require("../utilities/array");
+var _query = require("../utilities/query");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+var variableNodeQuery = (0, _query.nodeQuery)("/term/variable");
+function verifyVariableAgainstTerm(variableNode, termNode, substitutions, localContextA, localContextB, verifyAhead) {
+    var variableVerifiedAgainstTerm = false;
+    var substitution = substitutions.find(function(substitution) {
+        var substitutionMatchesVariableNodeA = substitution.matchVariableNode(variableNode);
+        if (substitutionMatchesVariableNodeA) {
+            return true;
+        }
+    }) || null;
+    if (substitution !== null) {
+        var termNodeMatches = substitution.matchTermNode(termNode);
+        if (termNodeMatches) {
+            var verifiedAhead = verifyAhead();
+            variableVerifiedAgainstTerm = verifiedAhead; ///
+        }
+    } else {
+        var variableA = localContextA.findVariableByVariableNode(variableNode);
+        if (variableA !== null) {
+            var terms = [], termVerified = (0, _term.default)(termNode, terms, localContextB, function() {
+                var verifiedAhead = false;
+                var firstTerm = (0, _array.first)(terms), termB = firstTerm, variableB = variableFromTerm(termB, localContextB);
+                if (variableA === variableB) {
+                    verifiedAhead = verifyAhead();
+                } else {
+                    var term = termB, variable = variableA, termType = term.getType(), variableType = variable.getType(), variableTypeEqualToOrSuperTypeOfTermType = variableType.isEqualToOrSuperTypeOf(termType);
+                    if (variableTypeEqualToOrSuperTypeOfTermType) {
+                        var termForVariableSubstitution = _termForVariable.default.fromVariableNodeAndTermNode(variableNode, termNode), substitution = termForVariableSubstitution; ///
+                        substitutions.push(substitution);
+                        verifiedAhead = verifyAhead();
+                        if (!verifiedAhead) {
+                            substitutions.pop();
+                        }
+                    }
+                }
+                return verifiedAhead;
+            });
+            variableVerifiedAgainstTerm = termVerified; ///
+        }
+    }
+    return variableVerifiedAgainstTerm;
+}
+function variableFromTerm(term, localContext) {
+    var variable = null;
+    var termNode = term.getNode(), variableNode = variableNodeQuery(termNode);
+    if (variableNode !== null) {
+        variable = localContext.findVariableByVariableNode(variableNode);
+    }
+    return variable;
+}
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGVBZ2FpbnN0VGVybS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHZlcmlmeVRlcm0gZnJvbSBcIi4uL3ZlcmlmeS90ZXJtXCI7XG5pbXBvcnQgVGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uIGZyb20gXCIuLi9zdWJzdGl0dXRpb24vdGVybUZvclZhcmlhYmxlXCI7XG5cbmltcG9ydCB7IGZpcnN0IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB2YXJpYWJsZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtL3ZhcmlhYmxlXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlWYXJpYWJsZUFnYWluc3RUZXJtKHZhcmlhYmxlTm9kZSwgdGVybU5vZGUsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIsIHZlcmlmeUFoZWFkKSB7XG4gIGxldCB2YXJpYWJsZVZlcmlmaWVkQWdhaW5zdFRlcm0gPSBmYWxzZTtcblxuICBjb25zdCBzdWJzdGl0dXRpb24gPSBzdWJzdGl0dXRpb25zLmZpbmQoKHN1YnN0aXR1dGlvbikgPT4ge1xuICAgIGNvbnN0IHN1YnN0aXR1dGlvbk1hdGNoZXNWYXJpYWJsZU5vZGVBID0gc3Vic3RpdHV0aW9uLm1hdGNoVmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSk7XG5cbiAgICBpZiAoc3Vic3RpdHV0aW9uTWF0Y2hlc1ZhcmlhYmxlTm9kZUEpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSkgfHwgbnVsbDtcblxuICBpZiAoc3Vic3RpdHV0aW9uICE9PSBudWxsKSB7XG4gICAgY29uc3QgdGVybU5vZGVNYXRjaGVzID0gc3Vic3RpdHV0aW9uLm1hdGNoVGVybU5vZGUodGVybU5vZGUpO1xuXG4gICAgaWYgKHRlcm1Ob2RlTWF0Y2hlcykge1xuICAgICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHZlcmlmeUFoZWFkKCk7XG5cbiAgICAgIHZhcmlhYmxlVmVyaWZpZWRBZ2FpbnN0VGVybSA9IHZlcmlmaWVkQWhlYWQ7ICAvLy9cbiAgICB9XG4gIH0gZWxzZSB7XG4gICAgY29uc3QgdmFyaWFibGVBID0gbG9jYWxDb250ZXh0QS5maW5kVmFyaWFibGVCeVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpO1xuXG4gICAgaWYgKHZhcmlhYmxlQSAhPT0gbnVsbCkge1xuICAgICAgY29uc3QgdGVybXMgPSBbXSxcbiAgICAgICAgICAgIHRlcm1WZXJpZmllZCA9IHZlcmlmeVRlcm0odGVybU5vZGUsIHRlcm1zLCBsb2NhbENvbnRleHRCLCAoKSA9PiB7XG4gICAgICAgICAgICAgIGxldCB2ZXJpZmllZEFoZWFkID0gZmFsc2U7XG5cbiAgICAgICAgICAgICAgY29uc3QgZmlyc3RUZXJtID0gZmlyc3QodGVybXMpLFxuICAgICAgICAgICAgICAgICAgICB0ZXJtQiA9IGZpcnN0VGVybSwgLy8vXG4gICAgICAgICAgICAgICAgICAgIHZhcmlhYmxlQiA9IHZhcmlhYmxlRnJvbVRlcm0odGVybUIsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgICAgICAgICAgIGlmICh2YXJpYWJsZUEgPT09IHZhcmlhYmxlQikge1xuICAgICAgICAgICAgICAgIHZlcmlmaWVkQWhlYWQgPSB2ZXJpZnlBaGVhZCgpO1xuICAgICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgIGNvbnN0IHRlcm0gPSB0ZXJtQiwgLy8vXG4gICAgICAgICAgICAgICAgICAgICAgdmFyaWFibGUgPSB2YXJpYWJsZUEsIC8vL1xuICAgICAgICAgICAgICAgICAgICAgIHRlcm1UeXBlID0gdGVybS5nZXRUeXBlKCksXG4gICAgICAgICAgICAgICAgICAgICAgdmFyaWFibGVUeXBlID0gdmFyaWFibGUuZ2V0VHlwZSgpLFxuICAgICAgICAgICAgICAgICAgICAgIHZhcmlhYmxlVHlwZUVxdWFsVG9PclN1cGVyVHlwZU9mVGVybVR5cGUgPSB2YXJpYWJsZVR5cGUuaXNFcXVhbFRvT3JTdXBlclR5cGVPZih0ZXJtVHlwZSk7XG5cbiAgICAgICAgICAgICAgICBpZiAodmFyaWFibGVUeXBlRXF1YWxUb09yU3VwZXJUeXBlT2ZUZXJtVHlwZSkge1xuICAgICAgICAgICAgICAgICAgY29uc3QgdGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uID0gVGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uLmZyb21WYXJpYWJsZU5vZGVBbmRUZXJtTm9kZSh2YXJpYWJsZU5vZGUsIHRlcm1Ob2RlKSxcbiAgICAgICAgICAgICAgICAgICAgICAgIHN1YnN0aXR1dGlvbiA9IHRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbjsgIC8vL1xuXG4gICAgICAgICAgICAgICAgICBzdWJzdGl0dXRpb25zLnB1c2goc3Vic3RpdHV0aW9uKTtcblxuICAgICAgICAgICAgICAgICAgdmVyaWZpZWRBaGVhZCA9IHZlcmlmeUFoZWFkKCk7XG5cbiAgICAgICAgICAgICAgICAgIGlmICghdmVyaWZpZWRBaGVhZCkge1xuICAgICAgICAgICAgICAgICAgICBzdWJzdGl0dXRpb25zLnBvcCgpO1xuICAgICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgICAgfSk7XG5cbiAgICAgIHZhcmlhYmxlVmVyaWZpZWRBZ2FpbnN0VGVybSA9IHRlcm1WZXJpZmllZDsgIC8vL1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiB2YXJpYWJsZVZlcmlmaWVkQWdhaW5zdFRlcm07XG59XG5cbmZ1bmN0aW9uIHZhcmlhYmxlRnJvbVRlcm0odGVybSwgbG9jYWxDb250ZXh0KSB7XG4gIGxldCB2YXJpYWJsZSA9IG51bGw7XG5cbiAgY29uc3QgdGVybU5vZGUgPSB0ZXJtLmdldE5vZGUoKSxcbiAgICAgICAgdmFyaWFibGVOb2RlID0gdmFyaWFibGVOb2RlUXVlcnkodGVybU5vZGUpO1xuXG4gIGlmICh2YXJpYWJsZU5vZGUgIT09IG51bGwpIHtcbiAgICB2YXJpYWJsZSA9IGxvY2FsQ29udGV4dC5maW5kVmFyaWFibGVCeVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHZhcmlhYmxlO1xufSJdLCJuYW1lcyI6WyJ2ZXJpZnlWYXJpYWJsZUFnYWluc3RUZXJtIiwidmFyaWFibGVOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ2YXJpYWJsZU5vZGUiLCJ0ZXJtTm9kZSIsInN1YnN0aXR1dGlvbnMiLCJsb2NhbENvbnRleHRBIiwibG9jYWxDb250ZXh0QiIsInZlcmlmeUFoZWFkIiwidmFyaWFibGVWZXJpZmllZEFnYWluc3RUZXJtIiwic3Vic3RpdHV0aW9uIiwiZmluZCIsInN1YnN0aXR1dGlvbk1hdGNoZXNWYXJpYWJsZU5vZGVBIiwibWF0Y2hWYXJpYWJsZU5vZGUiLCJ0ZXJtTm9kZU1hdGNoZXMiLCJtYXRjaFRlcm1Ob2RlIiwidmVyaWZpZWRBaGVhZCIsInZhcmlhYmxlQSIsImZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOb2RlIiwidGVybXMiLCJ0ZXJtVmVyaWZpZWQiLCJ2ZXJpZnlUZXJtIiwiZmlyc3RUZXJtIiwiZmlyc3QiLCJ0ZXJtQiIsInZhcmlhYmxlQiIsInZhcmlhYmxlRnJvbVRlcm0iLCJ0ZXJtIiwidmFyaWFibGUiLCJ0ZXJtVHlwZSIsImdldFR5cGUiLCJ2YXJpYWJsZVR5cGUiLCJ2YXJpYWJsZVR5cGVFcXVhbFRvT3JTdXBlclR5cGVPZlRlcm1UeXBlIiwiaXNFcXVhbFRvT3JTdXBlclR5cGVPZiIsInRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbiIsIlRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbiIsImZyb21WYXJpYWJsZU5vZGVBbmRUZXJtTm9kZSIsInB1c2giLCJwb3AiLCJsb2NhbENvbnRleHQiLCJnZXROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFVQTs7O2VBQXdCQTs7OzJEQVJEO3NFQUNpQjtxQkFFbEI7cUJBQ0k7Ozs7OztBQUUxQixJQUFNQyxvQkFBb0JDLElBQUFBLGdCQUFTLEVBQUM7QUFFckIsU0FBU0YsMEJBQTBCRyxZQUFZLEVBQUVDLFFBQVEsRUFBRUMsYUFBYSxFQUFFQyxhQUFhLEVBQUVDLGFBQWEsRUFBRUMsV0FBVztJQUNoSSxJQUFJQyw4QkFBOEI7SUFFbEMsSUFBTUMsZUFBZUwsY0FBY00sSUFBSSxDQUFDLFNBQUNEO1FBQ3ZDLElBQU1FLG1DQUFtQ0YsYUFBYUcsaUJBQWlCLENBQUNWO1FBRXhFLElBQUlTLGtDQUFrQztZQUNwQyxPQUFPO1FBQ1Q7SUFDRixNQUFNO0lBRU4sSUFBSUYsaUJBQWlCLE1BQU07UUFDekIsSUFBTUksa0JBQWtCSixhQUFhSyxhQUFhLENBQUNYO1FBRW5ELElBQUlVLGlCQUFpQjtZQUNuQixJQUFNRSxnQkFBZ0JSO1lBRXRCQyw4QkFBOEJPLGVBQWdCLEdBQUc7UUFDbkQ7SUFDRixPQUFPO1FBQ0wsSUFBTUMsWUFBWVgsY0FBY1ksMEJBQTBCLENBQUNmO1FBRTNELElBQUljLGNBQWMsTUFBTTtZQUN0QixJQUFNRSxRQUFRLEVBQUUsRUFDVkMsZUFBZUMsSUFBQUEsYUFBVSxFQUFDakIsVUFBVWUsT0FBT1osZUFBZTtnQkFDeEQsSUFBSVMsZ0JBQWdCO2dCQUVwQixJQUFNTSxZQUFZQyxJQUFBQSxZQUFLLEVBQUNKLFFBQ2xCSyxRQUFRRixXQUNSRyxZQUFZQyxpQkFBaUJGLE9BQU9qQjtnQkFFMUMsSUFBSVUsY0FBY1EsV0FBVztvQkFDM0JULGdCQUFnQlI7Z0JBQ2xCLE9BQU87b0JBQ0wsSUFBTW1CLE9BQU9ILE9BQ1BJLFdBQVdYLFdBQ1hZLFdBQVdGLEtBQUtHLE9BQU8sSUFDdkJDLGVBQWVILFNBQVNFLE9BQU8sSUFDL0JFLDJDQUEyQ0QsYUFBYUUsc0JBQXNCLENBQUNKO29CQUVyRixJQUFJRywwQ0FBMEM7d0JBQzVDLElBQU1FLDhCQUE4QkMsd0JBQTJCLENBQUNDLDJCQUEyQixDQUFDakMsY0FBY0MsV0FDcEdNLGVBQWV3Qiw2QkFBOEIsR0FBRzt3QkFFdEQ3QixjQUFjZ0MsSUFBSSxDQUFDM0I7d0JBRW5CTSxnQkFBZ0JSO3dCQUVoQixJQUFJLENBQUNRLGVBQWU7NEJBQ2xCWCxjQUFjaUMsR0FBRzt3QkFDbkI7b0JBQ0Y7Z0JBQ0Y7Z0JBRUEsT0FBT3RCO1lBQ1Q7WUFFTlAsOEJBQThCVyxjQUFlLEdBQUc7UUFDbEQ7SUFDRjtJQUVBLE9BQU9YO0FBQ1Q7QUFFQSxTQUFTaUIsaUJBQWlCQyxJQUFJLEVBQUVZLFlBQVk7SUFDMUMsSUFBSVgsV0FBVztJQUVmLElBQU14QixXQUFXdUIsS0FBS2EsT0FBTyxJQUN2QnJDLGVBQWVGLGtCQUFrQkc7SUFFdkMsSUFBSUQsaUJBQWlCLE1BQU07UUFDekJ5QixXQUFXVyxhQUFhckIsMEJBQTBCLENBQUNmO0lBQ3JEO0lBRUEsT0FBT3lCO0FBQ1QifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.869",
+  "version": "0.0.871",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,9 +12,9 @@
   "dependencies": {
     "argumentative": "^2.0.28",
     "necessary": "^14.0.1",
-    "occam-custom-grammars": "^5.0.776",
-    "occam-entities": "^1.0.133",
-    "occam-file-system": "^6.0.175",
+    "occam-custom-grammars": "^5.0.777",
+    "occam-entities": "^1.0.134",
+    "occam-file-system": "^6.0.176",
     "occam-grammar-utilities": "^8.0.205",
     "occam-query": "^3.1.174"
   },

package/src/axiomLemmaTheoremConjecture.js

@@ -32,19 +32,6 @@ export default class AxiomLemmaTheoremConjecture {
     return this.localContext;
   }
 
-  matchLabelNode(labelNode) {
-    const labelNodeMatches = this.labels.some((label) => {
-      const node = labelNode, ///
-            labelMatchesNode = label.matchNode(node);
-
-      if (labelMatchesNode) {
-        return true;
-      }
-    });
-
-    return labelNodeMatches;
-  }
-
   matchStatement(statementNode, statementLocalContext) {
     let statementNatches;
 
@@ -79,6 +66,19 @@ export default class AxiomLemmaTheoremConjecture {
     return statementNatches;
   }
 
+  matchLabelMetavariableNode(labelMetavariableNode) {
+    const labelMetavariableNodeMatches = this.labels.some((label) => {
+      const node = labelMetavariableNode, ///
+            labelMatchesNode = label.matchNode(node);
+
+      if (labelMatchesNode) {
+        return true;
+      }
+    });
+
+    return labelMetavariableNodeMatches;
+  }
+
   toJSON(tokens) {
     const labelsJSON = this.labels.map((label) => {
             const labelJSON = label.toJSON(tokens);

package/src/conclusion.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import metaLevelNodesVerifier from "./verifier/nodes/metaLevel";
-import metaLevelToIntrinsicLevelNodesVerifier from "./verifier/nodes/metaLevelToIntrinsicLevel";
+import intrinsicLevelAgainstMetaLevelNodesVerifier from "./verifier/nodes/intrinsicLevelAgainstMetaLevel";
 
 import { nodeAsString } from "./utilities/string";
 import { metastatementNodeFromMetastatementString } from "./utilities/node";
@@ -20,7 +20,7 @@ export default class Conclusion {
           nonTerminalNodeB = statementNode,  ///
           localContextA = localContext, ///
           localContextB = statementLocalContext,  ///
-          nonTerminalNodeVerified = metaLevelToIntrinsicLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
+          nonTerminalNodeVerified = intrinsicLevelAgainstMetaLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
             const verifyAhead = true;
 
             return verifyAhead;

package/src/context/file.js

@@ -115,6 +115,12 @@ export default class FileContext {
       push(labels, conjectureLabels);
     });
 
+    this.metatheorems.forEach((metatheorem) => {
+      const metatheoremLabels = metatheorem.getLabels();
+
+      push(labels, metatheoremLabels);
+    });
+
     if (includeRelease) {
       const releaseContextLabels = this.releaseContext.getLabels();
 
@@ -308,8 +314,49 @@ export default class FileContext {
     return type;
   }
 
-  findLabelByLabelNode(labelNode) {
-    const name = labelNode,  ///
+  findVariableByVariableNode(variableNode) {
+    const node = variableNode,  ///
+          variables = this.getVariables(),
+          variable = variables.find((variable) => {
+            const nodeMatches = variable.matchNode(node);
+
+            if (nodeMatches) {
+              return true;
+            }
+          }) || null;
+
+    return variable;
+  }
+
+  findMetaTypeByMetaTypeNode(metaTypeNode) {
+    const metaTypes = this.getMetaTypes(),
+          metaType = metaTypes.find((metaType) => {
+            const matches = metaType.matchMetaTypeNode(metaTypeNode);
+
+            if (matches) {
+              return true;
+            }
+          }) || null;
+
+    return metaType;
+  }
+
+  findMetavariableByMetavariableNode(metavariableNode) {
+    const node = metavariableNode,  ///
+          metavariables = this.getMetavariables(),
+          metavariable = metavariables.find((metavariable) => {
+            const matches = metavariable.matchNode(node);
+
+            if (matches) {
+              return true;
+            }
+          }) || null;
+
+    return metavariable;
+  }
+
+  findLabelByLabelMetavariableNode(labelMetavariableNode) {
+    const name = labelMetavariableNode,  ///
           labels = this.getLabels(),
           label = labels.find((label) => {
             const matches = label.matchNode(name);
@@ -322,12 +369,12 @@ export default class FileContext {
     return label;
   }
 
-  findRuleByLabelNode(labelNode) {
+  findRuleByLabelMetavariableNode(labelMetavariableNode) {
     const rules = this.getRules(),
           rule = rules.find((rule) => {
-            const ruleMatchesLabelNode = rule.matchLabelNode(labelNode);
+            const ruleMatchesLabelMetavariableNode = rule.matchLabelMetavariableNode(labelMetavariableNode);
 
-            if (ruleMatchesLabelNode) {
+            if (ruleMatchesLabelMetavariableNode) {
               return true;
             }
           }) || null;
@@ -335,12 +382,12 @@ export default class FileContext {
     return rule;
   }
 
-  findAxiomByLabelNode(labelNode) {
+  findAxiomByLabelMetavariableNode(labelMetavariableNode) {
     const axioms = this.getAxioms(),
           axiom = axioms.find((axiom) => {
-            const axiomMatchesLabelNode = axiom.matchLabelNode(labelNode);
+            const axiomMatchesLabelMetavariableNode = axiom.matchLabelMetavariableNode(labelMetavariableNode);
 
-            if (axiomMatchesLabelNode) {
+            if (axiomMatchesLabelMetavariableNode) {
               return true;
             }
           }) || null;
@@ -348,12 +395,12 @@ export default class FileContext {
     return axiom;
   }
 
-  findLemmaByLabelNode(labelNode) {
+  findLemmaByLabelMetavariableNode(labelMetavariableNode) {
     const lemmas = this.getLemmas(),
           lemma = lemmas.find((lemma) => {
-            const lemmaMatchesLabelNode = lemma.matchLabelNode(labelNode);
+            const lemmaMatchesLabelMetavariableNode = lemma.matchLabelMetavariableNode(labelMetavariableNode);
 
-            if (lemmaMatchesLabelNode) {
+            if (lemmaMatchesLabelMetavariableNode) {
               return true;
             }
           }) || null;
@@ -361,12 +408,12 @@ export default class FileContext {
     return lemma;
   }
 
-  findTheoremByLabelNode(labelNode) {
+  findTheoremByLabelMetavariableNode(labelMetavariableNode) {
     const theorems = this.getTheorems(),
           theorem = theorems.find((theorem) => {
-            const theoremMatchesLabelNode = theorem.matchLabelNode(labelNode);
+            const theoremMatchesLabelMetavariableNode = theorem.matchLabelMetavariableNode(labelMetavariableNode);
 
-            if (theoremMatchesLabelNode) {
+            if (theoremMatchesLabelMetavariableNode) {
               return true;
             }
           }) || null;
@@ -374,12 +421,12 @@ export default class FileContext {
     return theorem;
   }
 
-  findMetaLemmaByLabelNode(labelNode) {
+  findMetaLemmaByLabelMetavariableNode(labelMetavariableNode) {
     const metaLemmas = this.getMetaLemmas(),
           metaLemma = metaLemmas.find((metaLemma) => {
-            const metaLemmaMatchesLabelNode = metaLemma.matchLabelNode(labelNode);
+            const metaLemmaMatchesLabelMetavariableNode = metaLemma.matchLabelMetavariableNode(labelMetavariableNode);
 
-            if (metaLemmaMatchesLabelNode) {
+            if (metaLemmaMatchesLabelMetavariableNode) {
               return true;
             }
           }) || null;
@@ -387,39 +434,12 @@ export default class FileContext {
     return metaLemma;
   }
 
-  findVariableByVariableNode(variableNode) {
-    const node = variableNode,  ///
-          variables = this.getVariables(),
-          variable = variables.find((variable) => {
-            const nodeMatches = variable.matchNode(node);
-
-            if (nodeMatches) {
-              return true;
-            }
-          }) || null;
-
-    return variable;
-  }
-
-  findMetaTypeByMetaTypeNode(metaTypeNode) {
-    const metaTypes = this.getMetaTypes(),
-          metaType = metaTypes.find((metaType) => {
-            const matches = metaType.matchMetaTypeNode(metaTypeNode);
-
-            if (matches) {
-              return true;
-            }
-          }) || null;
-
-    return metaType;
-  }
-
-  findConjectureByLabelNode(labelNode) {
+  findConjectureByLabelMetavariableNode(labelMetavariableNode) {
     const conjectures = this.getConjectures(),
           conjecture = conjectures.find((conjecture) => {
-            const conjectureMatchesLabelNode = conjecture.matchLabelNode(labelNode);
+            const conjectureMatchesLabelMetavariableNode = conjecture.matchLabelMetavariableNode(labelMetavariableNode);
 
-            if (conjectureMatchesLabelNode) {
+            if (conjectureMatchesLabelMetavariableNode) {
               return true;
             }
           }) || null;
@@ -427,26 +447,12 @@ export default class FileContext {
     return conjecture;
   }
 
-  findMetavariableByMetavariableNode(metavariableNode) {
-    const node = metavariableNode,  ///
-          metavariables = this.getMetavariables(),
-          metavariable = metavariables.find((metavariable) => {
-            const matches = metavariable.matchNode(node);
-
-            if (matches) {
-              return true;
-            }
-          }) || null;
-
-    return metavariable;
-  }
-
-  findMetatheoremByLabelNode(labelNode) {
+  findMetatheoremByLabelMetavariableNode(labelMetavariableNode) {
     const metatheorems = this.getMetatheorems(),
           metatheorem = metatheorems.find((metatheorem) => {
-            const metatheoremMatchesLabelNode = metatheorem.matchLabelNode(labelNode);
+            const metatheoremMatchesLabelMetavariableNode = metatheorem.matchLabelMetavariableNode(labelMetavariableNode);
 
-            if (metatheoremMatchesLabelNode) {
+            if (metatheoremMatchesLabelMetavariableNode) {
               return true;
             }
           }) || null;
@@ -468,13 +474,6 @@ export default class FileContext {
     return typePresent;
   }
 
-  isLabelPresentByLabelNode(labelNode) {
-    const label = this.findLabelByLabelNode(labelNode),
-          labelPresent = (label !== null);
-
-    return labelPresent;
-  }
-
   isVariablePresentByVariableNode(variableNode) {
     const variable = this.findVariableByVariableNode(variableNode),
           variablePresent = (variable !== null);
@@ -482,6 +481,13 @@ export default class FileContext {
     return variablePresent;
   }
 
+  isLabelPresentByLabelMetavariableNode(labelMetavariableNode) {
+    const label = this.findLabelByLabelMetavariableNode(labelMetavariableNode),
+          labelPresent = (label !== null);
+
+    return labelPresent;
+  }
+
   isMetavariablePresentByMetavariableNode(metavariableNode) {
     const metavariable = this.findMetavariableByMetavariableNode(metavariableNode),
           metavariablePresent = (metavariable !== null);
@@ -727,11 +733,11 @@ export default class FileContext {
           lemmasJSON = lemmas,  ///
           theoremsJSON = theorems,  ///
           variablesJSON = variables,  ///
-          metaLemmasJSON = metaLemmas || [],  ///
+          metaLemmasJSON = metaLemmas,  ///
           conjecturesJSON = conjectures,  ///
           combinatorsJSON = combinators,  ///
           constructorsJSON = constructors,  ///
-          metatheoremsJSON = metatheorems || [],  ///
+          metatheoremsJSON = metatheorems,  ///
           metavariablesJSON = metavariables;  ///
 
     typesJSON.forEach((typeJSON) => {

package/src/equality.js

@@ -29,17 +29,11 @@ export default class Equality {
   }
 
   isEqual(localContext) {
-    const leftTerm = this.getLeftTerm(),
-          rightTerm = this.getRightTerm(),
-          leftTermNode = leftTerm.getNode(),
-          rightTermNode = rightTerm.getNode(),
+    const leftTermNode = this.leftTerm.getNode(),
+          rightTermNode = this.rightTerm.getNode(),
           nonTerminalNodeA = leftTermNode,  ///
           nonTerminalNodeB = rightTermNode, ///
-          equivalences = localContext.getEquivalences();
-
-    localContext = this;  ///
-
-    const nonTerminalNodeVerified = equalityNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, equivalences, localContext, () => {
+          nonTerminalNodeVerified = equalityNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, localContext, () => {
             const verifiedAhead = true;
 
             return verifiedAhead;

package/src/equivalence.js

@@ -102,7 +102,7 @@ export default class Equivalence {
       if (termNodeMatches) {
         return true;
       }
-    })
+    });
 
     return termNodesMatch;
   }

package/src/label.js

@@ -1,8 +1,7 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { labelNameFromLabelNode } from "./utilities/name";
-import { labelNodeFromLabelString } from "./utilities/node";
+import { metavariableNodeFromMetavariableString } from "./utilities/node";
 
 export default class Label {
   constructor(node) {
@@ -32,19 +31,19 @@ export default class Label {
     return json;
   }
 
-  static fromLabelNode(labelNode) {
-    const node = labelNode, ///
+  static fromMetavariableNode(metavariableNode) {
+    const node = metavariableNode, ///
           variable = new Label(node);
 
     return variable;
   }
 
   static fromJSONAndFileContext(json, fileContext) {
-    const labelString = json, ///
+    const metavariableString = json, ///
           lexer  = fileContext.getLexer(),
           parser = fileContext.getParser(),
-          labelNode = labelNodeFromLabelString(labelString, lexer, parser),
-          node = labelNode, ///
+          metavariableNode = metavariableNodeFromMetavariableString(metavariableString, lexer, parser),
+          node = metavariableNode, ///
           label = new Label(node);
 
     return label;

package/src/metaLemmaMetatheorem.js

@@ -32,19 +32,6 @@ export default class MetaLemmaMetatheorem {
     return this.localContext;
   }
 
-  matchLabelNode(labelNode) {
-    const labelNodeMatches = this.labels.some((label) => {
-      const node = labelNode, ///
-            labelMatchesNode = label.matchNode(node);
-
-      if (labelMatchesNode) {
-        return true;
-      }
-    });
-
-    return labelNodeMatches;
-  }
-
   matchMetastatement(metastatementNode, metastatementLocalContext) {
     let metastatementNatches;
 
@@ -79,6 +66,19 @@ export default class MetaLemmaMetatheorem {
     return metastatementNatches;
   }
 
+  matchLabelMetavariableNode(labelMetavariableNode) {
+    const labelMetavariableNodeMatches = this.labels.some((label) => {
+      const node = labelMetavariableNode, ///
+            labelMatchesNode = label.matchNode(node);
+
+      if (labelMatchesNode) {
+        return true;
+      }
+    });
+
+    return labelMetavariableNodeMatches;
+  }
+
   toJSON(tokens) {
     const labelsJSON = this.labels.map((label) => {
             const labelJSON = label.toJSON(tokens);

package/src/mixins/context.js

@@ -26,25 +26,25 @@ function getConstructors() { return this.context.getConstructors(); }
 
 function findTypeByTypeName(typeName) { return this.context.findTypeByTypeName(typeName); }
 
-function findTypeByTypeNode(labelNode) { return this.context.findTypeByTypeNode(labelNode); }
+function findTypeByTypeNode(labelMetavariableNode) { return this.context.findTypeByTypeNode(labelMetavariableNode); }
 
-function findLabelByLabelNode(labelNode) { return this.context.findLabelByLabelNode(labelNode); }
+function isTypePresentByTypeName(typeName) { return this.context.isTypePresentByTypeName(typeName); }
 
-function findRuleByLabelNode(labelNode) { return this.context.findRuleByLabelNode(labelNode); }
+function isTypePresentByTypeNode(typeNode) { return this.context.isTypePresentByTypeNode(typeNode); }
 
-function findAxiomByLabelNode(labelNode) { return this.context.findAxiomByLabelNode(labelNode); }
+function findLabelByLabelMetavariableNode(labelMetavariableNode) { return this.context.findLabelByLabelMetavariableNode(labelMetavariableNode); }
 
-function findLemmaByLabelNode(labelNode) { return this.context.findLemmaByLabelNode(labelNode); }
+function findRuleByLabelMetavariableNode(labelMetavariableNode) { return this.context.findRuleByLabelMetavariableNode(labelMetavariableNode); }
 
-function findTheoremByLabelNode(labelNode) { return this.context.findTheoremByLabelNode(labelNode); }
+function findAxiomByLabelMetavariableNode(labelMetavariableNode) { return this.context.findAxiomByLabelMetavariableNode(labelMetavariableNode); }
 
-function findConjectureByLabelNode(labelNode) { return this.context.findConjectureByLabelNode(labelNode); }
+function findLemmaByLabelMetavariableNode(labelMetavariableNode) { return this.context.findLemmaByLabelMetavariableNode(labelMetavariableNode); }
 
-function isTypePresentByTypeName(typeName) { return this.context.isTypePresentByTypeName(typeName); }
+function findTheoremByLabelMetavariableNode(labelMetavariableNode) { return this.context.findTheoremByLabelMetavariableNode(labelMetavariableNode); }
 
-function isTypePresentByTypeNode(typeNode) { return this.context.isTypePresentByTypeNode(typeNode); }
+function findConjectureByLabelMetavariableNode(labelMetavariableNode) { return this.context.findConjectureByLabelMetavariableNode(labelMetavariableNode); }
 
-function isLabelPresentByLabelNode(labelNode) { return this.context.isLabelPresentByLabelNode(labelNode); }
+function isLabelPresentByLabelMetavariableNode(labelMetavariableNode) { return this.context.isLabelPresentByLabelMetavariableNode(labelMetavariableNode); }
 
 function nodeAsString(node) { return this.context.nodeAsString(node); }
 
@@ -65,15 +65,15 @@ const contextMixins = {
   getConstructors,
   findTypeByTypeName,
   findTypeByTypeNode,
-  findLabelByLabelNode,
-  findRuleByLabelNode,
-  findAxiomByLabelNode,
-  findLemmaByLabelNode,
-  findTheoremByLabelNode,
-  findConjectureByLabelNode,
   isTypePresentByTypeName,
   isTypePresentByTypeNode,
-  isLabelPresentByLabelNode,
+  findLabelByLabelMetavariableNode,
+  findRuleByLabelMetavariableNode,
+  findAxiomByLabelMetavariableNode,
+  findLemmaByLabelMetavariableNode,
+  findTheoremByLabelMetavariableNode,
+  findConjectureByLabelMetavariableNode,
+  isLabelPresentByLabelMetavariableNode,
   nodeAsString,
   nodesAsString
 };

package/src/premise.js

@@ -2,7 +2,7 @@
 
 import LocalContext from "./context/local";
 import metaLevelNodesVerifier from "./verifier/nodes/metaLevel";
-import metaLevelToIntrinsicLevelNodesVerifier from "./verifier/nodes/metaLevelToIntrinsicLevel";
+import intrinsicLevelAgainstMetaLevelNodesVerifier from "./verifier/nodes/intrinsicLevelAgainstMetaLevel";
 
 import { match } from "./utilities/array";
 import { nodeAsString } from "./utilities/string";
@@ -48,7 +48,7 @@ export default class Premise {
                 fileContextA = fileContext, ///
                 localContextA = LocalContext.fromFileContext(fileContextA),
                 localContextB = statementLocalContext,  ///
-                nonTerminalNodeVerified = metaLevelToIntrinsicLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
+                nonTerminalNodeVerified = intrinsicLevelAgainstMetaLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
                   const verifiedAhead = true;
 
                   return verifiedAhead;
@@ -70,7 +70,7 @@ export default class Premise {
           fileContextA = fileContext, ///
           localContextA = LocalContext.fromFileContext(fileContextA),
           localContextB = statementLocalContext,  ///
-          nonTerminalNodeVerified = metaLevelToIntrinsicLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
+          nonTerminalNodeVerified = intrinsicLevelAgainstMetaLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
             const verifiedAhead = true;
 
             return verifiedAhead;

package/src/rule.js

@@ -31,19 +31,6 @@ export default class Rule {
     return this.fileContext;
   }
 
-  matchLabelNode(labelNode) {
-    const labelNodeMatches = this.labels.some((label) => {
-      const node = labelNode, ///
-            labelMatchesNode = label.matchNode(node);
-
-      if (labelMatchesNode) {
-        return true;
-      }
-    });
-
-    return labelNodeMatches;
-  }
-
   matchStatement(statementNode, statementLocalContext) {
     let statementNatches;
 
@@ -112,6 +99,19 @@ export default class Rule {
     return metastatementNatches;
   }
 
+  matchLabelMetavariableNode(labelMetavariableNode) {
+    const labelMetavariableNodeMatches = this.labels.some((label) => {
+      const node = labelMetavariableNode, ///
+            labelMatchesNode = label.matchNode(node);
+
+      if (labelMatchesNode) {
+        return true;
+      }
+    });
+
+    return labelMetavariableNodeMatches;
+  }
+
   toJSON(tokens) {
     const labelsJSON = this.labels.map((label) => {
             const labelJSON = label.toJSON(tokens);

package/src/ruleNames.js

@@ -1,14 +1,7 @@
 "use strict";
 
-export const TERM_RULE_NAME = "term";
-export const TYPE_RULE_NAME = "type";
-export const LABEL_RULE_NAME = "label";
-export const VARIABLE_RULE_NAME = "variable";
-export const ARGUMENT_RULE_NAME = "argument";
 export const SUBPROOF_RULE_NAME = "subproof";
-export const STATEMENT_RULE_NAME = "statement";
 export const METAVARIABLE_RULE_NAME = "metavariable";
-export const METASTATEMENT_RULE_NAME = "metastatement";
 export const RULE_SUBPROOF_RULE_NAME = "ruleSubproof";
 export const META_SUBPROOF_RULE_NAME = "metaSubproof";
 export const META_ARGUMENT_RULE_NAME = "metaArgument";