occam-verify-cli 1.0.612 → 1.0.617

package/lib/process/assign.js

@@ -24,8 +24,7 @@ _export(exports, {
 });
 function variableAssignmentFromVariable(variable) {
     return function(context) {
-        var nested = false;
-        context.addVariable(variable, nested);
+        context.addVariable(variable);
         var variableTypeString = variable.getTypeString(), variableString = variable.getString(), assigned = true;
         assigned ? context.trace("Assigned the '".concat(variableString, "' variable with type '").concat(variableTypeString, "'.")) : context.debug("Unable to assign the '".concat(variableString, "' variable with type '").concat(variableTypeString, "'."));
         return assigned;
@@ -55,4 +54,4 @@ function assignAssignments(assignments, context) {
     return assignmentsAssigned;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm9jZXNzL2Fzc2lnbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIHZhcmlhYmxlQXNzaWdubWVudEZyb21WYXJpYWJsZSh2YXJpYWJsZSkge1xuICByZXR1cm4gZnVuY3Rpb24gKGNvbnRleHQpIHtcbiAgICBjb25zdCBuZXN0ZWQgPSBmYWxzZTtcblxuICAgIGNvbnRleHQuYWRkVmFyaWFibGUodmFyaWFibGUsIG5lc3RlZCk7XG5cbiAgICBjb25zdCB2YXJpYWJsZVR5cGVTdHJpbmcgPSB2YXJpYWJsZS5nZXRUeXBlU3RyaW5nKCksXG4gICAgICAgICAgdmFyaWFibGVTdHJpbmcgPSB2YXJpYWJsZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICBhc3NpZ25lZCA9IHRydWU7XG5cbiAgICBhc3NpZ25lZCA/XG4gICAgICBjb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSB3aXRoIHR5cGUgJyR7dmFyaWFibGVUeXBlU3RyaW5nfScuYCkgOlxuICAgICAgICBjb250ZXh0LmRlYnVnKGBVbmFibGUgdG8gYXNzaWduIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlIHdpdGggdHlwZSAnJHt2YXJpYWJsZVR5cGVTdHJpbmd9Jy5gKTtcblxuICAgIHJldHVybiBhc3NpZ25lZDtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGVxdWFsaXR5QXNzaWdubWVudEZyb21FcXVhbGl0eShlcXVhbGl0eSkge1xuICByZXR1cm4gZnVuY3Rpb24gKGNvbnRleHQpIHtcbiAgICBjb25zdCBlcXVhbGl0eVN0cmluZyA9IGVxdWFsaXR5LmdldFN0cmluZygpLFxuICAgICAgICAgIGVxdWFsaXR5QWRkZWQgPSBjb250ZXh0LmFkZEVxdWFsaXR5KGVxdWFsaXR5KSxcbiAgICAgICAgICBhc3NpZ25lZCA9IGVxdWFsaXR5QWRkZWQ7IC8vL1xuXG4gICAgYXNzaWduZWQgP1xuICAgICAgY29udGV4dC50cmFjZShgQXNzaWduZWQgdGhlICcke2VxdWFsaXR5U3RyaW5nfScgZXF1YWxpdHkuYCkgOlxuICAgICAgICBjb250ZXh0LmRlYnVnKGBVbmFibGUgdG8gYXNzaWduIHRoZSAnJHtlcXVhbGl0eVN0cmluZ30nIGVxdWFsaXR5LmApO1xuXG4gICAgcmV0dXJuIGFzc2lnbmVkO1xuICB9O1xufVxuXG5leHBvcnQgZnVuY3Rpb24ganVkZ2VtZW50QXNzaWdubWVudEZyb21KdWRnZW1lbnQoanVkZ2VtZW50KSB7XG4gIHJldHVybiBmdW5jdGlvbiAoY29udGV4dCkge1xuICAgIGNvbnN0IGp1ZGdlbWVudFN0cmluZyA9IGp1ZGdlbWVudC5nZXRTdHJpbmcoKSxcbiAgICAgICAgICBqdWRnZW1lbnRBZGRlZCA9IGNvbnRleHQuYWRkSnVkZ2VtZW50KGp1ZGdlbWVudCksXG4gICAgICAgICAgYXNzaWduZWQgPSBqdWRnZW1lbnRBZGRlZDsgLy8vXG5cbiAgICBhc3NpZ25lZCA/XG4gICAgICBjb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7anVkZ2VtZW50U3RyaW5nfScganVkZ2VtZW50LmApIDpcbiAgICAgICAgY29udGV4dC5kZWJ1ZyhgVW5hYmxlIHRvIGFzc2lnbiB0aGUgJyR7anVkZ2VtZW50U3RyaW5nfScganVkZ2VtZW50LmApO1xuXG4gICAgcmV0dXJuIGFzc2lnbmVkO1xuICB9O1xufVxuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBhc3NpZ25Bc3NpZ25tZW50cyhhc3NpZ25tZW50cywgY29udGV4dCkge1xuICBjb25zdCBhc3NpZ25tZW50c0Fzc2lnbmVkID0gYXNzaWdubWVudHMuZXZlcnkoKGFzc2lnbWVudCkgPT4ge1xuICAgIGNvbnN0IGFzc2lnbmVkID0gYXNzaWdtZW50KGNvbnRleHQpO1xuXG4gICAgaWYgKGFzc2lnbmVkKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xuXG4gIHJldHVybiBhc3NpZ25tZW50c0Fzc2lnbmVkO1xufVxuIl0sIm5hbWVzIjpbImFzc2lnbkFzc2lnbm1lbnRzIiwiZXF1YWxpdHlBc3NpZ25tZW50RnJvbUVxdWFsaXR5IiwianVkZ2VtZW50QXNzaWdubWVudEZyb21KdWRnZW1lbnQiLCJ2YXJpYWJsZUFzc2lnbm1lbnRGcm9tVmFyaWFibGUiLCJ2YXJpYWJsZSIsImNvbnRleHQiLCJuZXN0ZWQiLCJhZGRWYXJpYWJsZSIsInZhcmlhYmxlVHlwZVN0cmluZyIsImdldFR5cGVTdHJpbmciLCJ2YXJpYWJsZVN0cmluZyIsImdldFN0cmluZyIsImFzc2lnbmVkIiwidHJhY2UiLCJkZWJ1ZyIsImVxdWFsaXR5IiwiZXF1YWxpdHlTdHJpbmciLCJlcXVhbGl0eUFkZGVkIiwiYWRkRXF1YWxpdHkiLCJqdWRnZW1lbnQiLCJqdWRnZW1lbnRTdHJpbmciLCJqdWRnZW1lbnRBZGRlZCIsImFkZEp1ZGdlbWVudCIsImFzc2lnbm1lbnRzIiwiYXNzaWdubWVudHNBc3NpZ25lZCIsImV2ZXJ5IiwiYXNzaWdtZW50Il0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUFnREE7ZUFBd0JBOztRQTVCUkM7ZUFBQUE7O1FBY0FDO2VBQUFBOztRQWhDQUM7ZUFBQUE7OztBQUFULFNBQVNBLCtCQUErQkMsUUFBUTtJQUNyRCxPQUFPLFNBQVVDLE9BQU87UUFDdEIsSUFBTUMsU0FBUztRQUVmRCxRQUFRRSxXQUFXLENBQUNILFVBQVVFO1FBRTlCLElBQU1FLHFCQUFxQkosU0FBU0ssYUFBYSxJQUMzQ0MsaUJBQWlCTixTQUFTTyxTQUFTLElBQ25DQyxXQUFXO1FBRWpCQSxXQUNFUCxRQUFRUSxLQUFLLENBQUMsQUFBQyxpQkFBdURMLE9BQXZDRSxnQkFBZSwwQkFBMkMsT0FBbkJGLG9CQUFtQixTQUN2RkgsUUFBUVMsS0FBSyxDQUFDLEFBQUMseUJBQStETixPQUF2Q0UsZ0JBQWUsMEJBQTJDLE9BQW5CRixvQkFBbUI7UUFFckcsT0FBT0k7SUFDVDtBQUNGO0FBRU8sU0FBU1gsK0JBQStCYyxRQUFRO0lBQ3JELE9BQU8sU0FBVVYsT0FBTztRQUN0QixJQUFNVyxpQkFBaUJELFNBQVNKLFNBQVMsSUFDbkNNLGdCQUFnQlosUUFBUWEsV0FBVyxDQUFDSCxXQUNwQ0gsV0FBV0ssZUFBZSxHQUFHO1FBRW5DTCxXQUNFUCxRQUFRUSxLQUFLLENBQUMsQUFBQyxpQkFBK0IsT0FBZkcsZ0JBQWUsa0JBQzVDWCxRQUFRUyxLQUFLLENBQUMsQUFBQyx5QkFBdUMsT0FBZkUsZ0JBQWU7UUFFMUQsT0FBT0o7SUFDVDtBQUNGO0FBRU8sU0FBU1YsaUNBQWlDaUIsU0FBUztJQUN4RCxPQUFPLFNBQVVkLE9BQU87UUFDdEIsSUFBTWUsa0JBQWtCRCxVQUFVUixTQUFTLElBQ3JDVSxpQkFBaUJoQixRQUFRaUIsWUFBWSxDQUFDSCxZQUN0Q1AsV0FBV1MsZ0JBQWdCLEdBQUc7UUFFcENULFdBQ0VQLFFBQVFRLEtBQUssQ0FBQyxBQUFDLGlCQUFnQyxPQUFoQk8saUJBQWdCLG1CQUM3Q2YsUUFBUVMsS0FBSyxDQUFDLEFBQUMseUJBQXdDLE9BQWhCTSxpQkFBZ0I7UUFFM0QsT0FBT1I7SUFDVDtBQUNGO0FBRWUsU0FBU1osa0JBQWtCdUIsV0FBVyxFQUFFbEIsT0FBTztJQUM1RCxJQUFNbUIsc0JBQXNCRCxZQUFZRSxLQUFLLENBQUMsU0FBQ0M7UUFDN0MsSUFBTWQsV0FBV2MsVUFBVXJCO1FBRTNCLElBQUlPLFVBQVU7WUFDWixPQUFPO1FBQ1Q7SUFDRjtJQUVBLE9BQU9ZO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm9jZXNzL2Fzc2lnbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIHZhcmlhYmxlQXNzaWdubWVudEZyb21WYXJpYWJsZSh2YXJpYWJsZSkge1xuICByZXR1cm4gZnVuY3Rpb24gKGNvbnRleHQpIHtcbiAgICBjb250ZXh0LmFkZFZhcmlhYmxlKHZhcmlhYmxlKTtcblxuICAgIGNvbnN0IHZhcmlhYmxlVHlwZVN0cmluZyA9IHZhcmlhYmxlLmdldFR5cGVTdHJpbmcoKSxcbiAgICAgICAgICB2YXJpYWJsZVN0cmluZyA9IHZhcmlhYmxlLmdldFN0cmluZygpLFxuICAgICAgICAgIGFzc2lnbmVkID0gdHJ1ZTtcblxuICAgIGFzc2lnbmVkID9cbiAgICAgIGNvbnRleHQudHJhY2UoYEFzc2lnbmVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlIHdpdGggdHlwZSAnJHt2YXJpYWJsZVR5cGVTdHJpbmd9Jy5gKSA6XG4gICAgICAgIGNvbnRleHQuZGVidWcoYFVuYWJsZSB0byBhc3NpZ24gdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUgd2l0aCB0eXBlICcke3ZhcmlhYmxlVHlwZVN0cmluZ30nLmApO1xuXG4gICAgcmV0dXJuIGFzc2lnbmVkO1xuICB9O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZXF1YWxpdHlBc3NpZ25tZW50RnJvbUVxdWFsaXR5KGVxdWFsaXR5KSB7XG4gIHJldHVybiBmdW5jdGlvbiAoY29udGV4dCkge1xuICAgIGNvbnN0IGVxdWFsaXR5U3RyaW5nID0gZXF1YWxpdHkuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgZXF1YWxpdHlBZGRlZCA9IGNvbnRleHQuYWRkRXF1YWxpdHkoZXF1YWxpdHkpLFxuICAgICAgICAgIGFzc2lnbmVkID0gZXF1YWxpdHlBZGRlZDsgLy8vXG5cbiAgICBhc3NpZ25lZCA/XG4gICAgICBjb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7ZXF1YWxpdHlTdHJpbmd9JyBlcXVhbGl0eS5gKSA6XG4gICAgICAgIGNvbnRleHQuZGVidWcoYFVuYWJsZSB0byBhc3NpZ24gdGhlICcke2VxdWFsaXR5U3RyaW5nfScgZXF1YWxpdHkuYCk7XG5cbiAgICByZXR1cm4gYXNzaWduZWQ7XG4gIH07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBqdWRnZW1lbnRBc3NpZ25tZW50RnJvbUp1ZGdlbWVudChqdWRnZW1lbnQpIHtcbiAgcmV0dXJuIGZ1bmN0aW9uIChjb250ZXh0KSB7XG4gICAgY29uc3QganVkZ2VtZW50U3RyaW5nID0ganVkZ2VtZW50LmdldFN0cmluZygpLFxuICAgICAgICAgIGp1ZGdlbWVudEFkZGVkID0gY29udGV4dC5hZGRKdWRnZW1lbnQoanVkZ2VtZW50KSxcbiAgICAgICAgICBhc3NpZ25lZCA9IGp1ZGdlbWVudEFkZGVkOyAvLy9cblxuICAgIGFzc2lnbmVkID9cbiAgICAgIGNvbnRleHQudHJhY2UoYEFzc2lnbmVkIHRoZSAnJHtqdWRnZW1lbnRTdHJpbmd9JyBqdWRnZW1lbnQuYCkgOlxuICAgICAgICBjb250ZXh0LmRlYnVnKGBVbmFibGUgdG8gYXNzaWduIHRoZSAnJHtqdWRnZW1lbnRTdHJpbmd9JyBqdWRnZW1lbnQuYCk7XG5cbiAgICByZXR1cm4gYXNzaWduZWQ7XG4gIH07XG59XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGFzc2lnbkFzc2lnbm1lbnRzKGFzc2lnbm1lbnRzLCBjb250ZXh0KSB7XG4gIGNvbnN0IGFzc2lnbm1lbnRzQXNzaWduZWQgPSBhc3NpZ25tZW50cy5ldmVyeSgoYXNzaWdtZW50KSA9PiB7XG4gICAgY29uc3QgYXNzaWduZWQgPSBhc3NpZ21lbnQoY29udGV4dCk7XG5cbiAgICBpZiAoYXNzaWduZWQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIGFzc2lnbm1lbnRzQXNzaWduZWQ7XG59XG4iXSwibmFtZXMiOlsiYXNzaWduQXNzaWdubWVudHMiLCJlcXVhbGl0eUFzc2lnbm1lbnRGcm9tRXF1YWxpdHkiLCJqdWRnZW1lbnRBc3NpZ25tZW50RnJvbUp1ZGdlbWVudCIsInZhcmlhYmxlQXNzaWdubWVudEZyb21WYXJpYWJsZSIsInZhcmlhYmxlIiwiY29udGV4dCIsImFkZFZhcmlhYmxlIiwidmFyaWFibGVUeXBlU3RyaW5nIiwiZ2V0VHlwZVN0cmluZyIsInZhcmlhYmxlU3RyaW5nIiwiZ2V0U3RyaW5nIiwiYXNzaWduZWQiLCJ0cmFjZSIsImRlYnVnIiwiZXF1YWxpdHkiLCJlcXVhbGl0eVN0cmluZyIsImVxdWFsaXR5QWRkZWQiLCJhZGRFcXVhbGl0eSIsImp1ZGdlbWVudCIsImp1ZGdlbWVudFN0cmluZyIsImp1ZGdlbWVudEFkZGVkIiwiYWRkSnVkZ2VtZW50IiwiYXNzaWdubWVudHMiLCJhc3NpZ25tZW50c0Fzc2lnbmVkIiwiZXZlcnkiLCJhc3NpZ21lbnQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQThDQTtlQUF3QkE7O1FBNUJSQztlQUFBQTs7UUFjQUM7ZUFBQUE7O1FBOUJBQztlQUFBQTs7O0FBQVQsU0FBU0EsK0JBQStCQyxRQUFRO0lBQ3JELE9BQU8sU0FBVUMsT0FBTztRQUN0QkEsUUFBUUMsV0FBVyxDQUFDRjtRQUVwQixJQUFNRyxxQkFBcUJILFNBQVNJLGFBQWEsSUFDM0NDLGlCQUFpQkwsU0FBU00sU0FBUyxJQUNuQ0MsV0FBVztRQUVqQkEsV0FDRU4sUUFBUU8sS0FBSyxDQUFDLEFBQUMsaUJBQXVETCxPQUF2Q0UsZ0JBQWUsMEJBQTJDLE9BQW5CRixvQkFBbUIsU0FDdkZGLFFBQVFRLEtBQUssQ0FBQyxBQUFDLHlCQUErRE4sT0FBdkNFLGdCQUFlLDBCQUEyQyxPQUFuQkYsb0JBQW1CO1FBRXJHLE9BQU9JO0lBQ1Q7QUFDRjtBQUVPLFNBQVNWLCtCQUErQmEsUUFBUTtJQUNyRCxPQUFPLFNBQVVULE9BQU87UUFDdEIsSUFBTVUsaUJBQWlCRCxTQUFTSixTQUFTLElBQ25DTSxnQkFBZ0JYLFFBQVFZLFdBQVcsQ0FBQ0gsV0FDcENILFdBQVdLLGVBQWUsR0FBRztRQUVuQ0wsV0FDRU4sUUFBUU8sS0FBSyxDQUFDLEFBQUMsaUJBQStCLE9BQWZHLGdCQUFlLGtCQUM1Q1YsUUFBUVEsS0FBSyxDQUFDLEFBQUMseUJBQXVDLE9BQWZFLGdCQUFlO1FBRTFELE9BQU9KO0lBQ1Q7QUFDRjtBQUVPLFNBQVNULGlDQUFpQ2dCLFNBQVM7SUFDeEQsT0FBTyxTQUFVYixPQUFPO1FBQ3RCLElBQU1jLGtCQUFrQkQsVUFBVVIsU0FBUyxJQUNyQ1UsaUJBQWlCZixRQUFRZ0IsWUFBWSxDQUFDSCxZQUN0Q1AsV0FBV1MsZ0JBQWdCLEdBQUc7UUFFcENULFdBQ0VOLFFBQVFPLEtBQUssQ0FBQyxBQUFDLGlCQUFnQyxPQUFoQk8saUJBQWdCLG1CQUM3Q2QsUUFBUVEsS0FBSyxDQUFDLEFBQUMseUJBQXdDLE9BQWhCTSxpQkFBZ0I7UUFFM0QsT0FBT1I7SUFDVDtBQUNGO0FBRWUsU0FBU1gsa0JBQWtCc0IsV0FBVyxFQUFFakIsT0FBTztJQUM1RCxJQUFNa0Isc0JBQXNCRCxZQUFZRSxLQUFLLENBQUMsU0FBQ0M7UUFDN0MsSUFBTWQsV0FBV2MsVUFBVXBCO1FBRTNCLElBQUlNLFVBQVU7WUFDWixPQUFPO1FBQ1Q7SUFDRjtJQUVBLE9BQU9ZO0FBQ1QifQ==

package/lib/utilities/substitutions.js

@@ -95,11 +95,11 @@ function metavariableNamesFromSubstitutions(substitutions) {
         }
     });
     compress(metavariableNames, function(metavariableNameA, metavariableNameB) {
-        if (metavariableNameB !== metavariableNameB) {
+        if (metavariableNameA !== metavariableNameB) {
             return true;
         }
     });
     return metavariableNames;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/substitutions.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nconst { compress } = arrayUtilities;\n\nexport function termFromTermAndSubstitutions(term, generalContext, specificContext) {\n  if (term !== null) {\n    const termNode = term.getNode(),\n          termSingular = term.isSingular();\n\n    term = null;  ///\n\n    if (termSingular) {\n      const variableIdentifier = termNode.getVariableIdentifier(),\n            variable = generalContext.findVariableByVariableIdentifier(variableIdentifier);\n\n      if (variable !== null) {\n        const substitution = specificContext.findSubstitutionByVariableIdentifier(variableIdentifier);\n\n        if (substitution !== null) {\n          const termSubstitution = substitution,  ///\n                replacementTerm = termSubstitution.getReplacementTerm();\n\n          term = replacementTerm; ///\n        }\n      }\n    }\n  }\n\n  return term;\n}\n\nexport function frameFromFrameAndSubstitutions(frame, generalContext, specificContext) {\n  if (frame !== null) {\n    const frameNode = frame.getNode(),\n          frameSingular = frame.isSingular();\n\n    frame = null;  ///\n\n    if (frameSingular) {\n      const metavariableName = frameNode.getMetavariableName(),\n            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);\n\n      if (metavariable !== null) {\n        const substitution = specificContext.findSubstitutionByMetavariableName(metavariableName);\n\n        if (substitution !== null) {\n          const frameSubstitution = substitution, ///\n                replacementFrame = frameSubstitution.getReplacementFrame();\n\n          frame = replacementFrame; ///\n        }\n      }\n    }\n  }\n\n  return frame;\n}\n\nexport function statementFromStatementAndSubstitutions(statement, generalContext, specificContext) {\n  if (statement !== null) {\n    const statementNode = statement.getNode(),\n          statementSingular = statement.isSingular();\n\n    statement = null;\n\n    if (statementSingular) {\n      let substitution = null;\n\n      const substitutionNode = statementNode.getSubstitutionNode();\n\n      if (substitutionNode !== null) {\n        let context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n\n        substitution = specificContext.findSubstitutionBySubstitutionNode(substitutionNode);\n\n        context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n      }\n\n      const metavariableName = statementNode.getMetavariableName(),\n            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);\n\n      if (metavariable !== null) {\n        substitution = (substitution !== null) ?\n                         specificContext.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) :\n                           specificContext.findSubstitutionByMetavariableName(metavariableName);\n\n        if (substitution !== null) {\n          const statementSubstitution = substitution, ///\n                replacementStatement = statementSubstitution.getReplacementStatement();\n\n          statement = replacementStatement; ///\n        }\n      }\n    }\n  }\n\n  return statement;\n}\n\nexport function metavariableNamesFromSubstitutions(substitutions) {\n  const metavariableNames = [];\n\n  substitutions.forEach((substitution) => {\n    const metavariableName = substitution.getMetavariableName();\n\n    if (metavariableName !== null) {\n      metavariableNames.push(metavariableName);\n    }\n  });\n\n  compress(metavariableNames, (metavariableNameA, metavariableNameB) => {\n    if (metavariableNameB !== metavariableNameB) {\n      return true;\n    }\n  });\n\n  return metavariableNames;\n}\n"],"names":["frameFromFrameAndSubstitutions","metavariableNamesFromSubstitutions","statementFromStatementAndSubstitutions","termFromTermAndSubstitutions","compress","arrayUtilities","term","generalContext","specificContext","termNode","getNode","termSingular","isSingular","variableIdentifier","getVariableIdentifier","variable","findVariableByVariableIdentifier","substitution","findSubstitutionByVariableIdentifier","termSubstitution","replacementTerm","getReplacementTerm","frame","frameNode","frameSingular","metavariableName","getMetavariableName","metavariable","findMetavariableByMetavariableName","findSubstitutionByMetavariableName","frameSubstitution","replacementFrame","getReplacementFrame","statement","statementNode","statementSingular","substitutionNode","getSubstitutionNode","context","findSubstitutionBySubstitutionNode","findSubstitutionByMetavariableNameAndSubstitution","statementSubstitution","replacementStatement","getReplacementStatement","substitutions","metavariableNames","forEach","push","metavariableNameA","metavariableNameB"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/substitutions.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nconst { compress } = arrayUtilities;\n\nexport function termFromTermAndSubstitutions(term, generalContext, specificContext) {\n  if (term !== null) {\n    const termNode = term.getNode(),\n          termSingular = term.isSingular();\n\n    term = null;  ///\n\n    if (termSingular) {\n      const variableIdentifier = termNode.getVariableIdentifier(),\n            variable = generalContext.findVariableByVariableIdentifier(variableIdentifier);\n\n      if (variable !== null) {\n        const substitution = specificContext.findSubstitutionByVariableIdentifier(variableIdentifier);\n\n        if (substitution !== null) {\n          const termSubstitution = substitution,  ///\n                replacementTerm = termSubstitution.getReplacementTerm();\n\n          term = replacementTerm; ///\n        }\n      }\n    }\n  }\n\n  return term;\n}\n\nexport function frameFromFrameAndSubstitutions(frame, generalContext, specificContext) {\n  if (frame !== null) {\n    const frameNode = frame.getNode(),\n          frameSingular = frame.isSingular();\n\n    frame = null;  ///\n\n    if (frameSingular) {\n      const metavariableName = frameNode.getMetavariableName(),\n            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);\n\n      if (metavariable !== null) {\n        const substitution = specificContext.findSubstitutionByMetavariableName(metavariableName);\n\n        if (substitution !== null) {\n          const frameSubstitution = substitution, ///\n                replacementFrame = frameSubstitution.getReplacementFrame();\n\n          frame = replacementFrame; ///\n        }\n      }\n    }\n  }\n\n  return frame;\n}\n\nexport function statementFromStatementAndSubstitutions(statement, generalContext, specificContext) {\n  if (statement !== null) {\n    const statementNode = statement.getNode(),\n          statementSingular = statement.isSingular();\n\n    statement = null;\n\n    if (statementSingular) {\n      let substitution = null;\n\n      const substitutionNode = statementNode.getSubstitutionNode();\n\n      if (substitutionNode !== null) {\n        let context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n\n        substitution = specificContext.findSubstitutionBySubstitutionNode(substitutionNode);\n\n        context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n      }\n\n      const metavariableName = statementNode.getMetavariableName(),\n            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);\n\n      if (metavariable !== null) {\n        substitution = (substitution !== null) ?\n                         specificContext.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) :\n                           specificContext.findSubstitutionByMetavariableName(metavariableName);\n\n        if (substitution !== null) {\n          const statementSubstitution = substitution, ///\n                replacementStatement = statementSubstitution.getReplacementStatement();\n\n          statement = replacementStatement; ///\n        }\n      }\n    }\n  }\n\n  return statement;\n}\n\nexport function metavariableNamesFromSubstitutions(substitutions) {\n  const metavariableNames = [];\n\n  substitutions.forEach((substitution) => {\n    const metavariableName = substitution.getMetavariableName();\n\n    if (metavariableName !== null) {\n      metavariableNames.push(metavariableName);\n    }\n  });\n\n  compress(metavariableNames, (metavariableNameA, metavariableNameB) => {\n    if (metavariableNameA !== metavariableNameB) {\n      return true;\n    }\n  });\n\n  return metavariableNames;\n}\n"],"names":["frameFromFrameAndSubstitutions","metavariableNamesFromSubstitutions","statementFromStatementAndSubstitutions","termFromTermAndSubstitutions","compress","arrayUtilities","term","generalContext","specificContext","termNode","getNode","termSingular","isSingular","variableIdentifier","getVariableIdentifier","variable","findVariableByVariableIdentifier","substitution","findSubstitutionByVariableIdentifier","termSubstitution","replacementTerm","getReplacementTerm","frame","frameNode","frameSingular","metavariableName","getMetavariableName","metavariable","findMetavariableByMetavariableName","findSubstitutionByMetavariableName","frameSubstitution","replacementFrame","getReplacementFrame","statement","statementNode","statementSingular","substitutionNode","getSubstitutionNode","context","findSubstitutionBySubstitutionNode","findSubstitutionByMetavariableNameAndSubstitution","statementSubstitution","replacementStatement","getReplacementStatement","substitutions","metavariableNames","forEach","push","metavariableNameA","metavariableNameB"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.612",
+  "version": "1.0.617",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -13,7 +13,7 @@
     "argumentative": "^2.0.36",
     "necessary": "^17.0.9",
     "occam-file-system": "^6.0.505",
-    "occam-furtle": "^3.0.109",
+    "occam-furtle": "^3.0.111",
     "occam-grammars": "^1.3.510",
     "occam-languages": "^0.0.79",
     "occam-lexers": "^23.1.34",

package/src/context/ephemeral.js

@@ -1,11 +1,7 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import Context from "../context";
 
-const { extract } = arrayUtilities;
-
 export default class EphemeralContext extends Context {
   constructor(context, terms, frames, statements, assertions, references, substitutions) {
     super(context);
@@ -47,18 +43,24 @@ export default class EphemeralContext extends Context {
           context = this, ///
           termString = term.getString();
 
-    extract(this.terms, (term) => {
+    context.trace(`Adding the '${termString}' term to the ephemeral context...`);
+
+    const termB = this.terms.find((term) => {
       const termB = term, ///
             termAEqualToTermB = termA.isEqualTo(termB);
 
       if (termAEqualToTermB) {
         return true;
       }
-    });
+    }) || null;
 
-    context.trace(`Added the '${termString}' term to the context.`);
+    if (termB !== null) {
+      context.trace(`The '${termString}' term has already been added to the ephemeral context.`);
+    } else {
+      this.terms.push(term);
 
-    this.terms.push(term);
+      context.debug(`...added the '${termString}' term to the ephemeral context.`);
+    }
   }
 
   addFrame(frame) {
@@ -66,18 +68,24 @@ export default class EphemeralContext extends Context {
           context = this, ///
           frameString = frame.getString();
 
-    extract(this.frames, (frame) => {
+    context.trace(`Adding the '${frameString}' frame to the ephemeral context...`);
+
+    const frameB = this.frames.find((frame) => {
       const frameB = frame, ///
             frameAEqualToFrameB = frameA.isEqualTo(frameB);
 
       if (frameAEqualToFrameB) {
         return true;
       }
-    });
+    }) || null;
 
-    context.trace(`Added the '${frameString}' frame to the context.`);
+    if (frameB !== null) {
+      context.trace(`The '${frameString}' frame has already been added to the ephemeral context.`);
+    } else {
+      this.frames.push(frame);
 
-    this.frames.push(frame);
+      context.debug(`...added the '${frameString}' frame to the ephemeral context.`);
+    }
   }
 
   addStatement(statement) {
@@ -85,18 +93,24 @@ export default class EphemeralContext extends Context {
           statementA = statement, ///
           statementString = statement.getString();
 
-    extract(this.statements, (statement) => {
+    context.trace(`Adding the '${statementString}' statement to the ephemeral context...`);
+
+    const statementB = this.statements.find((statement) => {
       const statementB = statement, ///
-            statementAEqualToFrameB = statementA.isEqualTo(statementB);
+            statementAEqualToStatementB = statementA.isEqualTo(statementB);
 
-      if (statementAEqualToFrameB) {
+      if (statementAEqualToStatementB) {
         return true;
       }
-    });
+    }) || null;
 
-    context.trace(`Added the '${statementString}' statement to the context.`);
+    if (statementB !== null) {
+      context.trace(`The '${statementString}' statement has already been added to the ephemeral context.`);
+    } else {
+      this.statements.push(statement);
 
-    this.statements.push(statement);
+      context.debug(`...added the '${statementString}' statement to the ephemeral context.`);
+    }
   }
 
   addAssertion(assertion) {
@@ -104,18 +118,24 @@ export default class EphemeralContext extends Context {
           assertionA = assertion, ///
           assertionString = assertion.getString();
 
-    extract(this.assertions, (assertion) => {
+    context.trace(`Adding the '${assertionString}' assertion to the ephemeral context...`);
+
+    const assertionB = this.assertions.find((assertion) => {
       const assertionB = assertion, ///
             assertionAEqualToAssertionB = assertionA.isEqualTo(assertionB);
 
       if (assertionAEqualToAssertionB) {
         return true;
       }
-    });
+    }) || null;
 
-    context.trace(`Added the '${assertionString}' assertion to the context.`);
+    if (assertionB !== null) {
+      context.trace(`The '${assertionString}' assertion has already been added to the ephemeral context.`);
+    } else {
+      this.assertions.push(assertion);
 
-    this.assertions.push(assertion);
+      context.debug(`...added the '${assertionString}' assertion to the ephemeral context.`);
+    }
   }
 
   addReference(reference) {
@@ -123,18 +143,24 @@ export default class EphemeralContext extends Context {
           referenceA = reference, ///
           referenceString = reference.getString();
 
-    extract(this.references, (reference) => {
+    context.trace(`Adding the '${referenceString}' reference to the ephemeral context...`);
+
+    const referenceB = this.references.find((reference) => {
       const referenceB = reference, ///
             referenceAEqualToReferenceB = referenceA.isEqualTo(referenceB);
 
       if (referenceAEqualToReferenceB) {
         return true;
       }
-    });
+    }) || null;
 
-    context.trace(`Added the '${referenceString}' reference to the context.`);
+    if (referenceB !== null) {
+      context.trace(`The '${referenceString}' reference has already been added to the ephemeral context.`);
+    } else {
+      this.references.push(reference);
 
-    this.references.push(reference);
+      context.debug(`...added the '${referenceString}' reference to the ephemeral context.`);
+    }
   }
 
   addSubstitution(substitution) {
@@ -142,18 +168,24 @@ export default class EphemeralContext extends Context {
           substitutionA = substitution, ///
           substitutionString = substitution.getString();
 
-    extract(this.substitutions, (substitution) => {
+    context.trace(`Adding the '${substitutionString}' substitution to the ephemeral context...`);
+
+    const substitutionB = this.substitutions.find((substitution) => {
       const substitutionB = substitution, ///
-            substitutionAEqualToAssertionB = substitutionA.isEqualTo(substitutionB);
+            substitutionAEqualToSubstitutionB = substitutionA.isEqualTo(substitutionB);
 
-      if (substitutionAEqualToAssertionB) {
+      if (substitutionAEqualToSubstitutionB) {
         return true;
       }
-    });
+    }) || null;
 
-    context.trace(`Added the '${substitutionString}' substitution to the context.`);
+    if (substitutionB !== null) {
+      context.trace(`The '${substitutionString}' substitution has already been added to the ephemeral context.`);
+    } else {
+      this.substitutions.push(substitution);
 
-    this.substitutions.push(substitution);
+      context.debug(`...added the '${substitutionString}' substitution to the ephemeral context.`);
+    }
   }
 
   findTermByTermNode(termNode) {

package/src/context/file/nominal.js

@@ -259,54 +259,119 @@ export default class NominalFileContext extends FileContext {
 
   addType(type) {
     this.types.push(type);
+
+    const filePath = this.getFilePath(),
+          typeString = type.toString();
+
+    this.trace(`Added the '${typeString}' type to the '${filePath}' file context.`)
   }
 
   addRule(rule) {
     this.rules.push(rule);
+
+    const filePath = this.getFilePath(),
+          ruleString = rule.toString();
+
+    this.trace(`Added the '${ruleString}' rule to the '${filePath}' file context.`)
   }
 
   addAxiom(axiom) {
     this.axioms.push(axiom);
+
+    const filePath = this.getFilePath(),
+          axiomString = axiom.toString();
+
+    this.trace(`Added the '${axiomString}' axiom to the '${filePath}' file context.`)
   }
 
   addLemma(lemma) {
     this.lemmas.push(lemma);
+
+    const filePath = this.getFilePath(),
+          lemmaString = lemma.toString();
+
+    this.trace(`Added the '${lemmaString}' lemma to the '${filePath}' file context.`)
   }
 
   addTheorem(theorem) {
     this.theorems.push(theorem);
+
+    const filePath = this.getFilePath(),
+          theoremString = theorem.toString();
+
+    this.trace(`Added the '${theoremString}' theorem to the '${filePath}' file context.`)
   }
 
   addVariable(variable) {
     this.variables.push(variable);
+
+    const filePath = this.getFilePath(),
+          variableString = variable.toString();
+
+    this.trace(`Added the '${variableString}' variable to the '${filePath}' file context.`)
   }
 
   addMetaLemma(metaLemma) {
     this.metaLemmas.push(metaLemma);
+
+    const filePath = this.getFilePath(),
+          metaLemmaString = metaLemma.toString();
+
+    this.trace(`Added the '${metaLemmaString}' meta-lemma to the '${filePath}' file context.`)
   }
 
   addConjecture(conjecture) {
     this.conjectures.push(conjecture);
+
+    const filePath = this.getFilePath(),
+          ocnjectureString = ocnjecture.toString();
+
+    this.trace(`Added the '${ocnjectureString}' ocnjecture to the '${filePath}' file context.`)
   }
 
   addCombinator(combinator) {
     this.combinators.push(combinator);
+
+    const filePath = this.getFilePath(),
+          combinatorString = combinator.toString();
+
+    this.trace(`Added the '${combinatorString}' combinator to the '${filePath}' file context.`)
   }
 
   addTypePrefix(typePrefix) {
     this.typePrefixes.push(typePrefix);
+
+    const filePath = this.getFilePath(),
+          typePrefixString = typePrefix.toString();
+
+    this.trace(`Added the '${typePrefixString}' type-prefix to the '${filePath}' file context.`)
   }
 
   addConstructor(constructor) {
     this.constructors.push(constructor);
+
+    const filePath = this.getFilePath(),
+          constructorString = constructor.toString();
+
+    this.trace(`Added the '${constructorString}' constructor to the '${filePath}' file context.`)
   }
 
   addMetatheorem(metatheorem) {
     this.metatheorems.push(metatheorem);
+
+    const filePath = this.getFilePath(),
+          metatheoremString = metatheorem.toString();
+
+    this.trace(`Added the '${metatheoremString}' metatheorem to the '${filePath}' file context.`)
   }
 
   addMetavariable(metavariable) {
     this.metavariables.push(metavariable);
+
+    const filePath = this.getFilePath(),
+          metavariableString = metavariable.toString();
+
+    this.trace(`Added the '${metavariableString}' metavariable to the '${filePath}' file context.`)
   }
 
   findLabelByReference(reference, context) {
@@ -404,10 +469,10 @@ export default class NominalFileContext extends FileContext {
     return theorem;
   }
 
-  findProcedureByName(name) {
+  findProcedureByProcedureName(procedureName) {
     const procedures = this.getProcedures(),
           procedure = procedures.find((procedure) => {
-            const nameMatches = procedure.matchName(name);
+            const nameMatches = procedure.matchName(procedureName);
 
             if (nameMatches) {
               return true;
@@ -650,14 +715,6 @@ export default class NominalFileContext extends FileContext {
     return metavariable;
   }
 
-  isMetavariablePresent(metavariable) {
-    metavariable = this.findMetavariable(metavariable);
-
-    const metavariablePresent = (metavariable !== null);
-
-    return metavariablePresent;
-  }
-
   isTypePresentByTypeName(typeName, includeRelease = true, includeDependencies = true) {
     const type = this.findTypeByTypeName(typeName, includeRelease, includeDependencies),
           typePresent = (type !== null);
@@ -714,6 +771,21 @@ export default class NominalFileContext extends FileContext {
     return metavariablePresent;
   }
 
+  isMetavariablePresent(metavariable) {
+    metavariable = this.findMetavariable(metavariable);
+
+    const metavariablePresent = (metavariable !== null);
+
+    return metavariablePresent;
+  }
+
+  isProcedurePresentByProcedureName(procedureName) {
+    const procedure = this.findProcedureByProcedureName(procedureName),
+          procedurePresent = (procedure !== null);
+
+    return procedurePresent;
+  }
+
   isLabelPresentByReference(reference) {
     const labels = this.getLabels(),
           labelPresent = labels.some((label) => {
@@ -728,13 +800,6 @@ export default class NominalFileContext extends FileContext {
     return labelPresent;
   }
 
-  isProcedurePresentByName(name) {
-    const procedure = this.findProcedureByName(name),
-          procedurePresent = (procedure !== null);
-
-    return procedurePresent;
-  }
-
   isMetavariablePresentByReference(reference) {
     const metavariables = this.getMetavariables(),
           metavariablePresent = metavariables.some((metavariable) => {

package/src/context/liminal.js

@@ -2,11 +2,10 @@
 
 import { arrayUtilities } from "necessary";
 import { metavariableNamesFromSubstitutions } from "../utilities/substitutions";
-import { substitutionsStringFromSubstitutions } from "../utilities/string";
 
 import Context from "../context";
 
-const { find, first, prune, compress } = arrayUtilities;
+const { find, first } = arrayUtilities;
 
 export default class LiminalContext extends Context {
   constructor(context, substitutions) {
@@ -62,60 +61,34 @@ export default class LiminalContext extends Context {
   }
 
   addSubstitution(substitution) {
-    const context = this,
+    const context = this, ///
+          substitutionA = substitution, ///
           substitutionString = substitution.getString();
 
-    this.substitutions = [ ///
-      ...this.substitutions,
-      substitution
-    ];
+    context.trace(`Adding the '${substitutionString}' substitution to the liminal context...`);
 
-    compress(this.substitutions, (substitutionA, substitutionB) => {
-      const substitutionAEqualToSubstitutionB = substitutionA.isEqualTo(substitutionB);
+    const substitutionB = this.substitutions.find((substitution) => {
+      const substitutionB = substitution, ///
+            substitutionAEqualToSubstitutionB = substitutionA.isEqualTo(substitutionB);
 
-      if (!substitutionAEqualToSubstitutionB) {
+      if (substitutionAEqualToSubstitutionB) {
         return true;
       }
-    });
-
-    context.trace(`Added the '${substitutionString}' substitution to the context.`);
-  }
-
-  addSubstitutions(substitutions) {
-    const context = this,
-          substitutionsString = substitutionsStringFromSubstitutions(substitutions);
-
-    this.substitutions = [ ///
-      ...this.substitutions,
-      ...substitutions
-    ];
-
-    compress(this.substitutions, (substitutionA, substitutionB) => {
-      const substitutionAEqualToAssertionB = substitutionA.isEqualTo(substitutionB);
+    }) || null;
 
-      if (!substitutionAEqualToAssertionB) {
-        return true;
-      }
-    });
+    if (substitutionB !== null) {
+      context.trace(`The '${substitutionString}' substitution has already been added to the liminal context.`);
+    } else {
+      this.substitutions.push(substitution);
 
-    context.trace(`Added the '${substitutionsString}' substitutions to the context.`);
+      context.debug(`...added the '${substitutionString}' substitution to the liminal context.`);
+    }
   }
 
-  removeSubstitution(substitution) {
-    const context = this,
-          substitutionA = substitution, ///
-          substitutionString = substitution.getString();
-
-    prune(this.substitutions, (substitution) => {
-      const substitutionB = substitution,
-            substitutionAEqualTosubstitutionB = substitutionA.isEqualTo(substitutionB);
-
-      if (!substitutionAEqualTosubstitutionB) {
-        return true;
-      }
+  addSubstitutions(substitutions) {
+    substitutions.forEach((substitution) => {
+      this.addSubstitution(substitution);
     });
-
-    context.trace(`Removed the '${substitutionString}' substitution to the context.`);
   }
 
   resolveSubstitutions(generalContext, specificContext) {
@@ -139,7 +112,7 @@ export default class LiminalContext extends Context {
     });
   }
 
-  areSubstitutionsResolved(generalContext, specificContext) {
+  areSubstitutionsResolved() {
     const substitutions = this.getSubstitutions(),
           metavariableNames = metavariableNamesFromSubstitutions(substitutions),
           resolved = metavariableNames.every((metavariableName) => {
@@ -165,6 +138,8 @@ export default class LiminalContext extends Context {
       context = this.getContext();
     }
 
+    context.debug(`Commiting the limiinal context`);
+
     context.addSubstitutions(this.substitutions);
   }