occam-verify-cli 0.0.527 → 0.0.529

package/lib/verify/type.js

@@ -17,12 +17,9 @@ function _interopRequireDefault(obj) {
 }
 function verifyType(typeNode, superTypeNode, fileContext) {
     var typeVerified = false;
-    fileContext.begin(typeNode);
-    var typeString = fileContext.nodeAsString(typeNode);
-    fileContext.debug("Verifying the '".concat(typeString, "' type..."));
-    var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
+    var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typeString = fileContext.nodeAsString(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
     if (typePresent) {
-        fileContext.error("The type '".concat(typeName, "' is already present."));
+        fileContext.error("The type '".concat(typeName, "' is already present."), typeNode);
     } else {
         var type;
         var superTypeName = (0, _query.typeNameFromTypeNode)(superTypeNode);
@@ -31,7 +28,7 @@ function verifyType(typeNode, superTypeNode, fileContext) {
         } else {
             var superType = fileContext.findTypeByTypeName(superTypeName);
             if (superType === null) {
-                fileContext.error("The super-type '".concat(superTypeName, "' is missing."));
+                fileContext.error("The super-type '".concat(superTypeName, "' is not present."), typeNode);
             } else {
                 type = _type.default.fromTypeNameAndSuperType(typeName, superType);
             }
@@ -42,10 +39,9 @@ function verifyType(typeNode, superTypeNode, fileContext) {
         }
     }
     if (typeVerified) {
-        fileContext.info("Verified the '".concat(typeString, "' type."));
+        fileContext.info("Verified the '".concat(typeString, "' type."), typeNode);
     }
-    typeVerified ? fileContext.complete(typeNode) : fileContext.halt(typeNode);
     return typeVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgdHlwZU5hbWVGcm9tVHlwZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVR5cGUodHlwZU5vZGUsIHN1cGVyVHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0eXBlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBmaWxlQ29udGV4dC5iZWdpbih0eXBlTm9kZSk7XG5cbiAgY29uc3QgdHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgZmlsZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuLi5gKTtcblxuICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgdHlwZVByZXNlbnQgPSBmaWxlQ29udGV4dC5pc1R5cGVQcmVzZW50QnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgaWYgKHR5cGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSB0eXBlICcke3R5cGVOYW1lfScgaXMgYWxyZWFkeSBwcmVzZW50LmApO1xuICB9IGVsc2Uge1xuICAgIGxldCB0eXBlO1xuXG4gICAgY29uc3Qgc3VwZXJUeXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHN1cGVyVHlwZU5vZGUpO1xuXG4gICAgaWYgKHN1cGVyVHlwZU5hbWUgPT09IG51bGwpIHtcbiAgICAgIHR5cGUgPSBUeXBlLmZyb21UeXBlTmFtZSh0eXBlTmFtZSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IHN1cGVyVHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTmFtZShzdXBlclR5cGVOYW1lKTtcblxuICAgICAgaWYgKHN1cGVyVHlwZSA9PT0gbnVsbCkge1xuICAgICAgICBmaWxlQ29udGV4dC5lcnJvcihgVGhlIHN1cGVyLXR5cGUgJyR7c3VwZXJUeXBlTmFtZX0nIGlzIG1pc3NpbmcuYCk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWVBbmRTdXBlclR5cGUodHlwZU5hbWUsIHN1cGVyVHlwZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgIGZpbGVDb250ZXh0LmFkZFR5cGUodHlwZSk7XG5cbiAgICAgIHR5cGVWZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgaWYgKHR5cGVWZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmluZm8oYFZlcmlmaWVkIHRoZSAnJHt0eXBlU3RyaW5nfScgdHlwZS5gKTtcbiAgfVxuXG4gIHR5cGVWZXJpZmllZCA/XG4gICAgZmlsZUNvbnRleHQuY29tcGxldGUodHlwZU5vZGUpOlxuICAgICAgZmlsZUNvbnRleHQuaGFsdCh0eXBlTm9kZSk7XG5cbiAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUeXBlIiwidHlwZU5vZGUiLCJzdXBlclR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0eXBlVmVyaWZpZWQiLCJiZWdpbiIsInR5cGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJkZWJ1ZyIsInR5cGVOYW1lIiwidHlwZU5hbWVGcm9tVHlwZU5vZGUiLCJ0eXBlUHJlc2VudCIsImlzVHlwZVByZXNlbnRCeVR5cGVOYW1lIiwiZXJyb3IiLCJ0eXBlIiwic3VwZXJUeXBlTmFtZSIsIlR5cGUiLCJmcm9tVHlwZU5hbWUiLCJzdXBlclR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJmcm9tVHlwZU5hbWVBbmRTdXBlclR5cGUiLCJhZGRUeXBlIiwiaW5mbyIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBTUE7OztlQUF3QkE7Ozt5REFKUDtxQkFFb0I7Ozs7OztBQUV0QixTQUFTQSxXQUFXQyxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsV0FBVyxFQUFFO0lBQ3ZFLElBQUlDLGVBQWUsS0FBSztJQUV4QkQsWUFBWUUsS0FBSyxDQUFDSjtJQUVsQixJQUFNSyxhQUFhSCxZQUFZSSxZQUFZLENBQUNOO0lBRTVDRSxZQUFZSyxLQUFLLENBQUMsQUFBQyxrQkFBNEIsT0FBWEYsWUFBVztJQUUvQyxJQUFNRyxXQUFXQyxJQUFBQSwyQkFBb0IsRUFBQ1QsV0FDaENVLGNBQWNSLFlBQVlTLHVCQUF1QixDQUFDSDtJQUV4RCxJQUFJRSxhQUFhO1FBQ2ZSLFlBQVlVLEtBQUssQ0FBQyxBQUFDLGFBQXFCLE9BQVRKLFVBQVM7SUFDMUMsT0FBTztRQUNMLElBQUlLO1FBRUosSUFBTUMsZ0JBQWdCTCxJQUFBQSwyQkFBb0IsRUFBQ1I7UUFFM0MsSUFBSWEsa0JBQWtCLElBQUksRUFBRTtZQUMxQkQsT0FBT0UsYUFBSSxDQUFDQyxZQUFZLENBQUNSO1FBQzNCLE9BQU87WUFDTCxJQUFNUyxZQUFZZixZQUFZZ0Isa0JBQWtCLENBQUNKO1lBRWpELElBQUlHLGNBQWMsSUFBSSxFQUFFO2dCQUN0QmYsWUFBWVUsS0FBSyxDQUFDLEFBQUMsbUJBQWdDLE9BQWRFLGVBQWM7WUFDckQsT0FBTztnQkFDTEQsT0FBT0UsYUFBSSxDQUFDSSx3QkFBd0IsQ0FBQ1gsVUFBVVM7WUFDakQsQ0FBQztRQUNILENBQUM7UUFFRCxJQUFJSixTQUFTLElBQUksRUFBRTtZQUNqQlgsWUFBWWtCLE9BQU8sQ0FBQ1A7WUFFcEJWLGVBQWUsSUFBSTtRQUNyQixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlBLGNBQWM7UUFDaEJELFlBQVltQixJQUFJLENBQUMsQUFBQyxpQkFBMkIsT0FBWGhCLFlBQVc7SUFDL0MsQ0FBQztJQUVERixlQUNFRCxZQUFZb0IsUUFBUSxDQUFDdEIsWUFDbkJFLFlBQVlxQixJQUFJLENBQUN2QixTQUFTO0lBRTlCLE9BQU9HO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgdHlwZU5hbWVGcm9tVHlwZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVR5cGUodHlwZU5vZGUsIHN1cGVyVHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0eXBlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgdHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSksXG4gICAgICAgIHR5cGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNUeXBlUHJlc2VudEJ5VHlwZU5hbWUodHlwZU5hbWUpO1xuXG4gIGlmICh0eXBlUHJlc2VudCkge1xuICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgdHlwZSAnJHt0eXBlTmFtZX0nIGlzIGFscmVhZHkgcHJlc2VudC5gLCB0eXBlTm9kZSk7XG4gIH0gZWxzZSB7XG4gICAgbGV0IHR5cGU7XG5cbiAgICBjb25zdCBzdXBlclR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUoc3VwZXJUeXBlTm9kZSk7XG5cbiAgICBpZiAoc3VwZXJUeXBlTmFtZSA9PT0gbnVsbCkge1xuICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lKHR5cGVOYW1lKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3Qgc3VwZXJUeXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOYW1lKHN1cGVyVHlwZU5hbWUpO1xuXG4gICAgICBpZiAoc3VwZXJUeXBlID09PSBudWxsKSB7XG4gICAgICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgc3VwZXItdHlwZSAnJHtzdXBlclR5cGVOYW1lfScgaXMgbm90IHByZXNlbnQuYCwgdHlwZU5vZGUpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlKHR5cGVOYW1lLCBzdXBlclR5cGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRUeXBlKHR5cGUpO1xuXG4gICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh0eXBlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCwgdHlwZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUeXBlIiwidHlwZU5vZGUiLCJzdXBlclR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0eXBlVmVyaWZpZWQiLCJ0eXBlTmFtZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwidHlwZVN0cmluZyIsIm5vZGVBc1N0cmluZyIsInR5cGVQcmVzZW50IiwiaXNUeXBlUHJlc2VudEJ5VHlwZU5hbWUiLCJlcnJvciIsInR5cGUiLCJzdXBlclR5cGVOYW1lIiwiVHlwZSIsImZyb21UeXBlTmFtZSIsInN1cGVyVHlwZSIsImZpbmRUeXBlQnlUeXBlTmFtZSIsImZyb21UeXBlTmFtZUFuZFN1cGVyVHlwZSIsImFkZFR5cGUiLCJpbmZvIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXdCQTs7O3lEQUpQO3FCQUVvQjs7Ozs7O0FBRXRCLFNBQVNBLFdBQVdDLFFBQVEsRUFBRUMsYUFBYSxFQUFFQyxXQUFXLEVBQUU7SUFDdkUsSUFBSUMsZUFBZSxLQUFLO0lBRXhCLElBQU1DLFdBQVdDLElBQUFBLDJCQUFvQixFQUFDTCxXQUNoQ00sYUFBYUosWUFBWUssWUFBWSxDQUFDUCxXQUN0Q1EsY0FBY04sWUFBWU8sdUJBQXVCLENBQUNMO0lBRXhELElBQUlJLGFBQWE7UUFDZk4sWUFBWVEsS0FBSyxDQUFDLEFBQUMsYUFBcUIsT0FBVE4sVUFBUywwQkFBd0JKO0lBQ2xFLE9BQU87UUFDTCxJQUFJVztRQUVKLElBQU1DLGdCQUFnQlAsSUFBQUEsMkJBQW9CLEVBQUNKO1FBRTNDLElBQUlXLGtCQUFrQixJQUFJLEVBQUU7WUFDMUJELE9BQU9FLGFBQUksQ0FBQ0MsWUFBWSxDQUFDVjtRQUMzQixPQUFPO1lBQ0wsSUFBTVcsWUFBWWIsWUFBWWMsa0JBQWtCLENBQUNKO1lBRWpELElBQUlHLGNBQWMsSUFBSSxFQUFFO2dCQUN0QmIsWUFBWVEsS0FBSyxDQUFDLEFBQUMsbUJBQWdDLE9BQWRFLGVBQWMsc0JBQW9CWjtZQUN6RSxPQUFPO2dCQUNMVyxPQUFPRSxhQUFJLENBQUNJLHdCQUF3QixDQUFDYixVQUFVVztZQUNqRCxDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUlKLFNBQVMsSUFBSSxFQUFFO1lBQ2pCVCxZQUFZZ0IsT0FBTyxDQUFDUDtZQUVwQlIsZUFBZSxJQUFJO1FBQ3JCLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsY0FBYztRQUNoQkQsWUFBWWlCLElBQUksQ0FBQyxBQUFDLGlCQUEyQixPQUFYYixZQUFXLFlBQVVOO0lBQ3pELENBQUM7SUFFRCxPQUFPRztBQUNUIn0=

package/lib/verify/variable.js

@@ -18,12 +18,9 @@ function _interopRequireDefault(obj) {
 }
 function verifyVariable(variableNode, typeNode, fileContext) {
     var variableVerified = false;
-    fileContext.begin(variableNode);
-    var variableString = fileContext.nodeAsString(variableNode);
-    fileContext.debug("Verifying the '".concat(variableString, "' variable..."));
-    var variableName = (0, _query.variableNameFromVariableNode)(variableNode), variablePresent = fileContext.isVariablePresentByVariableName(variableName);
+    var variableName = (0, _query.variableNameFromVariableNode)(variableNode), variableString = fileContext.nodeAsString(variableNode), variablePresent = fileContext.isVariablePresentByVariableName(variableName);
     if (variablePresent) {
-        fileContext.error("The variable '".concat(variableName, "' is already present."));
+        fileContext.error("The variable '".concat(variableName, "' is already present."), variableNode);
     } else {
         var variable;
         var typeName = (0, _query.typeNameFromTypeNode)(typeNode);
@@ -33,7 +30,7 @@ function verifyVariable(variableNode, typeNode, fileContext) {
         } else {
             var type1 = fileContext.findTypeByTypeName(typeName);
             if (type1 === null) {
-                fileContext.error("The '".concat(variableName, "' variable's '").concat(typeName, "' type is missing."));
+                fileContext.error("The '".concat(variableName, "' variable's '").concat(typeName, "' type is not present."), variableNode);
             } else {
                 var name1 = variableName; ///
                 variable = _variable.default.fromTypeAndName(type1, name1);
@@ -45,10 +42,9 @@ function verifyVariable(variableNode, typeNode, fileContext) {
         }
     }
     if (variableVerified) {
-        fileContext.info("Verified the '".concat(variableString, "' variable."));
+        fileContext.info("Verified the '".concat(variableString, "' variable."), variableNode);
     }
-    variableVerified ? fileContext.complete(variableNode) : fileContext.halt(variableNode);
     return variableVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgb2JqZWN0VHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSwgdmFyaWFibGVOYW1lRnJvbVZhcmlhYmxlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCB0eXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHZhcmlhYmxlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBmaWxlQ29udGV4dC5iZWdpbih2YXJpYWJsZU5vZGUpO1xuXG4gIGNvbnN0IHZhcmlhYmxlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHZhcmlhYmxlTm9kZSk7XG5cbiAgZmlsZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZS4uLmApO1xuXG4gIGNvbnN0IHZhcmlhYmxlTmFtZSA9IHZhcmlhYmxlTmFtZUZyb21WYXJpYWJsZU5vZGUodmFyaWFibGVOb2RlKSxcbiAgICAgICAgdmFyaWFibGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTmFtZSh2YXJpYWJsZU5hbWUpO1xuXG4gIGlmICh2YXJpYWJsZVByZXNlbnQpIHtcbiAgICBmaWxlQ29udGV4dC5lcnJvcihgVGhlIHZhcmlhYmxlICcke3ZhcmlhYmxlTmFtZX0nIGlzIGFscmVhZHkgcHJlc2VudC5gKTtcbiAgfSBlbHNlIHtcbiAgICBsZXQgdmFyaWFibGU7XG5cbiAgICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKTtcbiAgICBcbiAgICBpZiAodHlwZU5hbWUgPT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHR5cGUgPSBvYmplY3RUeXBlLFxuICAgICAgICAgICAgbmFtZSA9IHZhcmlhYmxlTmFtZTsgIC8vL1xuXG4gICAgICB2YXJpYWJsZSA9IFZhcmlhYmxlLmZyb21UeXBlQW5kTmFtZSh0eXBlLCBuYW1lKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgICAgIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgJyR7dmFyaWFibGVOYW1lfScgdmFyaWFibGUncyAnJHt0eXBlTmFtZX0nIHR5cGUgaXMgbWlzc2luZy5gKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIGNvbnN0IG5hbWUgPSB2YXJpYWJsZU5hbWU7ICAvLy9cblxuICAgICAgICB2YXJpYWJsZSA9IFZhcmlhYmxlLmZyb21UeXBlQW5kTmFtZSh0eXBlLCBuYW1lKTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICBpZiAodmFyaWFibGUgIT09IG51bGwpIHtcbiAgICAgIGZpbGVDb250ZXh0LmFkZFZhcmlhYmxlKHZhcmlhYmxlKTtcblxuICAgICAgdmFyaWFibGVWZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgaWYgKHZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZS5gKTtcbiAgfVxuXG4gIHZhcmlhYmxlVmVyaWZpZWQgP1xuICAgIGZpbGVDb250ZXh0LmNvbXBsZXRlKHZhcmlhYmxlTm9kZSkgOlxuICAgICAgZmlsZUNvbnRleHQuaGFsdCh2YXJpYWJsZU5vZGUpO1xuXG4gIHJldHVybiB2YXJpYWJsZVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVZhcmlhYmxlIiwidmFyaWFibGVOb2RlIiwidHlwZU5vZGUiLCJmaWxlQ29udGV4dCIsInZhcmlhYmxlVmVyaWZpZWQiLCJiZWdpbiIsInZhcmlhYmxlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJ2YXJpYWJsZU5hbWUiLCJ2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlIiwidmFyaWFibGVQcmVzZW50IiwiaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTmFtZSIsImVycm9yIiwidmFyaWFibGUiLCJ0eXBlTmFtZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwidHlwZSIsIm9iamVjdFR5cGUiLCJuYW1lIiwiVmFyaWFibGUiLCJmcm9tVHlwZUFuZE5hbWUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJhZGRWYXJpYWJsZSIsImluZm8iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU9BOzs7ZUFBd0JBOzs7NkRBTEg7b0JBRU07cUJBQ3dDOzs7Ozs7QUFFcEQsU0FBU0EsZUFBZUMsWUFBWSxFQUFFQyxRQUFRLEVBQUVDLFdBQVcsRUFBRTtJQUMxRSxJQUFJQyxtQkFBbUIsS0FBSztJQUU1QkQsWUFBWUUsS0FBSyxDQUFDSjtJQUVsQixJQUFNSyxpQkFBaUJILFlBQVlJLFlBQVksQ0FBQ047SUFFaERFLFlBQVlLLEtBQUssQ0FBQyxBQUFDLGtCQUFnQyxPQUFmRixnQkFBZTtJQUVuRCxJQUFNRyxlQUFlQyxJQUFBQSxtQ0FBNEIsRUFBQ1QsZUFDNUNVLGtCQUFrQlIsWUFBWVMsK0JBQStCLENBQUNIO0lBRXBFLElBQUlFLGlCQUFpQjtRQUNuQlIsWUFBWVUsS0FBSyxDQUFDLEFBQUMsaUJBQTZCLE9BQWJKLGNBQWE7SUFDbEQsT0FBTztRQUNMLElBQUlLO1FBRUosSUFBTUMsV0FBV0MsSUFBQUEsMkJBQW9CLEVBQUNkO1FBRXRDLElBQUlhLGFBQWEsSUFBSSxFQUFFO1lBQ3JCLElBQU1FLE9BQU9DLGdCQUFVLEVBQ2pCQyxPQUFPVixjQUFlLEdBQUc7WUFFL0JLLFdBQVdNLGlCQUFRLENBQUNDLGVBQWUsQ0FBQ0osTUFBTUU7UUFDNUMsT0FBTztZQUNMLElBQU1GLFFBQU9kLFlBQVltQixrQkFBa0IsQ0FBQ1A7WUFFNUMsSUFBSUUsVUFBUyxJQUFJLEVBQUU7Z0JBQ2pCZCxZQUFZVSxLQUFLLENBQUMsQUFBQyxRQUFvQ0UsT0FBN0JOLGNBQWEsa0JBQXlCLE9BQVRNLFVBQVM7WUFDbEUsT0FBTztnQkFDTCxJQUFNSSxRQUFPVixjQUFlLEdBQUc7Z0JBRS9CSyxXQUFXTSxpQkFBUSxDQUFDQyxlQUFlLENBQUNKLE9BQU1FO1lBQzVDLENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSUwsYUFBYSxJQUFJLEVBQUU7WUFDckJYLFlBQVlvQixXQUFXLENBQUNUO1lBRXhCVixtQkFBbUIsSUFBSTtRQUN6QixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlBLGtCQUFrQjtRQUNwQkQsWUFBWXFCLElBQUksQ0FBQyxBQUFDLGlCQUErQixPQUFmbEIsZ0JBQWU7SUFDbkQsQ0FBQztJQUVERixtQkFDRUQsWUFBWXNCLFFBQVEsQ0FBQ3hCLGdCQUNuQkUsWUFBWXVCLElBQUksQ0FBQ3pCLGFBQWE7SUFFbEMsT0FBT0c7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgb2JqZWN0VHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSwgdmFyaWFibGVOYW1lRnJvbVZhcmlhYmxlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCB0eXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHZhcmlhYmxlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB2YXJpYWJsZU5hbWUgPSB2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSksXG4gICAgICAgIHZhcmlhYmxlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHZhcmlhYmxlTm9kZSksXG4gICAgICAgIHZhcmlhYmxlUHJlc2VudCA9IGZpbGVDb250ZXh0LmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lKTtcblxuICBpZiAodmFyaWFibGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSB2YXJpYWJsZSAnJHt2YXJpYWJsZU5hbWV9JyBpcyBhbHJlYWR5IHByZXNlbnQuYCwgdmFyaWFibGVOb2RlKTtcbiAgfSBlbHNlIHtcbiAgICBsZXQgdmFyaWFibGU7XG5cbiAgICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKTtcbiAgICBcbiAgICBpZiAodHlwZU5hbWUgPT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHR5cGUgPSBvYmplY3RUeXBlLFxuICAgICAgICAgICAgbmFtZSA9IHZhcmlhYmxlTmFtZTsgIC8vL1xuXG4gICAgICB2YXJpYWJsZSA9IFZhcmlhYmxlLmZyb21UeXBlQW5kTmFtZSh0eXBlLCBuYW1lKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgICAgIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgJyR7dmFyaWFibGVOYW1lfScgdmFyaWFibGUncyAnJHt0eXBlTmFtZX0nIHR5cGUgaXMgbm90IHByZXNlbnQuYCwgdmFyaWFibGVOb2RlKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIGNvbnN0IG5hbWUgPSB2YXJpYWJsZU5hbWU7ICAvLy9cblxuICAgICAgICB2YXJpYWJsZSA9IFZhcmlhYmxlLmZyb21UeXBlQW5kTmFtZSh0eXBlLCBuYW1lKTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICBpZiAodmFyaWFibGUgIT09IG51bGwpIHtcbiAgICAgIGZpbGVDb250ZXh0LmFkZFZhcmlhYmxlKHZhcmlhYmxlKTtcblxuICAgICAgdmFyaWFibGVWZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgaWYgKHZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZS5gLCB2YXJpYWJsZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHZhcmlhYmxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VmFyaWFibGUiLCJ2YXJpYWJsZU5vZGUiLCJ0eXBlTm9kZSIsImZpbGVDb250ZXh0IiwidmFyaWFibGVWZXJpZmllZCIsInZhcmlhYmxlTmFtZSIsInZhcmlhYmxlTmFtZUZyb21WYXJpYWJsZU5vZGUiLCJ2YXJpYWJsZVN0cmluZyIsIm5vZGVBc1N0cmluZyIsInZhcmlhYmxlUHJlc2VudCIsImlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUiLCJlcnJvciIsInZhcmlhYmxlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGUiLCJvYmplY3RUeXBlIiwibmFtZSIsIlZhcmlhYmxlIiwiZnJvbVR5cGVBbmROYW1lIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiYWRkVmFyaWFibGUiLCJpbmZvIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7OzZEQUxIO29CQUVNO3FCQUN3Qzs7Ozs7O0FBRXBELFNBQVNBLGVBQWVDLFlBQVksRUFBRUMsUUFBUSxFQUFFQyxXQUFXLEVBQUU7SUFDMUUsSUFBSUMsbUJBQW1CLEtBQUs7SUFFNUIsSUFBTUMsZUFBZUMsSUFBQUEsbUNBQTRCLEVBQUNMLGVBQzVDTSxpQkFBaUJKLFlBQVlLLFlBQVksQ0FBQ1AsZUFDMUNRLGtCQUFrQk4sWUFBWU8sK0JBQStCLENBQUNMO0lBRXBFLElBQUlJLGlCQUFpQjtRQUNuQk4sWUFBWVEsS0FBSyxDQUFDLEFBQUMsaUJBQTZCLE9BQWJOLGNBQWEsMEJBQXdCSjtJQUMxRSxPQUFPO1FBQ0wsSUFBSVc7UUFFSixJQUFNQyxXQUFXQyxJQUFBQSwyQkFBb0IsRUFBQ1o7UUFFdEMsSUFBSVcsYUFBYSxJQUFJLEVBQUU7WUFDckIsSUFBTUUsT0FBT0MsZ0JBQVUsRUFDakJDLE9BQU9aLGNBQWUsR0FBRztZQUUvQk8sV0FBV00saUJBQVEsQ0FBQ0MsZUFBZSxDQUFDSixNQUFNRTtRQUM1QyxPQUFPO1lBQ0wsSUFBTUYsUUFBT1osWUFBWWlCLGtCQUFrQixDQUFDUDtZQUU1QyxJQUFJRSxVQUFTLElBQUksRUFBRTtnQkFDakJaLFlBQVlRLEtBQUssQ0FBQyxBQUFDLFFBQW9DRSxPQUE3QlIsY0FBYSxrQkFBeUIsT0FBVFEsVUFBUywyQkFBeUJaO1lBQzNGLE9BQU87Z0JBQ0wsSUFBTWdCLFFBQU9aLGNBQWUsR0FBRztnQkFFL0JPLFdBQVdNLGlCQUFRLENBQUNDLGVBQWUsQ0FBQ0osT0FBTUU7WUFDNUMsQ0FBQztRQUNILENBQUM7UUFFRCxJQUFJTCxhQUFhLElBQUksRUFBRTtZQUNyQlQsWUFBWWtCLFdBQVcsQ0FBQ1Q7WUFFeEJSLG1CQUFtQixJQUFJO1FBQ3pCLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsa0JBQWtCO1FBQ3BCRCxZQUFZbUIsSUFBSSxDQUFDLEFBQUMsaUJBQStCLE9BQWZmLGdCQUFlLGdCQUFjTjtJQUNqRSxDQUFDO0lBRUQsT0FBT0c7QUFDVCJ9

package/package.json

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

package/src/axiom.js

@@ -7,7 +7,7 @@ import { AXIOM_KIND } from "./kinds";
 export default class Axiom extends AxiomLemmaTheoremConjecture {
   static kind = AXIOM_KIND;
 
-  static fromJSON(json, releaseContext) { return AxiomLemmaTheoremConjecture.fromJSON(Axiom, json, releaseContext); }
+  static fromJSON(json, lexer, parser) { return AxiomLemmaTheoremConjecture.fromJSON(Axiom, json, lexer, parser); }
 
   static fromLabelsSuppositionsAndConsequence(labels, suppositions, consequence) { return AxiomLemmaTheoremConjecture.fromLabelsSuppositionsAndConsequence(Axiom, labels, suppositions, consequence); }
 }

package/src/axiomLemmaTheoremConjecture.js

@@ -90,14 +90,14 @@ export default class AxiomLemmaTheoremConjecture {
     return json;
   }
 
-  static fromJSON(Class, json, releaseContext) {
+  static fromJSON(Class, json, lexer, parser) {
     let { labels } = json;
 
     const labelsJSON = labels;  ///
 
     labels = labelsJSON.map((labelJSON) => {
       const json = labelJSON, ///
-            label = Label.fromJSON(json, releaseContext);
+            label = Label.fromJSON(json, lexer, parser);
 
       return label;
     });
@@ -108,7 +108,7 @@ export default class AxiomLemmaTheoremConjecture {
 
     suppositions = suppositionsJSON.map((suppositionJSON) => {
       const json = suppositionJSON, ///
-            supposition = Supposition.fromJSON(json, releaseContext);
+            supposition = Supposition.fromJSON(json, lexer, parser);
 
       return supposition;
     });
@@ -119,7 +119,7 @@ export default class AxiomLemmaTheoremConjecture {
 
     json = consequenceJSON;  ///
 
-    consequence = Consequence.fromJSON(json, releaseContext);
+    consequence = Consequence.fromJSON(json, lexer, parser);
 
     return new Class(labels, suppositions, consequence);  ///
   }

package/src/combinator.js

@@ -2,7 +2,7 @@
 
 import { nodeAsString } from "./utilities/string";
 import { COMBINATOR_KIND } from "./kinds";
-import { statementNodeFromStatementString } from "./utilities/string";
+import { statementNodeFromStatementString } from "./utilities/node";
 
 export default class Combinator {
   constructor(statementNode) {
@@ -35,10 +35,10 @@ export default class Combinator {
     return json;
   }
 
-  static fromJSON(json, releaseContext) {
+  static fromJSON(json, lexer, parser) {
     const { statement } = json,
           statementString = statement,  ///
-          statementNode = statementNodeFromStatementString(statementString, releaseContext),
+          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
           combinator = new Combinator(statementNode);
 
     return combinator;

package/src/conclusion.js

@@ -1,9 +1,9 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { metastatementNodeFromMetastatementString } from "./utilities/string";
-import { conclusionStatementForMetavariableMatcher } from "./matcher/statementForMetavariable/conclusion";
-import { conclusionMetastatementForMetavariableMatcher } from "./matcher/metastatementForMetavariable/conclusion";
+import { metastatementNodeFromMetastatementString } from "./utilities/node";
+import { conclusionStatementForMetavariableVerifier } from "./verifier/statementForMetavariable/conclusion";
+import { conclusionMetastatementForMetavariableVerifier } from "./verifier/metastatementForMetavariable/conclusion";
 
 export default class Conclusion {
   constructor(metastatementNode) {
@@ -17,7 +17,7 @@ export default class Conclusion {
   matchStatementNode(statementNode, substitutions) {
     const nonTerminalNodeA = this.metastatementNode,  ///
           nonTerminalNodeB = statementNode,  ///
-          nonTerminalNodeMatches = conclusionStatementForMetavariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions),
+          nonTerminalNodeMatches = conclusionStatementForMetavariableVerifier.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions),
           statementNodeMatches = nonTerminalNodeMatches; ///
 
     return statementNodeMatches;
@@ -26,7 +26,7 @@ export default class Conclusion {
   matchMetastatementNode(metastatementNode, substitutions) {
     const nonTerminalNodeA = this.metastatementNode,  ///
           nonTerminalNodeB = metastatementNode,  ///
-          nonTerminalNodeMatches = conclusionMetastatementForMetavariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions),
+          nonTerminalNodeMatches = conclusionMetastatementForMetavariableVerifier.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions),
           metastatementNodeMatches = nonTerminalNodeMatches; ///
 
     return metastatementNodeMatches;
@@ -42,10 +42,10 @@ export default class Conclusion {
     return json;
   }
 
-  static fromJSON(json, releaseContext) {
+  static fromJSON(json, lexer, parser) {
     const { metastatement } = json,
           metastatementString = metastatement,  ///
-          metastatementNode = metastatementNodeFromMetastatementString(metastatementString, releaseContext),
+          metastatementNode = metastatementNodeFromMetastatementString(metastatementString, lexer, parser),
           conclusion = new Conclusion(metastatementNode);
 
     return conclusion;

package/src/conjecture.js

@@ -7,7 +7,7 @@ import { CONJECTURE_KIND } from "./kinds";
 export default class Conjecture extends AxiomLemmaTheoremConjecture {
   static kind = CONJECTURE_KIND;
 
-  static fromJSON(json, releaseContext) { return AxiomLemmaTheoremConjecture.fromJSON(Conjecture, json, releaseContext); }
+  static fromJSON(json, lexer, parser) { return AxiomLemmaTheoremConjecture.fromJSON(Conjecture, json, lexer, parser); }
 
   static fromLabelsSuppositionsAndConsequence(labels, suppositions, consequence) { return AxiomLemmaTheoremConjecture.fromLabelsSuppositionsAndConsequence(Conjecture, labels, suppositions, consequence); }
 }

package/src/consequence.js

@@ -1,8 +1,8 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { statementNodeFromStatementString } from "./utilities/string";
-import { consequenceTermForVariableMatcher } from "./matcher/termForVariable/consequence";
+import { statementNodeFromStatementString } from "./utilities/node";
+import { consequenceTermForVariableVerifier } from "./verifier/termForVariable/consequence";
 
 export default class Consequence {
   constructor(statementNode) {
@@ -16,7 +16,7 @@ export default class Consequence {
   matchStatementNode(statementNode, substitutions) {
     const nonTerminalNodeA = this.statementNode,  ///
           nonTerminalNodeB = statementNode,  ///
-          nonTerminalNodeMatches = consequenceTermForVariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions),
+          nonTerminalNodeMatches = consequenceTermForVariableVerifier.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions),
           statementNodeMatches = nonTerminalNodeMatches; ///
 
     return statementNodeMatches;
@@ -32,10 +32,10 @@ export default class Consequence {
     return json;
   }
 
-  static fromJSON(json, releaseContext) {
+  static fromJSON(json, lexer, parser) {
     const { statement } = json,
           statementString = statement,  ///
-          statementNode = statementNodeFromStatementString(statementString, releaseContext),
+          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
           consequence = new Consequence(statementNode);
 
     return consequence;

package/src/constants.js

@@ -2,9 +2,8 @@
 
 export const COMMA = ',';
 export const EMPTY_STRING = "";
-export const LEFT_BRACKET = "(";
-export const RIGHT_BRACKET = ")";
 export const EQUALITY_DEPTH = 2;
 export const MAXIMUM_INDEXES_LENGTH = 10;
+export const BRACKETED_STATEMENT_DEPTH = 2;
 export const MAXIMUM_PERMUTATION_LENGTH = 5;
-export const BRACKETED_CHILD_NODES_LENGTH = 3;
+export const BRACKETED_METASTATEMENT_DEPTH = 1;

package/src/constructor.js

@@ -4,7 +4,7 @@ import Type from "./type";
 
 import { nodeAsString } from "./utilities/string";
 import { CONSTRUCTOR_KIND } from "./kinds";
-import { termNodeFromTermString } from "./utilities/string";
+import { termNodeFromTermString } from "./utilities/node";
 
 export default class Constructor {
   constructor(termNode, type) {
@@ -54,10 +54,10 @@ export default class Constructor {
     return json;
   }
 
-  static fromJSON(json, releaseContext) {
+  static fromJSON(json, lexer, parser) {
     const { term } = json,
           termString = term,  ///
-          termNode = termNodeFromTermString(termString, releaseContext);
+          termNode = termNodeFromTermString(termString, lexer, parser);
 
     let { type } = json;
 
@@ -66,7 +66,7 @@ export default class Constructor {
 
       json = typeJSON;  ///
 
-      type = Type.fromJSON(json, releaseContext);
+      type = Type.fromJSON(json, lexer, parser);
 
       const typeName = type.getName();
 

package/src/context/file.js

@@ -4,7 +4,6 @@ import { rewriteNodes } from "occam-grammar-utilities";
 
 import { push } from "../utilities/array";
 import { nodeAsString, nodesAsString } from "../utilities/string";
-import { leastLineIndexFromNodeAndTokens, greatestLineIndexFromNodeAndTokens } from "../utilities/tokens";
 
 export default class FileContext {
   constructor(releaseContext, filePath, tokens, node, types, rules, axioms, lemmas, theorems, conjectures, combinators, constructors, variables, metavariables) {
@@ -12,7 +11,6 @@ export default class FileContext {
     this.filePath = filePath;
     this.tokens = tokens;
     this.node = node;
-
     this.types = types;
     this.rules = rules;
     this.axioms = axioms;
@@ -21,7 +19,6 @@ export default class FileContext {
     this.conjectures = conjectures;
     this.combinators = combinators;
     this.constructors = constructors;
-
     this.variables = variables;
     this.metavariables = metavariables;
   }
@@ -392,38 +389,17 @@ export default class FileContext {
     this.constructors.push(constructor);
   }
 
-  trace(message) { this.releaseContext.trace(message); }
-
-  debug(message) { this.releaseContext.debug(message); }
+  trace(message, node) { this.releaseContext.trace(message, node, this.tokens, this.filePath); }
 
-  info(message) { this.releaseContext.info(message); }
+  debug(message, node) { this.releaseContext.debug(message, node, this.tokens, this.filePath); }
 
-  warning(message) { this.releaseContext.warning(message); }
+  info(message, node) { this.releaseContext.info(message, node, this.tokens, this.filePath); }
 
-  error(message) { this.releaseContext.error(message); }
+  warning(message, node) { this.releaseContext.warning(message, node, this.tokens, this.filePath); }
 
-  fatal(message) { this.releaseContext.fatal(message); }
-
-  halt(node) {
-    const leastLineIndex = leastLineIndexFromNodeAndTokens(node, this.tokens),
-          greatestLineIndex = greatestLineIndexFromNodeAndTokens(node, this.tokens);
-
-    this.releaseContext.halt(this.filePath, leastLineIndex, greatestLineIndex);
-  }
+  error(message, node) { this.releaseContext.error(message, node, this.tokens, this.filePath); }
 
-  begin(node) {
-    const leastLineIndex = leastLineIndexFromNodeAndTokens(node, this.tokens),
-          greatestLineIndex = greatestLineIndexFromNodeAndTokens(node, this.tokens);
-
-    this.releaseContext.begin(this.filePath, leastLineIndex, greatestLineIndex);
-  }
-
-  complete(node) {
-    const leastLineIndex = leastLineIndexFromNodeAndTokens(node, this.tokens),
-          greatestLineIndex = greatestLineIndexFromNodeAndTokens(node, this.tokens);
-
-    this.releaseContext.complete(this.filePath, leastLineIndex, greatestLineIndex);
-  }
+  fatal(message, node) { this.releaseContext.fatal(message, node, this.tokens, this.filePath); }
 
   toJSON() {
     const json = [];

package/src/context/metaproof.js

@@ -2,7 +2,6 @@
 
 import fileMixins from "../mixins/file";
 import loggingMixins from "../mixins/logging";
-import callbacksMixins from "../mixins/callbacks";
 
 import { push, last } from "../utilities/array";
 
@@ -63,15 +62,19 @@ class MetaproofContext {
   }
 
   matchMetastatement(metastatementNode) {
-    let metastatementMatches;
+    let metastatementMatches = false;
 
-    metastatementMatches = this.metaproofSteps.some((metaproofStep) => {
-      metastatementMatches = metaproofStep.matchMetastatement(metastatementNode);
+    if (!metastatementMatches) {
+      const proofStepMatchesMetastatement = this.metaproofSteps.some((metaproofStep) => {
+        const proofStepMatchesMetastatement = metaproofStep.match(metastatementNode);
+
+        if (proofStepMatchesMetastatement) {
+          return true;
+        }
+      });
 
-      if (metastatementMatches) {
-        return true;
-      }
-    });
+      metastatementMatches = proofStepMatchesMetastatement; ///
+    }
 
     if (!metastatementMatches) {
       metastatementMatches = this.context.matchMetastatement(metastatementNode);
@@ -103,8 +106,9 @@ class MetaproofContext {
 
   static fromFileContext(fileContext) {
     const context = fileContext,  ///
+          metavariables = [],
           metaproofSteps = [],
-          metaproofContext = new MetaproofContext(context, metaproofSteps);
+          metaproofContext = new MetaproofContext(context, metavariables, metaproofSteps);
 
     return metaproofContext;
   }
@@ -122,6 +126,5 @@ class MetaproofContext {
 
 Object.assign(MetaproofContext.prototype, fileMixins);
 Object.assign(MetaproofContext.prototype, loggingMixins);
-Object.assign(MetaproofContext.prototype, callbacksMixins);
 
 export default MetaproofContext;

package/src/context/proof.js

@@ -3,7 +3,6 @@
 import Equality from "../equality";
 import fileMixins from "../mixins/file";
 import loggingMixins from "../mixins/logging";
-import callbacksMixins from "../mixins/callbacks";
 
 import { push, last } from "../utilities/array";
 import { MAXIMUM_INDEXES_LENGTH } from "../constants";
@@ -81,15 +80,19 @@ class ProofContext {
   }
 
   matchStatement(statementNode) {
-    let statementMatches;
+    let statementMatches = false;
 
-    statementMatches = this.proofSteps.some((proofStep) => {
-      statementMatches = proofStep.matchStatement(statementNode);
+    if (!statementMatches) {
+      const proofStepMatchesStatement = this.proofSteps.some((proofStep) => {
+        const proofStepMatchesStatement = proofStep.match(statementNode);
 
-      if (statementMatches) {
-        return true;
-      }
-    });
+        if (proofStepMatchesStatement) {
+          return true;
+        }
+      });
+
+      statementMatches = proofStepMatchesStatement; ///
+    }
 
     if (!statementMatches) {
       statementMatches = this.context.matchStatement(statementNode);
@@ -141,7 +144,6 @@ class ProofContext {
 
 Object.assign(ProofContext.prototype, fileMixins);
 Object.assign(ProofContext.prototype, loggingMixins);
-Object.assign(ProofContext.prototype, callbacksMixins);
 
 export default ProofContext;
 

package/src/context/release/directory.js

@@ -6,8 +6,8 @@ import { push } from "../../utilities/array";
 import { customGrammarFromNameAndEntries } from "../../utilities/customGrammar";
 
 export default class DirectoryReleaseContext extends ReleaseContext {
-  constructor(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, dependencyReleaseContexts, fileContexts) {
-    super(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, dependencyReleaseContexts);
+  constructor(log, name, entries, lexer, parser, verified, customGrammar, dependencyReleaseContexts, fileContexts) {
+    super(log, name, entries, lexer, parser, verified, customGrammar, dependencyReleaseContexts);
 
     this.fileContexts = fileContexts;
   }
@@ -237,14 +237,14 @@ export default class DirectoryReleaseContext extends ReleaseContext {
     return json;
   }
 
-  static fromLogNameEntriesAndCallbacks(log, name, entries, callbacks) {
-    const verified = false,
+  static fromLogNameAndEntries(log, name, entries) {
+    const lexer = null,
+          parser = null,
+          verified = false,
           customGrammar = customGrammarFromNameAndEntries(name, entries),
-          florenceLexer = null,
-          florenceParser = null,
           dependencyReleaseContexts = null,
           fileContexts = [],
-          directoryReleaseContext = new DirectoryReleaseContext(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, dependencyReleaseContexts, fileContexts);
+          directoryReleaseContext = new DirectoryReleaseContext(log, name, entries, lexer, parser, verified, customGrammar, dependencyReleaseContexts, fileContexts);
 
     return directoryReleaseContext;
   }