occam-verify-cli 1.0.879 → 1.0.884

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -44,8 +44,8 @@ const _necessary = require("necessary");
44
44
  const { compress } = _necessary.arrayUtilities;
45
45
  function compressTerms(terms) {
46
46
  compress(terms, (termA, termB)=>{
47
- const termAComparesToTermB = termA.compareTerm(termB);
48
- if (!termAComparesToTermB) {
47
+ const termAEqualToTermB = termA.isEqualTo(termB);
48
+ if (!termAEqualToTermB) {
49
49
  return true;
50
50
  }
51
51
  });
@@ -123,4 +123,4 @@ function compressSubstitutions(substitutions) {
123
123
  });
124
124
  }
125
125
 
126
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3lub3B0aWMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5jb25zdCB7IGNvbXByZXNzIH0gPSBhcnJheVV0aWxpdGllcztcblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzVGVybXModGVybXMpIHtcbiAgY29tcHJlc3ModGVybXMsICh0ZXJtQSwgdGVybUIpID0+IHtcbiAgICBjb25zdCB0ZXJtQUNvbXBhcmVzVG9UZXJtQiA9IHRlcm1BLmNvbXBhcmVUZXJtKHRlcm1CKTtcblxuICAgIGlmICghdGVybUFDb21wYXJlc1RvVGVybUIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb21wcmVzc0ZyYW1lcyhmcmFtZXMpIHtcbiAgY29tcHJlc3MoZnJhbWVzLCAoZnJhbWVBLCBmcmFtZUIpID0+IHtcbiAgICBjb25zdCBmcmFtZUFFcXVhbFRvRnJhbWVCID0gZnJhbWVBLmlzRXF1YWxUbyhmcmFtZUIpO1xuXG4gICAgaWYgKCFmcmFtZUFFcXVhbFRvRnJhbWVCKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29tcHJlc3NFcXVhbGl0aWVzKGVxdWFsaXRpZXMpIHtcbiAgY29tcHJlc3MoZXF1YWxpdGllcywgKGVxdWFsaXR5QSwgZXF1YWxpdHlCKSA9PiB7XG4gICAgY29uc3QgZXF1YWxpdHlBRXF1YWxUb0VxdWFsaXR5QiA9IGVxdWFsaXR5QS5pc0VxdWFsVG8oZXF1YWxpdHlCKTtcblxuICAgIGlmICghZXF1YWxpdHlBRXF1YWxUb0VxdWFsaXR5Qikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzSnVkZ2VtZW50cyhqdWRnZW1lbnRzKSB7XG4gIGNvbXByZXNzKGp1ZGdlbWVudHMsIChqdWRnZW1lbnRBLCBqdWRnZW1lbnRCKSA9PiB7XG4gICAgY29uc3QganVkZ2VtZW50QUVxdWFsVG9KdWRnZW1lbnRCID0ganVkZ2VtZW50QS5pc0VxdWFsVG8oanVkZ2VtZW50Qik7XG5cbiAgICBpZiAoIWp1ZGdlbWVudEFFcXVhbFRvSnVkZ2VtZW50Qikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzQXNzZXJ0aW9ucyhhc3NlcnRpb25zKSB7XG4gIGNvbXByZXNzKGFzc2VydGlvbnMsIChhc3NlcnRpb25BLCBhc3NlcnRpb25CKSA9PiB7XG4gICAgY29uc3QgYXNzZXJ0aW9uQUVxdWFsVG9Bc3NlcnRpb25CID0gYXNzZXJ0aW9uQS5pc0VxdWFsVG8oYXNzZXJ0aW9uQik7XG5cbiAgICBpZiAoIWFzc2VydGlvbkFFcXVhbFRvQXNzZXJ0aW9uQikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzU3RhdGVtZW50cyhzdGF0ZW1lbnRzKSB7XG4gIGNvbXByZXNzKHN0YXRlbWVudHMsIChzdGF0ZW1lbnRBLCBzdGF0ZW1lbnRCKSA9PiB7XG4gICAgY29uc3Qgc3RhdGVtZW50QUVxdWFsVG9TdGF0ZW1lbnRCID0gc3RhdGVtZW50QS5pc0VxdWFsVG8oc3RhdGVtZW50Qik7XG5cbiAgICBpZiAoIXN0YXRlbWVudEFFcXVhbFRvU3RhdGVtZW50Qikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzUmVmZXJlbmNlcyhyZWZlcmVuY2VzKSB7XG4gIGNvbXByZXNzKHJlZmVyZW5jZXMsIChyZWZlcmVuY2VBLCByZWZlcmVuY2VCKSA9PiB7XG4gICAgY29uc3QgcmVmZXJlbmNlQUVxdWFsVG9SZWZlcmVuY2VCID0gcmVmZXJlbmNlQS5pc0VxdWFsVG8ocmVmZXJlbmNlQik7XG5cbiAgICBpZiAoIXJlZmVyZW5jZUFFcXVhbFRvUmVmZXJlbmNlQikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzQXNzdW1wdGlvbnMoYXNzdW1wdGlvbnMpIHtcbiAgY29tcHJlc3MoYXNzdW1wdGlvbnMsIChhc3N1bXB0aW9uQSwgYXNzdW1wdGlvbkIpID0+IHtcbiAgICBjb25zdCBhc3N1bXB0aW9uQUVxdWFsVG9Bc3N1bXB0aW9uQiA9IGFzc3VtcHRpb25BLmlzRXF1YWxUbyhhc3N1bXB0aW9uQik7XG5cbiAgICBpZiAoIWFzc3VtcHRpb25BRXF1YWxUb0Fzc3VtcHRpb25CKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29tcHJlc3NNZXRhdmFyaWFibGVzKG1ldGF2YXJpYWJsZXMpIHtcbiAgY29tcHJlc3MobWV0YXZhcmlhYmxlcywgKG1ldGF2YXJpYWJsZUEsIG1ldGF2YXJpYWJsZUIpID0+IHtcbiAgICBjb25zdCBtZXRhdmFyaWFibGVBRXF1YWxUb01ldGF2YXJpYWJsZUIgPSBtZXRhdmFyaWFibGVBLmlzRXF1YWxUbyhtZXRhdmFyaWFibGVCKTtcblxuICAgIGlmICghbWV0YXZhcmlhYmxlQUVxdWFsVG9NZXRhdmFyaWFibGVCKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29tcHJlc3NTdWJzdGl0dXRpb25zKHN1YnN0aXR1dGlvbnMpIHtcbiAgY29tcHJlc3Moc3Vic3RpdHV0aW9ucywgKHN1YnN0aXR1dGlvbkEsIHN1YnN0aXR1dGlvbkIpID0+IHtcbiAgICBjb25zdCBzdWJzdGl0dXRpb25BRXF1YWxUb1N1YnN0aXR1dGlvbkIgPSBzdWJzdGl0dXRpb25BLmlzRXF1YWxUbyhzdWJzdGl0dXRpb25CKTtcblxuICAgIGlmICghc3Vic3RpdHV0aW9uQUVxdWFsVG9TdWJzdGl0dXRpb25CKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xufSJdLCJuYW1lcyI6WyJjb21wcmVzc0Fzc2VydGlvbnMiLCJjb21wcmVzc0Fzc3VtcHRpb25zIiwiY29tcHJlc3NFcXVhbGl0aWVzIiwiY29tcHJlc3NGcmFtZXMiLCJjb21wcmVzc0p1ZGdlbWVudHMiLCJjb21wcmVzc01ldGF2YXJpYWJsZXMiLCJjb21wcmVzc1JlZmVyZW5jZXMiLCJjb21wcmVzc1N0YXRlbWVudHMiLCJjb21wcmVzc1N1YnN0aXR1dGlvbnMiLCJjb21wcmVzc1Rlcm1zIiwiY29tcHJlc3MiLCJhcnJheVV0aWxpdGllcyIsInRlcm1zIiwidGVybUEiLCJ0ZXJtQiIsInRlcm1BQ29tcGFyZXNUb1Rlcm1CIiwiY29tcGFyZVRlcm0iLCJmcmFtZXMiLCJmcmFtZUEiLCJmcmFtZUIiLCJmcmFtZUFFcXVhbFRvRnJhbWVCIiwiaXNFcXVhbFRvIiwiZXF1YWxpdGllcyIsImVxdWFsaXR5QSIsImVxdWFsaXR5QiIsImVxdWFsaXR5QUVxdWFsVG9FcXVhbGl0eUIiLCJqdWRnZW1lbnRzIiwianVkZ2VtZW50QSIsImp1ZGdlbWVudEIiLCJqdWRnZW1lbnRBRXF1YWxUb0p1ZGdlbWVudEIiLCJhc3NlcnRpb25zIiwiYXNzZXJ0aW9uQSIsImFzc2VydGlvbkIiLCJhc3NlcnRpb25BRXF1YWxUb0Fzc2VydGlvbkIiLCJzdGF0ZW1lbnRzIiwic3RhdGVtZW50QSIsInN0YXRlbWVudEIiLCJzdGF0ZW1lbnRBRXF1YWxUb1N0YXRlbWVudEIiLCJyZWZlcmVuY2VzIiwicmVmZXJlbmNlQSIsInJlZmVyZW5jZUIiLCJyZWZlcmVuY2VBRXF1YWxUb1JlZmVyZW5jZUIiLCJhc3N1bXB0aW9ucyIsImFzc3VtcHRpb25BIiwiYXNzdW1wdGlvbkIiLCJhc3N1bXB0aW9uQUVxdWFsVG9Bc3N1bXB0aW9uQiIsIm1ldGF2YXJpYWJsZXMiLCJtZXRhdmFyaWFibGVBIiwibWV0YXZhcmlhYmxlQiIsIm1ldGF2YXJpYWJsZUFFcXVhbFRvTWV0YXZhcmlhYmxlQiIsInN1YnN0aXR1dGlvbnMiLCJzdWJzdGl0dXRpb25BIiwic3Vic3RpdHV0aW9uQiIsInN1YnN0aXR1dGlvbkFFcXVhbFRvU3Vic3RpdHV0aW9uQiJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBOENnQkE7ZUFBQUE7O1FBOEJBQztlQUFBQTs7UUFsREFDO2VBQUFBOztRQVZBQztlQUFBQTs7UUFvQkFDO2VBQUFBOztRQWtEQUM7ZUFBQUE7O1FBcEJBQztlQUFBQTs7UUFWQUM7ZUFBQUE7O1FBd0NBQztlQUFBQTs7UUExRkFDO2VBQUFBOzs7MkJBSmU7QUFFL0IsTUFBTSxFQUFFQyxRQUFRLEVBQUUsR0FBR0MseUJBQWM7QUFFNUIsU0FBU0YsY0FBY0csS0FBSztJQUNqQ0YsU0FBU0UsT0FBTyxDQUFDQyxPQUFPQztRQUN0QixNQUFNQyx1QkFBdUJGLE1BQU1HLFdBQVcsQ0FBQ0Y7UUFFL0MsSUFBSSxDQUFDQyxzQkFBc0I7WUFDekIsT0FBTztRQUNUO0lBQ0Y7QUFDRjtBQUVPLFNBQVNaLGVBQWVjLE1BQU07SUFDbkNQLFNBQVNPLFFBQVEsQ0FBQ0MsUUFBUUM7UUFDeEIsTUFBTUMsc0JBQXNCRixPQUFPRyxTQUFTLENBQUNGO1FBRTdDLElBQUksQ0FBQ0MscUJBQXFCO1lBQ3hCLE9BQU87UUFDVDtJQUNGO0FBQ0Y7QUFFTyxTQUFTbEIsbUJBQW1Cb0IsVUFBVTtJQUMzQ1osU0FBU1ksWUFBWSxDQUFDQyxXQUFXQztRQUMvQixNQUFNQyw0QkFBNEJGLFVBQVVGLFNBQVMsQ0FBQ0c7UUFFdEQsSUFBSSxDQUFDQywyQkFBMkI7WUFDOUIsT0FBTztRQUNUO0lBQ0Y7QUFDRjtBQUVPLFNBQVNyQixtQkFBbUJzQixVQUFVO0lBQzNDaEIsU0FBU2dCLFlBQVksQ0FBQ0MsWUFBWUM7UUFDaEMsTUFBTUMsOEJBQThCRixXQUFXTixTQUFTLENBQUNPO1FBRXpELElBQUksQ0FBQ0MsNkJBQTZCO1lBQ2hDLE9BQU87UUFDVDtJQUNGO0FBQ0Y7QUFFTyxTQUFTN0IsbUJBQW1COEIsVUFBVTtJQUMzQ3BCLFNBQVNvQixZQUFZLENBQUNDLFlBQVlDO1FBQ2hDLE1BQU1DLDhCQUE4QkYsV0FBV1YsU0FBUyxDQUFDVztRQUV6RCxJQUFJLENBQUNDLDZCQUE2QjtZQUNoQyxPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBUzFCLG1CQUFtQjJCLFVBQVU7SUFDM0N4QixTQUFTd0IsWUFBWSxDQUFDQyxZQUFZQztRQUNoQyxNQUFNQyw4QkFBOEJGLFdBQVdkLFNBQVMsQ0FBQ2U7UUFFekQsSUFBSSxDQUFDQyw2QkFBNkI7WUFDaEMsT0FBTztRQUNUO0lBQ0Y7QUFDRjtBQUVPLFNBQVMvQixtQkFBbUJnQyxVQUFVO0lBQzNDNUIsU0FBUzRCLFlBQVksQ0FBQ0MsWUFBWUM7UUFDaEMsTUFBTUMsOEJBQThCRixXQUFXbEIsU0FBUyxDQUFDbUI7UUFFekQsSUFBSSxDQUFDQyw2QkFBNkI7WUFDaEMsT0FBTztRQUNUO0lBQ0Y7QUFDRjtBQUVPLFNBQVN4QyxvQkFBb0J5QyxXQUFXO0lBQzdDaEMsU0FBU2dDLGFBQWEsQ0FBQ0MsYUFBYUM7UUFDbEMsTUFBTUMsZ0NBQWdDRixZQUFZdEIsU0FBUyxDQUFDdUI7UUFFNUQsSUFBSSxDQUFDQywrQkFBK0I7WUFDbEMsT0FBTztRQUNUO0lBQ0Y7QUFDRjtBQUVPLFNBQVN4QyxzQkFBc0J5QyxhQUFhO0lBQ2pEcEMsU0FBU29DLGVBQWUsQ0FBQ0MsZUFBZUM7UUFDdEMsTUFBTUMsb0NBQW9DRixjQUFjMUIsU0FBUyxDQUFDMkI7UUFFbEUsSUFBSSxDQUFDQyxtQ0FBbUM7WUFDdEMsT0FBTztRQUNUO0lBQ0Y7QUFDRjtBQUVPLFNBQVN6QyxzQkFBc0IwQyxhQUFhO0lBQ2pEeEMsU0FBU3dDLGVBQWUsQ0FBQ0MsZUFBZUM7UUFDdEMsTUFBTUMsb0NBQW9DRixjQUFjOUIsU0FBUyxDQUFDK0I7UUFFbEUsSUFBSSxDQUFDQyxtQ0FBbUM7WUFDdEMsT0FBTztRQUNUO0lBQ0Y7QUFDRiJ9
126
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3lub3B0aWMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5jb25zdCB7IGNvbXByZXNzIH0gPSBhcnJheVV0aWxpdGllcztcblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzVGVybXModGVybXMpIHtcbiAgY29tcHJlc3ModGVybXMsICh0ZXJtQSwgdGVybUIpID0+IHtcbiAgICBjb25zdCB0ZXJtQUVxdWFsVG9UZXJtQiA9IHRlcm1BLmlzRXF1YWxUbyh0ZXJtQik7XG5cbiAgICBpZiAoIXRlcm1BRXF1YWxUb1Rlcm1CKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29tcHJlc3NGcmFtZXMoZnJhbWVzKSB7XG4gIGNvbXByZXNzKGZyYW1lcywgKGZyYW1lQSwgZnJhbWVCKSA9PiB7XG4gICAgY29uc3QgZnJhbWVBRXF1YWxUb0ZyYW1lQiA9IGZyYW1lQS5pc0VxdWFsVG8oZnJhbWVCKTtcblxuICAgIGlmICghZnJhbWVBRXF1YWxUb0ZyYW1lQikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzRXF1YWxpdGllcyhlcXVhbGl0aWVzKSB7XG4gIGNvbXByZXNzKGVxdWFsaXRpZXMsIChlcXVhbGl0eUEsIGVxdWFsaXR5QikgPT4ge1xuICAgIGNvbnN0IGVxdWFsaXR5QUVxdWFsVG9FcXVhbGl0eUIgPSBlcXVhbGl0eUEuaXNFcXVhbFRvKGVxdWFsaXR5Qik7XG5cbiAgICBpZiAoIWVxdWFsaXR5QUVxdWFsVG9FcXVhbGl0eUIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb21wcmVzc0p1ZGdlbWVudHMoanVkZ2VtZW50cykge1xuICBjb21wcmVzcyhqdWRnZW1lbnRzLCAoanVkZ2VtZW50QSwganVkZ2VtZW50QikgPT4ge1xuICAgIGNvbnN0IGp1ZGdlbWVudEFFcXVhbFRvSnVkZ2VtZW50QiA9IGp1ZGdlbWVudEEuaXNFcXVhbFRvKGp1ZGdlbWVudEIpO1xuXG4gICAgaWYgKCFqdWRnZW1lbnRBRXF1YWxUb0p1ZGdlbWVudEIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb21wcmVzc0Fzc2VydGlvbnMoYXNzZXJ0aW9ucykge1xuICBjb21wcmVzcyhhc3NlcnRpb25zLCAoYXNzZXJ0aW9uQSwgYXNzZXJ0aW9uQikgPT4ge1xuICAgIGNvbnN0IGFzc2VydGlvbkFFcXVhbFRvQXNzZXJ0aW9uQiA9IGFzc2VydGlvbkEuaXNFcXVhbFRvKGFzc2VydGlvbkIpO1xuXG4gICAgaWYgKCFhc3NlcnRpb25BRXF1YWxUb0Fzc2VydGlvbkIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb21wcmVzc1N0YXRlbWVudHMoc3RhdGVtZW50cykge1xuICBjb21wcmVzcyhzdGF0ZW1lbnRzLCAoc3RhdGVtZW50QSwgc3RhdGVtZW50QikgPT4ge1xuICAgIGNvbnN0IHN0YXRlbWVudEFFcXVhbFRvU3RhdGVtZW50QiA9IHN0YXRlbWVudEEuaXNFcXVhbFRvKHN0YXRlbWVudEIpO1xuXG4gICAgaWYgKCFzdGF0ZW1lbnRBRXF1YWxUb1N0YXRlbWVudEIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb21wcmVzc1JlZmVyZW5jZXMocmVmZXJlbmNlcykge1xuICBjb21wcmVzcyhyZWZlcmVuY2VzLCAocmVmZXJlbmNlQSwgcmVmZXJlbmNlQikgPT4ge1xuICAgIGNvbnN0IHJlZmVyZW5jZUFFcXVhbFRvUmVmZXJlbmNlQiA9IHJlZmVyZW5jZUEuaXNFcXVhbFRvKHJlZmVyZW5jZUIpO1xuXG4gICAgaWYgKCFyZWZlcmVuY2VBRXF1YWxUb1JlZmVyZW5jZUIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb21wcmVzc0Fzc3VtcHRpb25zKGFzc3VtcHRpb25zKSB7XG4gIGNvbXByZXNzKGFzc3VtcHRpb25zLCAoYXNzdW1wdGlvbkEsIGFzc3VtcHRpb25CKSA9PiB7XG4gICAgY29uc3QgYXNzdW1wdGlvbkFFcXVhbFRvQXNzdW1wdGlvbkIgPSBhc3N1bXB0aW9uQS5pc0VxdWFsVG8oYXNzdW1wdGlvbkIpO1xuXG4gICAgaWYgKCFhc3N1bXB0aW9uQUVxdWFsVG9Bc3N1bXB0aW9uQikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzTWV0YXZhcmlhYmxlcyhtZXRhdmFyaWFibGVzKSB7XG4gIGNvbXByZXNzKG1ldGF2YXJpYWJsZXMsIChtZXRhdmFyaWFibGVBLCBtZXRhdmFyaWFibGVCKSA9PiB7XG4gICAgY29uc3QgbWV0YXZhcmlhYmxlQUVxdWFsVG9NZXRhdmFyaWFibGVCID0gbWV0YXZhcmlhYmxlQS5pc0VxdWFsVG8obWV0YXZhcmlhYmxlQik7XG5cbiAgICBpZiAoIW1ldGF2YXJpYWJsZUFFcXVhbFRvTWV0YXZhcmlhYmxlQikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXByZXNzU3Vic3RpdHV0aW9ucyhzdWJzdGl0dXRpb25zKSB7XG4gIGNvbXByZXNzKHN1YnN0aXR1dGlvbnMsIChzdWJzdGl0dXRpb25BLCBzdWJzdGl0dXRpb25CKSA9PiB7XG4gICAgY29uc3Qgc3Vic3RpdHV0aW9uQUVxdWFsVG9TdWJzdGl0dXRpb25CID0gc3Vic3RpdHV0aW9uQS5pc0VxdWFsVG8oc3Vic3RpdHV0aW9uQik7XG5cbiAgICBpZiAoIXN1YnN0aXR1dGlvbkFFcXVhbFRvU3Vic3RpdHV0aW9uQikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn0iXSwibmFtZXMiOlsiY29tcHJlc3NBc3NlcnRpb25zIiwiY29tcHJlc3NBc3N1bXB0aW9ucyIsImNvbXByZXNzRXF1YWxpdGllcyIsImNvbXByZXNzRnJhbWVzIiwiY29tcHJlc3NKdWRnZW1lbnRzIiwiY29tcHJlc3NNZXRhdmFyaWFibGVzIiwiY29tcHJlc3NSZWZlcmVuY2VzIiwiY29tcHJlc3NTdGF0ZW1lbnRzIiwiY29tcHJlc3NTdWJzdGl0dXRpb25zIiwiY29tcHJlc3NUZXJtcyIsImNvbXByZXNzIiwiYXJyYXlVdGlsaXRpZXMiLCJ0ZXJtcyIsInRlcm1BIiwidGVybUIiLCJ0ZXJtQUVxdWFsVG9UZXJtQiIsImlzRXF1YWxUbyIsImZyYW1lcyIsImZyYW1lQSIsImZyYW1lQiIsImZyYW1lQUVxdWFsVG9GcmFtZUIiLCJlcXVhbGl0aWVzIiwiZXF1YWxpdHlBIiwiZXF1YWxpdHlCIiwiZXF1YWxpdHlBRXF1YWxUb0VxdWFsaXR5QiIsImp1ZGdlbWVudHMiLCJqdWRnZW1lbnRBIiwianVkZ2VtZW50QiIsImp1ZGdlbWVudEFFcXVhbFRvSnVkZ2VtZW50QiIsImFzc2VydGlvbnMiLCJhc3NlcnRpb25BIiwiYXNzZXJ0aW9uQiIsImFzc2VydGlvbkFFcXVhbFRvQXNzZXJ0aW9uQiIsInN0YXRlbWVudHMiLCJzdGF0ZW1lbnRBIiwic3RhdGVtZW50QiIsInN0YXRlbWVudEFFcXVhbFRvU3RhdGVtZW50QiIsInJlZmVyZW5jZXMiLCJyZWZlcmVuY2VBIiwicmVmZXJlbmNlQiIsInJlZmVyZW5jZUFFcXVhbFRvUmVmZXJlbmNlQiIsImFzc3VtcHRpb25zIiwiYXNzdW1wdGlvbkEiLCJhc3N1bXB0aW9uQiIsImFzc3VtcHRpb25BRXF1YWxUb0Fzc3VtcHRpb25CIiwibWV0YXZhcmlhYmxlcyIsIm1ldGF2YXJpYWJsZUEiLCJtZXRhdmFyaWFibGVCIiwibWV0YXZhcmlhYmxlQUVxdWFsVG9NZXRhdmFyaWFibGVCIiwic3Vic3RpdHV0aW9ucyIsInN1YnN0aXR1dGlvbkEiLCJzdWJzdGl0dXRpb25CIiwic3Vic3RpdHV0aW9uQUVxdWFsVG9TdWJzdGl0dXRpb25CIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUE4Q2dCQTtlQUFBQTs7UUE4QkFDO2VBQUFBOztRQWxEQUM7ZUFBQUE7O1FBVkFDO2VBQUFBOztRQW9CQUM7ZUFBQUE7O1FBa0RBQztlQUFBQTs7UUFwQkFDO2VBQUFBOztRQVZBQztlQUFBQTs7UUF3Q0FDO2VBQUFBOztRQTFGQUM7ZUFBQUE7OzsyQkFKZTtBQUUvQixNQUFNLEVBQUVDLFFBQVEsRUFBRSxHQUFHQyx5QkFBYztBQUU1QixTQUFTRixjQUFjRyxLQUFLO0lBQ2pDRixTQUFTRSxPQUFPLENBQUNDLE9BQU9DO1FBQ3RCLE1BQU1DLG9CQUFvQkYsTUFBTUcsU0FBUyxDQUFDRjtRQUUxQyxJQUFJLENBQUNDLG1CQUFtQjtZQUN0QixPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBU1osZUFBZWMsTUFBTTtJQUNuQ1AsU0FBU08sUUFBUSxDQUFDQyxRQUFRQztRQUN4QixNQUFNQyxzQkFBc0JGLE9BQU9GLFNBQVMsQ0FBQ0c7UUFFN0MsSUFBSSxDQUFDQyxxQkFBcUI7WUFDeEIsT0FBTztRQUNUO0lBQ0Y7QUFDRjtBQUVPLFNBQVNsQixtQkFBbUJtQixVQUFVO0lBQzNDWCxTQUFTVyxZQUFZLENBQUNDLFdBQVdDO1FBQy9CLE1BQU1DLDRCQUE0QkYsVUFBVU4sU0FBUyxDQUFDTztRQUV0RCxJQUFJLENBQUNDLDJCQUEyQjtZQUM5QixPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBU3BCLG1CQUFtQnFCLFVBQVU7SUFDM0NmLFNBQVNlLFlBQVksQ0FBQ0MsWUFBWUM7UUFDaEMsTUFBTUMsOEJBQThCRixXQUFXVixTQUFTLENBQUNXO1FBRXpELElBQUksQ0FBQ0MsNkJBQTZCO1lBQ2hDLE9BQU87UUFDVDtJQUNGO0FBQ0Y7QUFFTyxTQUFTNUIsbUJBQW1CNkIsVUFBVTtJQUMzQ25CLFNBQVNtQixZQUFZLENBQUNDLFlBQVlDO1FBQ2hDLE1BQU1DLDhCQUE4QkYsV0FBV2QsU0FBUyxDQUFDZTtRQUV6RCxJQUFJLENBQUNDLDZCQUE2QjtZQUNoQyxPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBU3pCLG1CQUFtQjBCLFVBQVU7SUFDM0N2QixTQUFTdUIsWUFBWSxDQUFDQyxZQUFZQztRQUNoQyxNQUFNQyw4QkFBOEJGLFdBQVdsQixTQUFTLENBQUNtQjtRQUV6RCxJQUFJLENBQUNDLDZCQUE2QjtZQUNoQyxPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBUzlCLG1CQUFtQitCLFVBQVU7SUFDM0MzQixTQUFTMkIsWUFBWSxDQUFDQyxZQUFZQztRQUNoQyxNQUFNQyw4QkFBOEJGLFdBQVd0QixTQUFTLENBQUN1QjtRQUV6RCxJQUFJLENBQUNDLDZCQUE2QjtZQUNoQyxPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBU3ZDLG9CQUFvQndDLFdBQVc7SUFDN0MvQixTQUFTK0IsYUFBYSxDQUFDQyxhQUFhQztRQUNsQyxNQUFNQyxnQ0FBZ0NGLFlBQVkxQixTQUFTLENBQUMyQjtRQUU1RCxJQUFJLENBQUNDLCtCQUErQjtZQUNsQyxPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBU3ZDLHNCQUFzQndDLGFBQWE7SUFDakRuQyxTQUFTbUMsZUFBZSxDQUFDQyxlQUFlQztRQUN0QyxNQUFNQyxvQ0FBb0NGLGNBQWM5QixTQUFTLENBQUMrQjtRQUVsRSxJQUFJLENBQUNDLG1DQUFtQztZQUN0QyxPQUFPO1FBQ1Q7SUFDRjtBQUNGO0FBRU8sU0FBU3hDLHNCQUFzQnlDLGFBQWE7SUFDakR2QyxTQUFTdUMsZUFBZSxDQUFDQyxlQUFlQztRQUN0QyxNQUFNQyxvQ0FBb0NGLGNBQWNsQyxTQUFTLENBQUNtQztRQUVsRSxJQUFJLENBQUNDLG1DQUFtQztZQUN0QyxPQUFPO1FBQ1Q7SUFDRjtBQUNGIn0=
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "1.0.879",
4
+ "version": "1.0.884",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -32,9 +32,9 @@ export default class BranchingContext extends Context {
32
32
 
33
33
  const termB = this.terms.find((term) => {
34
34
  const termB = term, ///
35
- termAComparesToTermB = termA.compareTerm(termB);
35
+ termAEqualToTermB = termA.isEqualTo(termB);
36
36
 
37
- if (termAComparesToTermB) {
37
+ if (termAEqualToTermB) {
38
38
  return true;
39
39
  }
40
40
  }) || null;
@@ -128,14 +128,6 @@ export default class SynopticContext extends Context {
128
128
  return substitutions;
129
129
  }
130
130
 
131
- getDerivedSubstitutions(derivedSubstitutions = []) {
132
- this.contexts.forEach((context) => {
133
- context.getDerivedSubstitutions(derivedSubstitutions);
134
- });
135
-
136
- return derivedSubstitutions;
137
- }
138
-
139
131
  findTermByTermNode(termNode) {
140
132
  const terms = this.getTerms(),
141
133
  term = terms.find((term) => {
@@ -267,7 +267,7 @@ export default define(class MetaLevelAssumption extends Element {
267
267
 
268
268
  context.trace(`Unifying the '${statementString}' statement with the '${metaLevelAssumptionString}' meta-level assumption's statement...`);
269
269
 
270
- const generalStatement = stripBracketsFromStatement(this.statement, context), ///
270
+ const generalStatement = this.statement, ///
271
271
  specificStatement = stripBracketsFromStatement(statement, context); ///
272
272
 
273
273
  statementUnifies = unifyStatement(generalStatement, specificStatement, generalContext, specificContext);
@@ -318,11 +318,17 @@ export default define(class MetaLevelAssumption extends Element {
318
318
  static fromStep(step, context) {
319
319
  let metaLevelAssumption;
320
320
 
321
+ let statement;
322
+
323
+ statement = step.getStatement();
324
+
325
+ statement = stripBracketsFromStatement(statement, context); ///
326
+
327
+ const reference = step.getReference();
328
+
321
329
  ablate((context) => {
322
330
  instantiate((context) => {
323
- const reference = step.getReference(),
324
- statement = step.getStatement(),
325
- metaLevelAssumptionString = metaLevelAssumptionStringFromReferenceAndStatement(reference, statement),
331
+ const metaLevelAssumptionString = metaLevelAssumptionStringFromReferenceAndStatement(reference, statement),
326
332
  string = metaLevelAssumptionString, ///
327
333
  metaLevelAssumptionNode = instantiateMetaLevelAssumption(string, context);
328
334
 
@@ -160,9 +160,9 @@ export default define(class Equivalence extends Element {
160
160
  const termA = term, ///
161
161
  comparesToTerm = this.someTerm((term) => {
162
162
  const termB = term, ///
163
- termAComparesToTermB = termA.compareTerm(termB);
163
+ termAEqualToTermB = termA.isEqualTo(termB);
164
164
 
165
- if (termAComparesToTermB) {
165
+ if (termAEqualToTermB) {
166
166
  return true;
167
167
  }
168
168
  });
@@ -174,9 +174,9 @@ export default define(class Equivalence extends Element {
174
174
  const termA = term, ///
175
175
  terms = this.terms.filter((term) => {
176
176
  const termB = term, ///
177
- termAComparesToTermB = termA.compareTerm(termB);
177
+ termAEqualToTermB = termA.isEqualTo(termB);
178
178
 
179
- if (!termAComparesToTermB) {
179
+ if (!termAEqualToTermB) {
180
180
  return true;
181
181
  }
182
182
  }),
@@ -192,9 +192,9 @@ export default define(class Equivalence extends Element {
192
192
  ];
193
193
 
194
194
  compress(combinedTerms, (combinedTermA, combinedTermB) => {
195
- const combinedTermAComparesToCombinedTermB = combinedTermA.compareTerm(combinedTermB);
195
+ const combinedTermEqualToToCombinedTermB = combinedTermA.isEqualTo(combinedTermB);
196
196
 
197
- if (!combinedTermAComparesToCombinedTermB) {
197
+ if (!combinedTermEqualToToCombinedTermB) {
198
198
  return true;
199
199
  }
200
200
  });
@@ -169,9 +169,9 @@ export default define(class Signature extends Element {
169
169
  const array = substitutions.getArray(),
170
170
  compares = compare(this.terms, array, (term, substitution) => {
171
171
  const substitutionTerm = substitution.getTerm(),
172
- substitutionTermComparesToTerm = substitutionTerm.compareTerm(term);
172
+ substitutionTermEqualToTerm = substitutionTerm.isEqualTo(term);
173
173
 
174
- if (substitutionTermComparesToTerm) {
174
+ if (substitutionTermEqualToTerm) {
175
175
  return true;
176
176
  }
177
177
  });
@@ -198,9 +198,9 @@ export default define(class Signature extends Element {
198
198
  const array = substitutions.getArray(),
199
199
  correlates = correlate(this.terms, array, (term, substitution) => {
200
200
  const substitutionTerm = substitution.getTerm(),
201
- substitutionTermComparesToTerm = substitutionTerm.compareTerm(term);
201
+ substitutionTermEqualToTerm = substitutionTerm.isEqualTo(term);
202
202
 
203
- if (substitutionTermComparesToTerm) {
203
+ if (substitutionTermEqualToTerm) {
204
204
  return true;
205
205
  }
206
206
  });
@@ -7,6 +7,7 @@ import { unifyStatement } from "../process/unify";
7
7
  import { validateStatements } from "../utilities/validation";
8
8
  import { instantiateStatement } from "../process/instantiate";
9
9
  import { reconcile, instantiate } from "../utilities/context";
10
+ import {getEntryStats} from "necessary/lib/utilities/fileSystem";
10
11
 
11
12
  export default define(class Statement extends Element {
12
13
  getStatementNode() {
@@ -244,19 +245,16 @@ export default define(class Statement extends Element {
244
245
  return subproofUnifies;
245
246
  }
246
247
 
247
- unifyDeduction(deduction, context) {
248
+ unifyDeduction(deduction, generalContext, specificContext) {
248
249
  let deductionUnifies = false;
249
250
 
250
- const statementString = this.getString(), ///
251
+ const context = generalContext, ///
252
+ statementString = this.getString(), ///
251
253
  deductionString = deduction.getString(),
252
- deductionContext = deduction.getContext(),
253
254
  deductionStatement = deduction.getStatement();
254
255
 
255
256
  context.trace(`Unifying the '${deductionString}' deduction with the '${statementString}' statement...`);
256
257
 
257
- const generalContext = context, ///
258
- specificContext = deductionContext; ///
259
-
260
258
  reconcile((specificContext) => {
261
259
  const deductionStatementUnifies = this.unifyStatement(deductionStatement, generalContext, specificContext);
262
260
 
@@ -345,7 +343,15 @@ export default define(class Statement extends Element {
345
343
 
346
344
  if (unconditional) {
347
345
  const deduction = topLevelMetaAssertion.getDeduction(),
348
- deductionUnifies = this.unifyDeduction(deduction, context);
346
+ generalContext = context; ///
347
+
348
+ context = deduction.getContext();
349
+
350
+ const specificContext = context; ///
351
+
352
+ context = generalContext; ///
353
+
354
+ const deductionUnifies = this.unifyDeduction(deduction, generalContext, specificContext);
349
355
 
350
356
  if (deductionUnifies) {
351
357
  topLevelAssertionUnifies = true;
@@ -49,8 +49,8 @@ export default define(class TermSubstitution extends Substitution {
49
49
  getVariableNode() { return this.targetTerm.getVariableNode(); }
50
50
 
51
51
  isTrivial() {
52
- const targetTermComparesToReplacementTerm = this.targetTerm.compareTerm(this.replacementTerm),
53
- trivial = targetTermComparesToReplacementTerm; ///
52
+ const targetTermEqualToReplacementTerm = this.targetTerm.isEqualTo(this.replacementTerm),
53
+ trivial = targetTermEqualToReplacementTerm; ///
54
54
 
55
55
  return trivial;
56
56
  }
@@ -60,8 +60,8 @@ export default define(class TermSubstitution extends Substitution {
60
60
  compareTerm(term, context) {
61
61
  term = stripBracketsFromTerm(term, context); ///
62
62
 
63
- const replacementTermComparesToTerm = this.replacementTerm.compareTerm(term),
64
- comparedToTerm = replacementTermComparesToTerm; ///
63
+ const replacementTermEqualToTerm = this.replacementTerm.isEqualTo(term),
64
+ comparedToTerm = replacementTermEqualToTerm; ///
65
65
 
66
66
  return comparedToTerm;
67
67
  }
@@ -48,6 +48,14 @@ export default define(class Term extends Element {
48
48
  return variableIdentifier;
49
49
  }
50
50
 
51
+ isEqualTo(term) {
52
+ const termNode = term.getNode(),
53
+ termNodeMatches = this.matchTermNode(termNode),
54
+ equalTo = termNodeMatches; ///
55
+
56
+ return equalTo;
57
+ }
58
+
51
59
  isGrounded(definedVariables, context) {
52
60
  const term = this, ///
53
61
  variables = variablesFromTerm(term, context);
@@ -1,12 +1,10 @@
1
1
  "use strict";
2
2
 
3
- import { variableFromVariableNode } from "../utilities/element";
3
+ import { variableAssignmentFromTermAndType } from "../utilities/assignment";
4
4
 
5
5
  export function equalityAssignmentFromEquality(equality, context) {
6
6
  const equalityAssignment = (context) => {
7
- const equalityAdded = context.addEquality(equality);
8
-
9
- return equalityAdded;
7
+ context.addEquality(equality);
10
8
  };
11
9
 
12
10
  return equalityAssignment;
@@ -14,10 +12,9 @@ export function equalityAssignmentFromEquality(equality, context) {
14
12
 
15
13
  export function judgementAssignmentFromJudgement(judgement, context) {
16
14
  const judgementAssignment = (context) => {
17
- const declaredJudgement = judgement, ///
18
- declaredJudgementAdded = context.addDeclaredJudgement(declaredJudgement);
15
+ const declaredJudgement = judgement; ///
19
16
 
20
- return declaredJudgementAdded;
17
+ context.addDeclaredJudgement(declaredJudgement);
21
18
  };
22
19
 
23
20
  return judgementAssignment;
@@ -40,18 +37,9 @@ export function rightVariableAssignmentFromEquality(equality, context) {
40
37
  }
41
38
 
42
39
  export function variableAssignmentFromTypeAssertion(typeAssertion, context) {
43
- let variableAssignment = (context) => {
44
- ///
45
- };
46
-
47
40
  const term = typeAssertion.getTerm(),
48
- termSingular = term.isSingular();
49
-
50
- if (termSingular) {
51
- const type = typeAssertion.getType();
52
-
53
- variableAssignment = variableAssignmentFromTermAndType(term, type, context);
54
- }
41
+ type = typeAssertion.getType(),
42
+ variableAssignment = variableAssignmentFromTermAndType(term, type, context);
55
43
 
56
44
  return variableAssignment;
57
45
  }
@@ -77,41 +65,3 @@ export function variableAssignmentFromPrepertyAssertion(propertyAssertion, conte
77
65
  // const variableAssignment = variableAssignmentFromVariable(variable),
78
66
 
79
67
  }
80
-
81
- function variableAssignmentFromTermAndType(term, type, context) {
82
- let variableAssignment = (context) => {
83
- ///
84
- };
85
-
86
- const termSingular = term.isSingular();
87
-
88
- if (termSingular) {
89
- const termType = term.getType(),
90
- termTypeEqualToType = termType.isEqualTo(type);
91
-
92
- if (!termTypeEqualToType) {
93
- const variableNode = term.getVariableNode(),
94
- variable = variableFromVariableNode(variableNode, context);
95
-
96
- variable.setType(type);
97
-
98
- variableAssignment = (context) => {
99
- const declaredVariable = variable; ///
100
-
101
- context.addDeclaredVariable(declaredVariable);
102
-
103
- const declaredVariableTypeString = declaredVariable.getTypeString(),
104
- declaredVariableString = declaredVariable.getString(),
105
- assigned = true; ///
106
-
107
- assigned ?
108
- context.trace(`Assigned the '${declaredVariableString}' declared variable with type '${declaredVariableTypeString}'.`) :
109
- context.debug(`Unable to assign the '${declaredVariableString}' declared variable with type '${declaredVariableTypeString}'.`);
110
-
111
- return assigned;
112
- };
113
- }
114
- }
115
-
116
- return variableAssignment;
117
- }
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+
3
+ import { variableFromVariableNode } from "../utilities/element";
4
+
5
+ export function variableAssignmentFromTermAndType(term, type, context) {
6
+ let variableAssignment = (context) => {
7
+ ///
8
+ };
9
+
10
+ const termSingular = term.isSingular();
11
+
12
+ if (termSingular) {
13
+ const termType = term.getType(),
14
+ termTypeEqualToType = termType.isEqualTo(type);
15
+
16
+ if (!termTypeEqualToType) {
17
+ const variableNode = term.getVariableNode(),
18
+ variable = variableFromVariableNode(variableNode, context);
19
+
20
+ variable.setType(type);
21
+
22
+ variableAssignment = (context) => {
23
+ const declaredVariable = variable; ///
24
+
25
+ context.addDeclaredVariable(declaredVariable);
26
+ };
27
+ }
28
+ }
29
+
30
+ return variableAssignment;
31
+ }
@@ -22,9 +22,9 @@ export function mergeEquivalences(equivalencesA, equivalencesB, context) {
22
22
 
23
23
  export function findEquivalenceByTerm(equivalences, term) {
24
24
  const equivalence = equivalences.find((equivalence) => {
25
- const equivalenceComparesToTerm = equivalence.compareTerm(term);
25
+ const equivalenceEqualToTerm = equivalence.isEqualTo(term);
26
26
 
27
- if (equivalenceComparesToTerm) {
27
+ if (equivalenceEqualToTerm) {
28
28
  return true;
29
29
  }
30
30
  }) || null;
@@ -6,9 +6,9 @@ const { compress } = arrayUtilities;
6
6
 
7
7
  export function compressTerms(terms) {
8
8
  compress(terms, (termA, termB) => {
9
- const termAComparesToTermB = termA.compareTerm(termB);
9
+ const termAEqualToTermB = termA.isEqualTo(termB);
10
10
 
11
- if (!termAComparesToTermB) {
11
+ if (!termAEqualToTermB) {
12
12
  return true;
13
13
  }
14
14
  });