occam-verify-cli 0.0.455 → 0.0.457

package/lib/verify/type.js

@@ -19,11 +19,13 @@ function _interopRequireDefault(obj) {
 function verifyType(typeNode, superTypeNode, fileContext) {
     var typeVerified = false;
     fileContext.begin(typeNode);
-    var type = null;
+    var typeString = (0, _string.nodeAsString)(typeNode);
+    fileContext.debug("Verifying the '".concat(typeString, "' type..."));
     var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
     if (typePresent) {
         fileContext.error("The type '".concat(typeName, "' is already present."));
     } else {
+        var type;
         var superTypeName = (0, _query.typeNameFromTypeNode)(superTypeNode);
         if (superTypeName === null) {
             type = _type.default.fromTypeName(typeName);
@@ -35,17 +37,16 @@ function verifyType(typeNode, superTypeNode, fileContext) {
                 type = _type.default.fromTypeNameAndSuperType(typeName, superType);
             }
         }
-    }
-    if (type !== null) {
-        fileContext.addType(type);
-        typeVerified = true;
+        if (type !== null) {
+            fileContext.addType(type);
+            typeVerified = true;
+        }
     }
     if (typeVerified) {
-        var typeString = (0, _string.nodeAsString)(typeNode);
         fileContext.info("Verified the '".concat(typeString, "' type."));
     }
     typeVerified ? fileContext.complete(typeNode) : fileContext.halt(typeNode);
     return typeVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUeXBlKHR5cGVOb2RlLCBzdXBlclR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdHlwZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgZmlsZUNvbnRleHQuYmVnaW4odHlwZU5vZGUpO1xuXG4gIGxldCB0eXBlID0gbnVsbDtcblxuICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgdHlwZVByZXNlbnQgPSBmaWxlQ29udGV4dC5pc1R5cGVQcmVzZW50QnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgaWYgKHR5cGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSB0eXBlICcke3R5cGVOYW1lfScgaXMgYWxyZWFkeSBwcmVzZW50LmApO1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IHN1cGVyVHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZShzdXBlclR5cGVOb2RlKTtcblxuICAgIGlmIChzdXBlclR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWUodHlwZU5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdXBlclR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUoc3VwZXJUeXBlTmFtZSk7XG5cbiAgICAgIGlmIChzdXBlclR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSBzdXBlci10eXBlICcke3N1cGVyVHlwZU5hbWV9JyBpcyBtaXNzaW5nLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlKHR5cGVOYW1lLCBzdXBlclR5cGUpO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgZmlsZUNvbnRleHQuYWRkVHlwZSh0eXBlKTtcblxuICAgIHR5cGVWZXJpZmllZCA9IHRydWU7XG4gIH1cblxuICBpZiAodHlwZVZlcmlmaWVkKSB7XG4gICAgY29uc3QgdHlwZVN0cmluZyA9IG5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCk7XG4gIH1cblxuICB0eXBlVmVyaWZpZWQgP1xuICAgIGZpbGVDb250ZXh0LmNvbXBsZXRlKHR5cGVOb2RlKTpcbiAgICAgIGZpbGVDb250ZXh0LmhhbHQodHlwZU5vZGUpO1xuXG4gIHJldHVybiB0eXBlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VHlwZSIsInR5cGVOb2RlIiwic3VwZXJUeXBlTm9kZSIsImZpbGVDb250ZXh0IiwidHlwZVZlcmlmaWVkIiwiYmVnaW4iLCJ0eXBlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGVQcmVzZW50IiwiaXNUeXBlUHJlc2VudEJ5VHlwZU5hbWUiLCJlcnJvciIsInN1cGVyVHlwZU5hbWUiLCJUeXBlIiwiZnJvbVR5cGVOYW1lIiwic3VwZXJUeXBlIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlIiwiYWRkVHlwZSIsInR5cGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJpbmZvIiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7O3lEQUxQO3NCQUVZO3FCQUNROzs7Ozs7QUFFdEIsU0FBU0EsV0FBV0MsUUFBUSxFQUFFQyxhQUFhLEVBQUVDLFdBQVcsRUFBRTtJQUN2RSxJQUFJQyxlQUFlLEtBQUs7SUFFeEJELFlBQVlFLEtBQUssQ0FBQ0o7SUFFbEIsSUFBSUssT0FBTyxJQUFJO0lBRWYsSUFBTUMsV0FBV0MsSUFBQUEsMkJBQW9CLEVBQUNQLFdBQ2hDUSxjQUFjTixZQUFZTyx1QkFBdUIsQ0FBQ0g7SUFFeEQsSUFBSUUsYUFBYTtRQUNmTixZQUFZUSxLQUFLLENBQUMsQUFBQyxhQUFxQixPQUFUSixVQUFTO0lBQzFDLE9BQU87UUFDTCxJQUFNSyxnQkFBZ0JKLElBQUFBLDJCQUFvQixFQUFDTjtRQUUzQyxJQUFJVSxrQkFBa0IsSUFBSSxFQUFFO1lBQzFCTixPQUFPTyxhQUFJLENBQUNDLFlBQVksQ0FBQ1A7UUFDM0IsT0FBTztZQUNMLElBQU1RLFlBQVlaLFlBQVlhLGtCQUFrQixDQUFDSjtZQUVqRCxJQUFJRyxjQUFjLElBQUksRUFBRTtnQkFDdEJaLFlBQVlRLEtBQUssQ0FBQyxBQUFDLG1CQUFnQyxPQUFkQyxlQUFjO1lBQ3JELE9BQU87Z0JBQ0xOLE9BQU9PLGFBQUksQ0FBQ0ksd0JBQXdCLENBQUNWLFVBQVVRO1lBQ2pELENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlULFNBQVMsSUFBSSxFQUFFO1FBQ2pCSCxZQUFZZSxPQUFPLENBQUNaO1FBRXBCRixlQUFlLElBQUk7SUFDckIsQ0FBQztJQUVELElBQUlBLGNBQWM7UUFDaEIsSUFBTWUsYUFBYUMsSUFBQUEsb0JBQVksRUFBQ25CO1FBRWhDRSxZQUFZa0IsSUFBSSxDQUFDLEFBQUMsaUJBQTJCLE9BQVhGLFlBQVc7SUFDL0MsQ0FBQztJQUVEZixlQUNFRCxZQUFZbUIsUUFBUSxDQUFDckIsWUFDbkJFLFlBQVlvQixJQUFJLENBQUN0QixTQUFTO0lBRTlCLE9BQU9HO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUeXBlKHR5cGVOb2RlLCBzdXBlclR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdHlwZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgZmlsZUNvbnRleHQuYmVnaW4odHlwZU5vZGUpO1xuXG4gIGNvbnN0IHR5cGVTdHJpbmcgPSBub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3R5cGVTdHJpbmd9JyB0eXBlLi4uYCk7XG5cbiAgY29uc3QgdHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSksXG4gICAgICAgIHR5cGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNUeXBlUHJlc2VudEJ5VHlwZU5hbWUodHlwZU5hbWUpO1xuXG4gIGlmICh0eXBlUHJlc2VudCkge1xuICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgdHlwZSAnJHt0eXBlTmFtZX0nIGlzIGFscmVhZHkgcHJlc2VudC5gKTtcbiAgfSBlbHNlIHtcbiAgICBsZXQgdHlwZTtcblxuICAgIGNvbnN0IHN1cGVyVHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZShzdXBlclR5cGVOb2RlKTtcblxuICAgIGlmIChzdXBlclR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWUodHlwZU5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdXBlclR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUoc3VwZXJUeXBlTmFtZSk7XG5cbiAgICAgIGlmIChzdXBlclR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSBzdXBlci10eXBlICcke3N1cGVyVHlwZU5hbWV9JyBpcyBtaXNzaW5nLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlKHR5cGVOYW1lLCBzdXBlclR5cGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRUeXBlKHR5cGUpO1xuXG4gICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh0eXBlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCk7XG4gIH1cblxuICB0eXBlVmVyaWZpZWQgP1xuICAgIGZpbGVDb250ZXh0LmNvbXBsZXRlKHR5cGVOb2RlKTpcbiAgICAgIGZpbGVDb250ZXh0LmhhbHQodHlwZU5vZGUpO1xuXG4gIHJldHVybiB0eXBlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VHlwZSIsInR5cGVOb2RlIiwic3VwZXJUeXBlTm9kZSIsImZpbGVDb250ZXh0IiwidHlwZVZlcmlmaWVkIiwiYmVnaW4iLCJ0eXBlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJ0eXBlTmFtZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwidHlwZVByZXNlbnQiLCJpc1R5cGVQcmVzZW50QnlUeXBlTmFtZSIsImVycm9yIiwidHlwZSIsInN1cGVyVHlwZU5hbWUiLCJUeXBlIiwiZnJvbVR5cGVOYW1lIiwic3VwZXJUeXBlIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlIiwiYWRkVHlwZSIsImluZm8iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU9BOzs7ZUFBd0JBOzs7eURBTFA7c0JBRVk7cUJBQ1E7Ozs7OztBQUV0QixTQUFTQSxXQUFXQyxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsV0FBVyxFQUFFO0lBQ3ZFLElBQUlDLGVBQWUsS0FBSztJQUV4QkQsWUFBWUUsS0FBSyxDQUFDSjtJQUVsQixJQUFNSyxhQUFhQyxJQUFBQSxvQkFBWSxFQUFDTjtJQUVoQ0UsWUFBWUssS0FBSyxDQUFDLEFBQUMsa0JBQTRCLE9BQVhGLFlBQVc7SUFFL0MsSUFBTUcsV0FBV0MsSUFBQUEsMkJBQW9CLEVBQUNULFdBQ2hDVSxjQUFjUixZQUFZUyx1QkFBdUIsQ0FBQ0g7SUFFeEQsSUFBSUUsYUFBYTtRQUNmUixZQUFZVSxLQUFLLENBQUMsQUFBQyxhQUFxQixPQUFUSixVQUFTO0lBQzFDLE9BQU87UUFDTCxJQUFJSztRQUVKLElBQU1DLGdCQUFnQkwsSUFBQUEsMkJBQW9CLEVBQUNSO1FBRTNDLElBQUlhLGtCQUFrQixJQUFJLEVBQUU7WUFDMUJELE9BQU9FLGFBQUksQ0FBQ0MsWUFBWSxDQUFDUjtRQUMzQixPQUFPO1lBQ0wsSUFBTVMsWUFBWWYsWUFBWWdCLGtCQUFrQixDQUFDSjtZQUVqRCxJQUFJRyxjQUFjLElBQUksRUFBRTtnQkFDdEJmLFlBQVlVLEtBQUssQ0FBQyxBQUFDLG1CQUFnQyxPQUFkRSxlQUFjO1lBQ3JELE9BQU87Z0JBQ0xELE9BQU9FLGFBQUksQ0FBQ0ksd0JBQXdCLENBQUNYLFVBQVVTO1lBQ2pELENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSUosU0FBUyxJQUFJLEVBQUU7WUFDakJYLFlBQVlrQixPQUFPLENBQUNQO1lBRXBCVixlQUFlLElBQUk7UUFDckIsQ0FBQztJQUNILENBQUM7SUFFRCxJQUFJQSxjQUFjO1FBQ2hCRCxZQUFZbUIsSUFBSSxDQUFDLEFBQUMsaUJBQTJCLE9BQVhoQixZQUFXO0lBQy9DLENBQUM7SUFFREYsZUFDRUQsWUFBWW9CLFFBQVEsQ0FBQ3RCLFlBQ25CRSxZQUFZcUIsSUFBSSxDQUFDdkIsU0FBUztJQUU5QixPQUFPRztBQUNUIn0=

package/lib/verify/variable.js

@@ -19,11 +19,13 @@ function _interopRequireDefault(obj) {
 function verifyVariable(variableNode, typeNode, fileContext) {
     var variableVerified = false;
     fileContext.begin(variableNode);
-    var variable = null;
+    var variableString = (0, _string.nodeAsString)(variableNode);
+    fileContext.debug("Verifying the '".concat(variableString, "' variable..."));
     var variableName = (0, _query.variableNameFromVariableNode)(variableNode), variablePresent = fileContext.isVariablePresentByVariableName(variableName);
     if (variablePresent) {
         fileContext.error("The variable '".concat(variableName, "' is already present."));
     } else {
+        var variable;
         var typeName = (0, _query.typeNameFromTypeNode)(typeNode);
         if (typeName === null) {
             var type = null, name = variableName; ///
@@ -43,11 +45,10 @@ function verifyVariable(variableNode, typeNode, fileContext) {
         }
     }
     if (variableVerified) {
-        var variableString = (0, _string.nodeAsString)(variableNode);
         fileContext.info("Verified the '".concat(variableString, "' variable."));
     }
     variableVerified ? fileContext.complete(variableNode) : fileContext.halt(variableNode);
     return variableVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlLCB2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlWYXJpYWJsZSh2YXJpYWJsZU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGZpbGVDb250ZXh0LmJlZ2luKHZhcmlhYmxlTm9kZSk7XG5cbiAgbGV0IHZhcmlhYmxlID0gbnVsbDtcblxuICBjb25zdCB2YXJpYWJsZU5hbWUgPSB2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSksXG4gICAgICAgIHZhcmlhYmxlUHJlc2VudCA9IGZpbGVDb250ZXh0LmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lKTtcblxuICBpZiAodmFyaWFibGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSB2YXJpYWJsZSAnJHt2YXJpYWJsZU5hbWV9JyBpcyBhbHJlYWR5IHByZXNlbnQuYCk7XG4gIH0gZWxzZSB7XG4gICAgY29uc3QgdHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSk7XG4gICAgXG4gICAgaWYgKHR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICBjb25zdCB0eXBlID0gbnVsbCxcbiAgICAgICAgICAgIG5hbWUgPSB2YXJpYWJsZU5hbWU7ICAvLy9cblxuICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tVHlwZUFuZE5hbWUodHlwZSwgbmFtZSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IHR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUodHlwZU5hbWUpO1xuXG4gICAgICBpZiAodHlwZSA9PT0gbnVsbCkge1xuICAgICAgICBmaWxlQ29udGV4dC5lcnJvcihgVGhlICcke3ZhcmlhYmxlTmFtZX0nIHZhcmlhYmxlJ3MgJyR7dHlwZU5hbWV9JyB0eXBlIGlzIG1pc3NpbmcuYCk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBjb25zdCBuYW1lID0gdmFyaWFibGVOYW1lOyAgLy8vXG5cbiAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tVHlwZUFuZE5hbWUodHlwZSwgbmFtZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHZhcmlhYmxlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRWYXJpYWJsZSh2YXJpYWJsZSk7XG5cbiAgICAgIHZhcmlhYmxlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh2YXJpYWJsZVZlcmlmaWVkKSB7XG4gICAgY29uc3QgdmFyaWFibGVTdHJpbmcgPSBub2RlQXNTdHJpbmcodmFyaWFibGVOb2RlKTtcblxuICAgIGZpbGVDb250ZXh0LmluZm8oYFZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLmApO1xuICB9XG5cbiAgdmFyaWFibGVWZXJpZmllZCA/XG4gICAgZmlsZUNvbnRleHQuY29tcGxldGUodmFyaWFibGVOb2RlKSA6XG4gICAgICBmaWxlQ29udGV4dC5oYWx0KHZhcmlhYmxlTm9kZSk7XG5cbiAgcmV0dXJuIHZhcmlhYmxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VmFyaWFibGUiLCJ2YXJpYWJsZU5vZGUiLCJ0eXBlTm9kZSIsImZpbGVDb250ZXh0IiwidmFyaWFibGVWZXJpZmllZCIsImJlZ2luIiwidmFyaWFibGUiLCJ2YXJpYWJsZU5hbWUiLCJ2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlIiwidmFyaWFibGVQcmVzZW50IiwiaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTmFtZSIsImVycm9yIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGUiLCJuYW1lIiwiVmFyaWFibGUiLCJmcm9tVHlwZUFuZE5hbWUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJhZGRWYXJpYWJsZSIsInZhcmlhYmxlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiaW5mbyIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBT0E7OztlQUF3QkE7Ozs2REFMSDtzQkFFUTtxQkFDc0M7Ozs7OztBQUVwRCxTQUFTQSxlQUFlQyxZQUFZLEVBQUVDLFFBQVEsRUFBRUMsV0FBVyxFQUFFO0lBQzFFLElBQUlDLG1CQUFtQixLQUFLO0lBRTVCRCxZQUFZRSxLQUFLLENBQUNKO0lBRWxCLElBQUlLLFdBQVcsSUFBSTtJQUVuQixJQUFNQyxlQUFlQyxJQUFBQSxtQ0FBNEIsRUFBQ1AsZUFDNUNRLGtCQUFrQk4sWUFBWU8sK0JBQStCLENBQUNIO0lBRXBFLElBQUlFLGlCQUFpQjtRQUNuQk4sWUFBWVEsS0FBSyxDQUFDLEFBQUMsaUJBQTZCLE9BQWJKLGNBQWE7SUFDbEQsT0FBTztRQUNMLElBQU1LLFdBQVdDLElBQUFBLDJCQUFvQixFQUFDWDtRQUV0QyxJQUFJVSxhQUFhLElBQUksRUFBRTtZQUNyQixJQUFNRSxPQUFPLElBQUksRUFDWEMsT0FBT1IsY0FBZSxHQUFHO1lBRS9CRCxXQUFXVSxpQkFBUSxDQUFDQyxlQUFlLENBQUNILE1BQU1DO1FBQzVDLE9BQU87WUFDTCxJQUFNRCxRQUFPWCxZQUFZZSxrQkFBa0IsQ0FBQ047WUFFNUMsSUFBSUUsVUFBUyxJQUFJLEVBQUU7Z0JBQ2pCWCxZQUFZUSxLQUFLLENBQUMsQUFBQyxRQUFvQ0MsT0FBN0JMLGNBQWEsa0JBQXlCLE9BQVRLLFVBQVM7WUFDbEUsT0FBTztnQkFDTCxJQUFNRyxRQUFPUixjQUFlLEdBQUc7Z0JBRS9CRCxXQUFXVSxpQkFBUSxDQUFDQyxlQUFlLENBQUNILE9BQU1DO1lBQzVDLENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSVQsYUFBYSxJQUFJLEVBQUU7WUFDckJILFlBQVlnQixXQUFXLENBQUNiO1lBRXhCRixtQkFBbUIsSUFBSTtRQUN6QixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlBLGtCQUFrQjtRQUNwQixJQUFNZ0IsaUJBQWlCQyxJQUFBQSxvQkFBWSxFQUFDcEI7UUFFcENFLFlBQVltQixJQUFJLENBQUMsQUFBQyxpQkFBK0IsT0FBZkYsZ0JBQWU7SUFDbkQsQ0FBQztJQUVEaEIsbUJBQ0VELFlBQVlvQixRQUFRLENBQUN0QixnQkFDbkJFLFlBQVlxQixJQUFJLENBQUN2QixhQUFhO0lBRWxDLE9BQU9HO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlLCB2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlWYXJpYWJsZSh2YXJpYWJsZU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGZpbGVDb250ZXh0LmJlZ2luKHZhcmlhYmxlTm9kZSk7XG5cbiAgY29uc3QgdmFyaWFibGVTdHJpbmcgPSBub2RlQXNTdHJpbmcodmFyaWFibGVOb2RlKTtcblxuICBmaWxlQ29udGV4dC5kZWJ1ZyhgVmVyaWZ5aW5nIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLi4uYCk7XG5cbiAgY29uc3QgdmFyaWFibGVOYW1lID0gdmFyaWFibGVOYW1lRnJvbVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpLFxuICAgICAgICB2YXJpYWJsZVByZXNlbnQgPSBmaWxlQ29udGV4dC5pc1ZhcmlhYmxlUHJlc2VudEJ5VmFyaWFibGVOYW1lKHZhcmlhYmxlTmFtZSk7XG5cbiAgaWYgKHZhcmlhYmxlUHJlc2VudCkge1xuICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgdmFyaWFibGUgJyR7dmFyaWFibGVOYW1lfScgaXMgYWxyZWFkeSBwcmVzZW50LmApO1xuICB9IGVsc2Uge1xuICAgIGxldCB2YXJpYWJsZTtcblxuICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpO1xuICAgIFxuICAgIGlmICh0eXBlTmFtZSA9PT0gbnVsbCkge1xuICAgICAgY29uc3QgdHlwZSA9IG51bGwsXG4gICAgICAgICAgICBuYW1lID0gdmFyaWFibGVOYW1lOyAgLy8vXG5cbiAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVR5cGVBbmROYW1lKHR5cGUsIG5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCB0eXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOYW1lKHR5cGVOYW1lKTtcblxuICAgICAgaWYgKHR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSAnJHt2YXJpYWJsZU5hbWV9JyB2YXJpYWJsZSdzICcke3R5cGVOYW1lfScgdHlwZSBpcyBtaXNzaW5nLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgbmFtZSA9IHZhcmlhYmxlTmFtZTsgIC8vL1xuXG4gICAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVR5cGVBbmROYW1lKHR5cGUsIG5hbWUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh2YXJpYWJsZSAhPT0gbnVsbCkge1xuICAgICAgZmlsZUNvbnRleHQuYWRkVmFyaWFibGUodmFyaWFibGUpO1xuXG4gICAgICB2YXJpYWJsZVZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9XG4gIH1cblxuICBpZiAodmFyaWFibGVWZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmluZm8oYFZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLmApO1xuICB9XG5cbiAgdmFyaWFibGVWZXJpZmllZCA/XG4gICAgZmlsZUNvbnRleHQuY29tcGxldGUodmFyaWFibGVOb2RlKSA6XG4gICAgICBmaWxlQ29udGV4dC5oYWx0KHZhcmlhYmxlTm9kZSk7XG5cbiAgcmV0dXJuIHZhcmlhYmxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VmFyaWFibGUiLCJ2YXJpYWJsZU5vZGUiLCJ0eXBlTm9kZSIsImZpbGVDb250ZXh0IiwidmFyaWFibGVWZXJpZmllZCIsImJlZ2luIiwidmFyaWFibGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJkZWJ1ZyIsInZhcmlhYmxlTmFtZSIsInZhcmlhYmxlTmFtZUZyb21WYXJpYWJsZU5vZGUiLCJ2YXJpYWJsZVByZXNlbnQiLCJpc1ZhcmlhYmxlUHJlc2VudEJ5VmFyaWFibGVOYW1lIiwiZXJyb3IiLCJ2YXJpYWJsZSIsInR5cGVOYW1lIiwidHlwZU5hbWVGcm9tVHlwZU5vZGUiLCJ0eXBlIiwibmFtZSIsIlZhcmlhYmxlIiwiZnJvbVR5cGVBbmROYW1lIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiYWRkVmFyaWFibGUiLCJpbmZvIiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7OzZEQUxIO3NCQUVRO3FCQUNzQzs7Ozs7O0FBRXBELFNBQVNBLGVBQWVDLFlBQVksRUFBRUMsUUFBUSxFQUFFQyxXQUFXLEVBQUU7SUFDMUUsSUFBSUMsbUJBQW1CLEtBQUs7SUFFNUJELFlBQVlFLEtBQUssQ0FBQ0o7SUFFbEIsSUFBTUssaUJBQWlCQyxJQUFBQSxvQkFBWSxFQUFDTjtJQUVwQ0UsWUFBWUssS0FBSyxDQUFDLEFBQUMsa0JBQWdDLE9BQWZGLGdCQUFlO0lBRW5ELElBQU1HLGVBQWVDLElBQUFBLG1DQUE0QixFQUFDVCxlQUM1Q1Usa0JBQWtCUixZQUFZUywrQkFBK0IsQ0FBQ0g7SUFFcEUsSUFBSUUsaUJBQWlCO1FBQ25CUixZQUFZVSxLQUFLLENBQUMsQUFBQyxpQkFBNkIsT0FBYkosY0FBYTtJQUNsRCxPQUFPO1FBQ0wsSUFBSUs7UUFFSixJQUFNQyxXQUFXQyxJQUFBQSwyQkFBb0IsRUFBQ2Q7UUFFdEMsSUFBSWEsYUFBYSxJQUFJLEVBQUU7WUFDckIsSUFBTUUsT0FBTyxJQUFJLEVBQ1hDLE9BQU9ULGNBQWUsR0FBRztZQUUvQkssV0FBV0ssaUJBQVEsQ0FBQ0MsZUFBZSxDQUFDSCxNQUFNQztRQUM1QyxPQUFPO1lBQ0wsSUFBTUQsUUFBT2QsWUFBWWtCLGtCQUFrQixDQUFDTjtZQUU1QyxJQUFJRSxVQUFTLElBQUksRUFBRTtnQkFDakJkLFlBQVlVLEtBQUssQ0FBQyxBQUFDLFFBQW9DRSxPQUE3Qk4sY0FBYSxrQkFBeUIsT0FBVE0sVUFBUztZQUNsRSxPQUFPO2dCQUNMLElBQU1HLFFBQU9ULGNBQWUsR0FBRztnQkFFL0JLLFdBQVdLLGlCQUFRLENBQUNDLGVBQWUsQ0FBQ0gsT0FBTUM7WUFDNUMsQ0FBQztRQUNILENBQUM7UUFFRCxJQUFJSixhQUFhLElBQUksRUFBRTtZQUNyQlgsWUFBWW1CLFdBQVcsQ0FBQ1I7WUFFeEJWLG1CQUFtQixJQUFJO1FBQ3pCLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsa0JBQWtCO1FBQ3BCRCxZQUFZb0IsSUFBSSxDQUFDLEFBQUMsaUJBQStCLE9BQWZqQixnQkFBZTtJQUNuRCxDQUFDO0lBRURGLG1CQUNFRCxZQUFZcUIsUUFBUSxDQUFDdkIsZ0JBQ25CRSxZQUFZc0IsSUFBSSxDQUFDeEIsYUFBYTtJQUVsQyxPQUFPRztBQUNUIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.455",
+  "version": "0.0.457",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,9 +12,9 @@
   "dependencies": {
     "argumentative": "^2.0.21",
     "necessary": "^11.2.1",
-    "occam-custom-grammars": "^5.0.370",
+    "occam-custom-grammars": "^5.0.371",
     "occam-dom": "^3.0.171",
-    "occam-file-system": "^5.0.129",
+    "occam-file-system": "^5.0.130",
     "occam-grammar-utilities": "^7.0.66"
   },
   "devDependencies": {

package/src/axiom.js

@@ -5,30 +5,25 @@ import Label from "./label";
 import { AXIOM_KIND } from "./kinds";
 import { nodeAsString } from "./utilities/string";
 
-import { statementNodeFromStatementJSON } from "./utilities/node";
+import { unqualifiedStatementNodeFromUnqualifiedStatementString, indicativeConditionalNodeFromIndicativeConditionalString } from "./utilities/string";
 
 export default class Axiom {
-  constructor(labels, statementNode, suppositionStatementNodes, consequentStatementNode) {
+  constructor(labels, unqualifiedStatementNode, indicativeConditionalNode) {
     this.labels = labels;
-    this.statementNode = statementNode;
-    this.suppositionStatementNodes = suppositionStatementNodes;
-    this.consequentStatementNode = consequentStatementNode;
+    this.unqualifiedStatementNode = unqualifiedStatementNode;
+    this.indicativeConditionalNode = indicativeConditionalNode;
   }
 
   getLabels() {
     return this.labels;
   }
 
-  getStatementNode() {
-    return this.statementNode;
+  getUnqualifiedStatementNode() {
+    return this.unqualifiedStatementNode;
   }
 
-  getSuppositionStatementNodes() {
-    return this.suppositionStatementNodes;
-  }
-
-  getConsequentStatementNode() {
-    return this.consequentStatementNode;
+  getIndicativeConditionalNode() {
+    return this.indicativeConditionalNode;
   }
 
   matchLabelName(labelName) {
@@ -50,24 +45,17 @@ export default class Axiom {
 
             return labelJSON;
           }),
-          statementString = nodeAsString(this.statementNode),
-          consequentStatementString = nodeAsString(this.consequentStatementNode),
-          suppositionStatementStrings = this.suppositionStatementNodes.map((suppositionStatementNode) => {
-            const suppositionStatementString = nodeAsString(suppositionStatementNode);
-
-            return suppositionStatementString;
-          }),
+          unqualifiedStatementString = nodeAsString(this.unqalifiedStatementNode),
+          indicativeConditionalString = nodeAsString(this.indicativeConditionalNode),
           kind = AXIOM_KIND,
           labels = labelsJSON,  ///
-          statement = statementString,  ///
-          consequent = consequentStatementString, ///
-          suppositions = suppositionStatementStrings, ///
+          unqualifiedStatement = unqualifiedStatementString,  ///
+          indicativeConditional = indicativeConditionalString,  ///
           json = {
             kind,
             labels,
-            statement,
-            consequent,
-            suppositions
+            unqualifiedStatement,
+            indicativeConditional
           };
 
     return json;
@@ -85,45 +73,30 @@ export default class Axiom {
       return label;
     });
 
-    const { statement, suppositions, consequent } = json;
+    let { unqualifiedStatement, indicativeConditional } = json;
 
-    let axiom;
+    let unqualifiedStatementNode = null,
+        indicativeConditionalNode = null;
 
-    if (statement !== null) {
-      const statementJSON = statement,  ///
-            statementNode = statementNodeFromStatementJSON(statementJSON, releaseContext),
-            suppositionStatementNodes = null,
-            consequentStatementNode = null;
+    if (unqualifiedStatement !== null) {
+      const unqualifiedStatementString = unqualifiedStatement;  ///
 
-      axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
-    } else {
-      const statementNode = null,
-            suppositionStatementsJSON = suppositions,  ///
-            suppositionStatementNodes = suppositionStatementsJSON.map((suppositionStatementJSON) => {
-              const suppositionStatementNode = statementNodeFromStatementJSON(suppositionStatementJSON, releaseContext);
+      unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, releaseContext);
+    }
 
-              return suppositionStatementNode;
-            }),
-            consequentStatementJSON = consequent, ///
-            consequentStatementNode = statementNodeFromStatementJSON(consequentStatementJSON, releaseContext);
+    if (indicativeConditional !== null) {
+      const indicativeConditionalString = indicativeConditional;  ///
 
-      axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+      indicativeConditionalNode = indicativeConditionalNodeFromIndicativeConditionalString(indicativeConditionalString, releaseContext);
     }
 
-    return axiom;
-  }
-
-  static fromLabelsAndStatementNode(labels, statementNode) {
-    const suppositionStatementNodes = [],
-          consequentStatementNode = null,
-          axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+    const axiom = new Axiom(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return axiom;
   }
 
-  static fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode) {
-    const statementNode = null,
-          axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+  static fromLabelsUnqualifiedStatementNodeAndIndicativeConditionalNode(labels, unqualifiedStatementNode, indicativeConditionalNode) {
+    const axiom = new Axiom(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return axiom;
   }

package/src/combinator.js

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

package/src/conclusion.js

@@ -3,7 +3,7 @@
 import { first } from "./utilities/array";
 import { nodeAsString } from "./utilities/string";
 import { metavariableNameFromMetavariableNode } from "./utilities/query";
-import { metastatementNodeFromMetastatementJSON } from "./utilities/node";
+import { metastatementNodeFromMetastatementString } from "./utilities/string";
 import { METAVARIABLE_RULE_NAME, METASTATEMENT_RULE_NAME } from "./ruleNames";
 
 export default class Conclusion {
@@ -36,8 +36,8 @@ export default class Conclusion {
 
   static fromJSON(json, releaseContext) {
     const { metastatement } = json,
-          metastatementJSON = metastatement,  ///
-          metastatementNode = metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext),
+          metastatementString = metastatement,  ///
+          metastatementNode = metastatementNodeFromMetastatementString(metastatementString, releaseContext),
           conclusion = new Conclusion(metastatementNode);
 
     return conclusion;

package/src/constructor.js

@@ -4,7 +4,7 @@ import Type from "./type";
 
 import { nodeAsString } from "./utilities/string";
 import { CONSTRUCTOR_KIND } from "./kinds";
-import { termNodeFromTermJSON } from "./utilities/node";
+import { termNodeFromTermString } from "./utilities/string";
 
 export default class Constructor {
   constructor(termNode, type) {
@@ -56,8 +56,8 @@ export default class Constructor {
 
   static fromJSON(json, releaseContext) {
     const { term } = json,
-          termJSON = term,  ///
-          termNode = termNodeFromTermJSON(termJSON, releaseContext);
+          termString = term,  ///
+          termNode = termNodeFromTermString(termString, releaseContext);
 
     let { type } = json;
 

package/src/context/file.js

@@ -391,6 +391,12 @@ export default class FileContext {
       json.push(axiomJSON);
     });
 
+    this.lemmas.forEach((lemma) => {
+      const lemmaJSON = lemma.toJSON();
+
+      json.push(lemmaJSON);
+    });
+
     this.theorems.forEach((theorem) => {
       const theoremJSON = theorem.toJSON();
 

package/src/context/release/file.js

@@ -7,13 +7,14 @@ import { rewriteNodes } from "occam-grammar-utilities";
 import Rule from "../../rule";
 import Type from "../../type";
 import Axiom from "../../axiom";
+import Lemma from "../../lemma";
 import Theorem from "../../theorem";
 import Combinator from "../../combinator";
 import Constructor from "../../constructor";
 
 import { push } from "../../utilities/array";
 import { customGrammarFromNameAndEntries } from "../../utilities/customGrammar";
-import { RULE_KIND, TYPE_KIND, AXIOM_KIND, THEOREM_KIND, COMBINATOR_KIND, CONSTRUCTOR_KIND } from "../../kinds";
+import { RULE_KIND, TYPE_KIND, AXIOM_KIND, LEMMA_KIND, THEOREM_KIND, COMBINATOR_KIND, CONSTRUCTOR_KIND } from "../../kinds";
 
 export default class FileReleaseContext extends ReleaseContext {
   constructor(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, dependencyReleaseContexts, contextJSON, types, rules, axioms, lemmas, theorems, combinators, constructors) {
@@ -203,9 +204,7 @@ export default class FileReleaseContext extends ReleaseContext {
     return node;
   }
 
-  initialise(dependencyReleaseContexts) {
-    super.initialise(dependencyReleaseContexts);
-
+  fromJSON() {
     const jsonArray = this.contextJSON,
           releaseContext = this;  ///
 
@@ -237,6 +236,14 @@ export default class FileReleaseContext extends ReleaseContext {
           break;
         }
 
+        case LEMMA_KIND: {
+          const lemma = Lemma.fromJSON(json, releaseContext);
+
+          this.lemmas.push(lemma);
+
+          break;
+        }
+
         case THEOREM_KIND: {
           const theorem = Theorem.fromJSON(json, releaseContext);
 
@@ -264,6 +271,12 @@ export default class FileReleaseContext extends ReleaseContext {
     });
   }
 
+  initialise(dependencyReleaseContexts) {
+    super.initialise(dependencyReleaseContexts);
+
+    this.fromJSON();
+  }
+
   static fromLogNameEntriesCallbacksAndContextJSON(log, name, entries, callbacks, contextJSON) {
     const verified = true,
           customGrammar = customGrammarFromNameAndEntries(name, entries),

package/src/label.js

@@ -1,8 +1,8 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { labelNodeFromLabelJSON } from "./utilities/node";
 import { labelNameFromLabelNode } from "./utilities/query";
+import { labelNodeFromLabelString } from "./utilities/string";
 
 export default class Label {
   constructor(node) {
@@ -35,8 +35,8 @@ export default class Label {
   }
 
   static fromJSON(json, releaseContext) {
-    const labelJSON = json, ///
-          labelNode = labelNodeFromLabelJSON(labelJSON, releaseContext),
+    const labelString = json, ///
+          labelNode = labelNodeFromLabelString(labelString, releaseContext),
           node = labelNode, ///
           label = new Label(node);
 

package/src/lemma.js

@@ -5,36 +5,31 @@ import Label from "./label";
 import { LEMMA_KIND } from "./kinds";
 import { nodeAsString } from "./utilities/string";
 
-import { statementNodeFromStatementJSON } from "./utilities/node";
+import { unqualifiedStatementNodeFromUnqualifiedStatementString, indicativeConditionalNodeFromIndicativeConditionalString } from "./utilities/string";
 
 export default class Lemma {
-  constructor(labels, statementNode, suppositionStatementNodes, consequentStatementNode) {
+  constructor(labels, unqualifiedStatementNode, indicativeConditionalNode) {
     this.labels = labels;
-    this.statementNode = statementNode;
-    this.suppositionStatementNodes = suppositionStatementNodes;
-    this.consequentStatementNode = consequentStatementNode;
+    this.unqualifiedStatementNode = unqualifiedStatementNode;
+    this.indicativeConditionalNode = indicativeConditionalNode;
   }
 
   getLabels() {
     return this.labels;
   }
 
-  getStatementNode() {
-    return this.statementNode;
+  getUnqualifiedStatementNode() {
+    return this.unqualifiedStatementNode;
   }
 
-  getSuppositionStatementNodes() {
-    return this.suppositionStatementNodes;
-  }
-
-  getConsequentStatementNode() {
-    return this.consequentStatementNode;
+  getIndicativeConditionalNode() {
+    return this.indicativeConditionalNode;
   }
 
   matchLabelName(labelName) {
     const matchesLabelName = this.labels.some((label) => {
       const name = labelName, ///
-            labelMatchesName = label.matchName(name);
+        labelMatchesName = label.matchName(name);
 
       if (labelMatchesName) {
         return true;
@@ -50,24 +45,17 @@ export default class Lemma {
 
             return labelJSON;
           }),
-          statementString = nodeAsString(this.statementNode),
-          consequentStatementString = nodeAsString(this.consequentStatementNode),
-          suppositionStatementStrings = this.suppositionStatementNodes.map((suppositionStatementNode) => {
-            const suppositionStatementString = nodeAsString(suppositionStatementNode);
-
-            return suppositionStatementString;
-          }),
+          unqualifiedStatementString = nodeAsString(this.unqalifiedStatementNode),
+          indicativeConditionalString = nodeAsString(this.indicativeConditionalNode),
           kind = LEMMA_KIND,
           labels = labelsJSON,  ///
-          statement = statementString,  ///
-          consequent = consequentStatementString, ///
-          suppositions = suppositionStatementStrings, ///
+          unqualifiedStatement = unqualifiedStatementString,  ///
+          indicativeConditional = indicativeConditionalString,  ///
           json = {
             kind,
             labels,
-            statement,
-            consequent,
-            suppositions
+            unqualifiedStatement,
+            indicativeConditional
           };
 
     return json;
@@ -85,45 +73,30 @@ export default class Lemma {
       return label;
     });
 
-    const { statement, suppositions, consequent } = json;
+    let { unqualifiedStatement, indicativeConditional } = json;
 
-    let lemma;
+    let unqualifiedStatementNode = null,
+        indicativeConditionalNode = null;
 
-    if (statement !== null) {
-      const statementJSON = statement,  ///
-            statementNode = statementNodeFromStatementJSON(statementJSON, releaseContext),
-            suppositionStatementNodes = null,
-            consequentStatementNode = null;
+    if (unqualifiedStatement !== null) {
+      const unqualifiedStatementString = unqualifiedStatement;  ///
 
-      lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
-    } else {
-      const statementNode = null,
-            suppositionStatementsJSON = suppositions,  ///
-            suppositionStatementNodes = suppositionStatementsJSON.map((suppositionStatementJSON) => {
-              const suppositionStatementNode = statementNodeFromStatementJSON(suppositionStatementJSON, releaseContext);
+      unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, releaseContext);
+    }
 
-              return suppositionStatementNode;
-            }),
-            consequentStatementJSON = consequent, ///
-            consequentStatementNode = statementNodeFromStatementJSON(consequentStatementJSON, releaseContext);
+    if (indicativeConditional !== null) {
+      const indicativeConditionalString = indicativeConditional;  ///
 
-      lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+      indicativeConditionalNode = indicativeConditionalNodeFromIndicativeConditionalString(indicativeConditionalString, releaseContext);
     }
 
-    return lemma;
-  }
-
-  static fromLabelsAndStatementNode(labels, statementNode) {
-    const suppositionStatementNodes = [],
-          consequentStatementNode = null,
-          lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+    const lemma = new Lemma(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return lemma;
   }
 
-  static fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode) {
-    const statementNode = null,
-          lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+  static fromLabelsUnqualifiedStatementNodeAndIndicativeConditionalNode(labels, unqualifiedStatementNode, indicativeConditionalNode) {
+    const lemma = new Lemma(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return lemma;
   }

package/src/premise.js

@@ -6,7 +6,7 @@ import { first } from "./utilities/array";
 import { nodeAsString } from "./utilities/string";
 import { nodeQuery, nodesQuery } from "./utilities/query";
 import { metavariableNameFromMetavariableNode } from "./utilities/query";
-import { metastatementNodeFromMetastatementJSON } from "./utilities/node";
+import { metastatementNodeFromMetastatementString } from "./utilities/string";
 import { METAVARIABLE_RULE_NAME, METASTATEMENT_RULE_NAME } from "./ruleNames";
 
 const metastatementNodesQuery = nodesQuery("/metaSubproofAssertion/metastatement"),
@@ -71,8 +71,8 @@ export default class Premise {
 
   static fromJSON(json, releaseContext) {
     const { metastatement } = json,
-          metastatementJSON = metastatement,  ///
-          metastatementNode = metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext),
+          metastatementString = metastatement,  ///
+          metastatementNode = metastatementNodeFromMetastatementString(metastatementString, releaseContext),
           premise = new Premise(metastatementNode);
 
     return premise;

package/src/ruleNames.js

@@ -8,6 +8,7 @@ export const METAVARIABLE_RULE_NAME = "metavariable";
 export const METASTATEMENT_RULE_NAME = "metastatement";
 export const META_SUBPROOF_RULE_NAME = "metaSubproof";
 export const UNQUALIFIED_STATEMENT_RULE_NAME = "unqualifiedStatement";
+export const INDICATIVE_CONDITIONAL_RULE_NAME = "indicativeConditional";
 export const COMBINATOR_DECLARATION_RULE_NAME = "combinatorDeclaration";
 export const CONSTRUCTOR_DECLARATION_RULE_NAME = "constructorDeclaration";
 export const QUALIFIED_METASTATEMENT_RULE_NAME = "qualifiedMetastatement";