occam-verify-cli 0.0.445 → 0.0.447
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.
- package/lib/axiom.js +26 -36
- package/lib/combinator.js +3 -5
- package/lib/conclusion.js +4 -4
- package/lib/constructor.js +3 -5
- package/lib/label.js +3 -3
- package/lib/premise.js +11 -9
- package/lib/utilities/array.js +15 -12
- package/lib/utilities/node.js +45 -0
- package/lib/verify/axiom.js +2 -2
- package/lib/verify/metaDerivation.js +16 -9
- package/package.json +3 -3
- package/src/axiom.js +36 -61
- package/src/combinator.js +3 -10
- package/src/conclusion.js +4 -10
- package/src/constructor.js +3 -10
- package/src/label.js +4 -4
- package/src/premise.js +20 -22
- package/src/utilities/array.js +1 -1
- package/src/utilities/node.js +50 -0
- package/src/verify/axiom.js +6 -6
- package/src/verify/metaDerivation.js +17 -9
package/lib/utilities/array.js
CHANGED
|
@@ -9,23 +9,26 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
|
|
13
|
-
return
|
|
14
|
-
},
|
|
15
|
-
last: function() {
|
|
16
|
-
return last;
|
|
17
|
-
},
|
|
18
|
-
prune: function() {
|
|
19
|
-
return prune;
|
|
12
|
+
front: function() {
|
|
13
|
+
return front;
|
|
20
14
|
},
|
|
21
15
|
first: function() {
|
|
22
16
|
return first;
|
|
23
17
|
},
|
|
18
|
+
second: function() {
|
|
19
|
+
return second;
|
|
20
|
+
},
|
|
24
21
|
third: function() {
|
|
25
22
|
return third;
|
|
26
23
|
},
|
|
27
|
-
|
|
28
|
-
return
|
|
24
|
+
last: function() {
|
|
25
|
+
return last;
|
|
26
|
+
},
|
|
27
|
+
push: function() {
|
|
28
|
+
return push;
|
|
29
|
+
},
|
|
30
|
+
prune: function() {
|
|
31
|
+
return prune;
|
|
29
32
|
},
|
|
30
33
|
filter: function() {
|
|
31
34
|
return filter;
|
|
@@ -48,7 +51,7 @@ function _interopRequireDefault(obj) {
|
|
|
48
51
|
default: obj
|
|
49
52
|
};
|
|
50
53
|
}
|
|
51
|
-
var
|
|
54
|
+
var front = _necessary.arrayUtilities.front, first = _necessary.arrayUtilities.first, second = _necessary.arrayUtilities.second, third = _necessary.arrayUtilities.third, last = _necessary.arrayUtilities.last, push = _necessary.arrayUtilities.push, prune = _necessary.arrayUtilities.prune, filter = _necessary.arrayUtilities.filter;
|
|
52
55
|
function someSubArray(array, subArrayLength, callback) {
|
|
53
56
|
var found = false;
|
|
54
57
|
var arrayLength = array.length, indexesLength = arrayLength, permutationLength = subArrayLength; ///
|
|
@@ -96,4 +99,4 @@ function rightDifference(arrayA, arrayB) {
|
|
|
96
99
|
});
|
|
97
100
|
}
|
|
98
101
|
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYXJyYXkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgcGVybXV0YXRpb25zTWF0cml4IGZyb20gXCIuLi9wZXJtdXRhdGlvbnNNYXRyaXhcIjtcblxuaW1wb3J0IHsgTUFYSU1VTV9JTkRFWEVTX0xFTkdUSCwgTUFYSU1VTV9QRVJNVVRBVElPTl9MRU5HVEggfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5cbmV4cG9ydCBjb25zdCB7IGZyb250LCBmaXJzdCwgc2Vjb25kLCB0aGlyZCwgbGFzdCwgcHVzaCwgcHJ1bmUsIGZpbHRlciB9ID0gYXJyYXlVdGlsaXRpZXM7XG5cbmV4cG9ydCBmdW5jdGlvbiBzb21lU3ViQXJyYXkoYXJyYXksIHN1YkFycmF5TGVuZ3RoLCBjYWxsYmFjaykge1xuICBsZXQgZm91bmQgPSBmYWxzZTtcblxuICBjb25zdCBhcnJheUxlbmd0aCA9IGFycmF5Lmxlbmd0aCxcbiAgICAgICAgaW5kZXhlc0xlbmd0aCA9IGFycmF5TGVuZ3RoLCAvLy9cbiAgICAgICAgcGVybXV0YXRpb25MZW5ndGggPSBzdWJBcnJheUxlbmd0aDsgLy8vXG5cbiAgaWYgKHBlcm11dGF0aW9uTGVuZ3RoIDw9IE1BWElNVU1fUEVSTVVUQVRJT05fTEVOR1RIKSB7XG4gICAgbGV0IG9mZnNldCxcbiAgICAgICAgcGVybXV0YXRpb25zO1xuXG4gICAgaWYgKGluZGV4ZXNMZW5ndGggPiBNQVhJTVVNX0lOREVYRVNfTEVOR1RIKSB7XG4gICAgICBvZmZzZXQgPSBpbmRleGVzTGVuZ3RoIC0gTUFYSU1VTV9JTkRFWEVTX0xFTkdUSDtcblxuICAgICAgcGVybXV0YXRpb25zID0gcGVybXV0YXRpb25zTWF0cml4W01BWElNVU1fSU5ERVhFU19MRU5HVEhdW3Blcm11dGF0aW9uTGVuZ3RoXTtcbiAgICB9IGVsc2Uge1xuICAgICAgb2Zmc2V0ID0gMDtcblxuICAgICAgcGVybXV0YXRpb25zID0gcGVybXV0YXRpb25zTWF0cml4W2luZGV4ZXNMZW5ndGhdW3Blcm11dGF0aW9uTGVuZ3RoXTtcbiAgICB9XG5cbiAgICBpZiAocGVybXV0YXRpb25zICE9PSBudWxsKSB7XG4gICAgICBmb3VuZCA9IHBlcm11dGF0aW9ucy5zb21lKChwZXJtdXRhdGlvbikgPT4ge1xuICAgICAgICBpZiAocGVybXV0YXRpb24gIT09IG51bGwpIHtcbiAgICAgICAgICBjb25zdCBzdWJBcnJheSA9IFtdO1xuXG4gICAgICAgICAgZm9yIChsZXQgcG9zaXRpb24gPSAwOyBwb3NpdGlvbiA8IHBlcm11dGF0aW9uTGVuZ3RoOyBwb3NpdGlvbisrKSB7XG4gICAgICAgICAgICBjb25zdCBpbmRleCA9IHBlcm11dGF0aW9uW3Bvc2l0aW9uXSArIG9mZnNldCxcbiAgICAgICAgICAgICAgICAgIGVsZW1lbnQgPSBhcnJheVtpbmRleF07XG5cbiAgICAgICAgICAgIHN1YkFycmF5LnB1c2goZWxlbWVudCk7XG4gICAgICAgICAgfVxuXG4gICAgICAgICAgY29uc3QgcGFzc2VkID0gY2FsbGJhY2soc3ViQXJyYXkpO1xuXG4gICAgICAgICAgaWYgKHBhc3NlZCkge1xuICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICB9KTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gZm91bmQ7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBsZWZ0RGlmZmVyZW5jZShhcnJheUEsIGFycmF5Qikge1xuICBmaWx0ZXIoYXJyYXlBLCAoZWxlbWVudEEpID0+IHtcbiAgICBjb25zdCBhcnJheUJJbmNsdWRlc0VsZW1lbnRBID0gYXJyYXlCLmluY2x1ZGVzKGVsZW1lbnRBKTtcblxuICAgIGlmICghYXJyYXlCSW5jbHVkZXNFbGVtZW50QSkge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJpZ2h0RGlmZmVyZW5jZShhcnJheUEsIGFycmF5Qikge1xuICBmaWx0ZXIoYXJyYXlCLCAoZWxlbWVudEIpID0+IHtcbiAgICBjb25zdCBhcnJheUFJbmNsdWRlc0VsZW1lbnRCID0gYXJyYXlBLmluY2x1ZGVzKGVsZW1lbnRCKTtcblxuICAgIGlmICghYXJyYXlBSW5jbHVkZXNFbGVtZW50Qikge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcbn1cbiJdLCJuYW1lcyI6WyJmcm9udCIsImZpcnN0Iiwic2Vjb25kIiwidGhpcmQiLCJsYXN0IiwicHVzaCIsInBydW5lIiwiZmlsdGVyIiwic29tZVN1YkFycmF5IiwibGVmdERpZmZlcmVuY2UiLCJyaWdodERpZmZlcmVuY2UiLCJhcnJheVV0aWxpdGllcyIsImFycmF5Iiwic3ViQXJyYXlMZW5ndGgiLCJjYWxsYmFjayIsImZvdW5kIiwiYXJyYXlMZW5ndGgiLCJsZW5ndGgiLCJpbmRleGVzTGVuZ3RoIiwicGVybXV0YXRpb25MZW5ndGgiLCJNQVhJTVVNX1BFUk1VVEFUSU9OX0xFTkdUSCIsIm9mZnNldCIsInBlcm11dGF0aW9ucyIsIk1BWElNVU1fSU5ERVhFU19MRU5HVEgiLCJwZXJtdXRhdGlvbnNNYXRyaXgiLCJzb21lIiwicGVybXV0YXRpb24iLCJzdWJBcnJheSIsInBvc2l0aW9uIiwiaW5kZXgiLCJlbGVtZW50IiwicGFzc2VkIiwiYXJyYXlBIiwiYXJyYXlCIiwiZWxlbWVudEEiLCJhcnJheUJJbmNsdWRlc0VsZW1lbnRBIiwiaW5jbHVkZXMiLCJlbGVtZW50QiIsImFycmF5QUluY2x1ZGVzRWxlbWVudEIiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQVFlQSxLQUFLO2VBQUxBOztJQUFPQyxLQUFLO2VBQUxBOztJQUFPQyxNQUFNO2VBQU5BOztJQUFRQyxLQUFLO2VBQUxBOztJQUFPQyxJQUFJO2VBQUpBOztJQUFNQyxJQUFJO2VBQUpBOztJQUFNQyxLQUFLO2VBQUxBOztJQUFPQyxNQUFNO2VBQU5BOztJQUUvQ0MsWUFBWTtlQUFaQTs7SUE4Q0FDLGNBQWM7ZUFBZEE7O0lBVUFDLGVBQWU7ZUFBZkE7Ozt5QkFoRWU7dUVBRUE7eUJBRW9DOzs7Ozs7QUFFNUQsSUFBUVYsUUFBMkRXLHlCQUFjLENBQXpFWCxPQUFPQyxRQUFvRFUseUJBQWMsQ0FBbEVWLE9BQU9DLFNBQTZDUyx5QkFBYyxDQUEzRFQsUUFBUUMsUUFBcUNRLHlCQUFjLENBQW5EUixPQUFPQyxPQUE4Qk8seUJBQWMsQ0FBNUNQLE1BQU1DLE9BQXdCTSx5QkFBYyxDQUF0Q04sTUFBTUMsUUFBa0JLLHlCQUFjLENBQWhDTCxPQUFPQyxTQUFXSSx5QkFBYyxDQUF6Qko7QUFFeEQsU0FBU0MsYUFBYUksS0FBSyxFQUFFQyxjQUFjLEVBQUVDLFFBQVEsRUFBRTtJQUM1RCxJQUFJQyxRQUFRLEtBQUs7SUFFakIsSUFBTUMsY0FBY0osTUFBTUssTUFBTSxFQUMxQkMsZ0JBQWdCRixhQUNoQkcsb0JBQW9CTixnQkFBZ0IsR0FBRztJQUU3QyxJQUFJTSxxQkFBcUJDLHFDQUEwQixFQUFFO1FBQ25ELElBQUlDLFFBQ0FDO1FBRUosSUFBSUosZ0JBQWdCSyxpQ0FBc0IsRUFBRTtZQUMxQ0YsU0FBU0gsZ0JBQWdCSyxpQ0FBc0I7WUFFL0NELGVBQWVFLDJCQUFrQixDQUFDRCxpQ0FBc0IsQ0FBQyxDQUFDSixrQkFBa0I7UUFDOUUsT0FBTztZQUNMRSxTQUFTO1lBRVRDLGVBQWVFLDJCQUFrQixDQUFDTixjQUFjLENBQUNDLGtCQUFrQjtRQUNyRSxDQUFDO1FBRUQsSUFBSUcsaUJBQWlCLElBQUksRUFBRTtZQUN6QlAsUUFBUU8sYUFBYUcsSUFBSSxDQUFDLFNBQUNDLGFBQWdCO2dCQUN6QyxJQUFJQSxnQkFBZ0IsSUFBSSxFQUFFO29CQUN4QixJQUFNQyxXQUFXLEVBQUU7b0JBRW5CLElBQUssSUFBSUMsV0FBVyxHQUFHQSxXQUFXVCxtQkFBbUJTLFdBQVk7d0JBQy9ELElBQU1DLFFBQVFILFdBQVcsQ0FBQ0UsU0FBUyxHQUFHUCxRQUNoQ1MsVUFBVWxCLEtBQUssQ0FBQ2lCLE1BQU07d0JBRTVCRixTQUFTdEIsSUFBSSxDQUFDeUI7b0JBQ2hCO29CQUVBLElBQU1DLFNBQVNqQixTQUFTYTtvQkFFeEIsSUFBSUksUUFBUTt3QkFDVixPQUFPLElBQUk7b0JBQ2IsQ0FBQztnQkFDSCxDQUFDO1lBQ0g7UUFDRixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU9oQjtBQUNUO0FBRU8sU0FBU04sZUFBZXVCLE1BQU0sRUFBRUMsTUFBTSxFQUFFO0lBQzdDMUIsT0FBT3lCLFFBQVEsU0FBQ0UsVUFBYTtRQUMzQixJQUFNQyx5QkFBeUJGLE9BQU9HLFFBQVEsQ0FBQ0Y7UUFFL0MsSUFBSSxDQUFDQyx3QkFBd0I7WUFDM0IsT0FBTyxJQUFJO1FBQ2IsQ0FBQztJQUNIO0FBQ0Y7QUFFTyxTQUFTekIsZ0JBQWdCc0IsTUFBTSxFQUFFQyxNQUFNLEVBQUU7SUFDOUMxQixPQUFPMEIsUUFBUSxTQUFDSSxVQUFhO1FBQzNCLElBQU1DLHlCQUF5Qk4sT0FBT0ksUUFBUSxDQUFDQztRQUUvQyxJQUFJLENBQUNDLHdCQUF3QjtZQUMzQixPQUFPLElBQUk7UUFDYixDQUFDO0lBQ0g7QUFDRiJ9
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
termNodeFromTermJSON: function() {
|
|
13
|
+
return termNodeFromTermJSON;
|
|
14
|
+
},
|
|
15
|
+
labelNodeFromLabelJSON: function() {
|
|
16
|
+
return labelNodeFromLabelJSON;
|
|
17
|
+
},
|
|
18
|
+
statementNodeFromStatementJSON: function() {
|
|
19
|
+
return statementNodeFromStatementJSON;
|
|
20
|
+
},
|
|
21
|
+
metastatementNodeFromMetastatementJSON: function() {
|
|
22
|
+
return metastatementNodeFromMetastatementJSON;
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
var _query = require("../utilities/query");
|
|
26
|
+
var _ruleNames = require("../ruleNames");
|
|
27
|
+
var statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement"), metastatementNodeQuery = (0, _query.nodeQuery)("/unqualifiedMetastatement/metastatement");
|
|
28
|
+
function termNodeFromTermJSON(termJSON, releaseContext) {
|
|
29
|
+
var ruleName = _ruleNames.TERM_RULE_NAME, content = termJSON, node = releaseContext.nodeFromContentAndRuleName(content, ruleName), termNode = node; ///
|
|
30
|
+
return termNode;
|
|
31
|
+
}
|
|
32
|
+
function labelNodeFromLabelJSON(labelJSON, releaseContext) {
|
|
33
|
+
var content = labelJSON, ruleName = _ruleNames.LABEL_RULE_NAME, node = releaseContext.nodeFromContentAndRuleName(content, ruleName), labelNode = node; ///
|
|
34
|
+
return labelNode;
|
|
35
|
+
}
|
|
36
|
+
function statementNodeFromStatementJSON(statementJSON, releaseContext) {
|
|
37
|
+
var ruleName = _ruleNames.UNQUALIFIED_STATEMENT_RULE_NAME, content = "".concat(statementJSON, "\n"), node = releaseContext.nodeFromContentAndRuleName(content, ruleName), unqualifiedStatementNode = node, statementNode = statementNodeQuery(unqualifiedStatementNode);
|
|
38
|
+
return statementNode;
|
|
39
|
+
}
|
|
40
|
+
function metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext) {
|
|
41
|
+
var ruleName = _ruleNames.UNQUALIFIED_METASTATEMENT_RULE_NAME, content = "".concat(metastatementJSON, "\n"), node = releaseContext.nodeFromContentAndRuleName(content, ruleName), unqualifiedMetastatementNode = node, metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
|
|
42
|
+
return metastatementNode;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbm9kZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgVEVSTV9SVUxFX05BTUUsXG4gICAgICAgICBMQUJFTF9SVUxFX05BTUUsXG4gICAgICAgICBVTlFVQUxJRklFRF9TVEFURU1FTlRfUlVMRV9OQU1FLFxuICAgICAgICAgVU5RVUFMSUZJRURfTUVUQVNUQVRFTUVOVF9SVUxFX05BTUUgfSBmcm9tIFwiLi4vcnVsZU5hbWVzXCI7XG5cbmNvbnN0IHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZFN0YXRlbWVudC9zdGF0ZW1lbnRcIiksXG4gICAgICBtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3VucXVhbGlmaWVkTWV0YXN0YXRlbWVudC9tZXRhc3RhdGVtZW50XCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gdGVybU5vZGVGcm9tVGVybUpTT04odGVybUpTT04sIHJlbGVhc2VDb250ZXh0KSB7XG4gIGNvbnN0IHJ1bGVOYW1lID0gVEVSTV9SVUxFX05BTUUsXG4gICAgICAgIGNvbnRlbnQgPSB0ZXJtSlNPTiwgLy8vXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHRlcm1Ob2RlID0gbm9kZTsgIC8vL1xuXG4gIHJldHVybiB0ZXJtTm9kZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGxhYmVsTm9kZUZyb21MYWJlbEpTT04obGFiZWxKU09OLCByZWxlYXNlQ29udGV4dCkge1xuICBjb25zdCBjb250ZW50ID0gbGFiZWxKU09OLCAvLy9cbiAgICAgICAgcnVsZU5hbWUgPSBMQUJFTF9SVUxFX05BTUUsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIGxhYmVsTm9kZSA9IG5vZGU7IC8vL1xuXG4gIHJldHVybiBsYWJlbE5vZGU7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudEpTT04oc3RhdGVtZW50SlNPTiwgcmVsZWFzZUNvbnRleHQpIHtcbiAgY29uc3QgcnVsZU5hbWUgPSBVTlFVQUxJRklFRF9TVEFURU1FTlRfUlVMRV9OQU1FLFxuICAgICAgICBjb250ZW50ID0gYCR7c3RhdGVtZW50SlNPTn1cbmAsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSA9IG5vZGUsICAvLy9cbiAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiBzdGF0ZW1lbnROb2RlO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudEpTT04obWV0YXN0YXRlbWVudEpTT04sIHJlbGVhc2VDb250ZXh0KSB7XG4gIGNvbnN0IHJ1bGVOYW1lID0gVU5RVUFMSUZJRURfTUVUQVNUQVRFTUVOVF9SVUxFX05BTUUsXG4gICAgICAgIGNvbnRlbnQgPSBgJHttZXRhc3RhdGVtZW50SlNPTn1cbmAsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUgPSBub2RlLCAgLy8vXG4gICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICByZXR1cm4gbWV0YXN0YXRlbWVudE5vZGU7XG59XG4iXSwibmFtZXMiOlsidGVybU5vZGVGcm9tVGVybUpTT04iLCJsYWJlbE5vZGVGcm9tTGFiZWxKU09OIiwic3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRKU09OIiwibWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudEpTT04iLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5IiwidGVybUpTT04iLCJyZWxlYXNlQ29udGV4dCIsInJ1bGVOYW1lIiwiVEVSTV9SVUxFX05BTUUiLCJjb250ZW50Iiwibm9kZSIsIm5vZGVGcm9tQ29udGVudEFuZFJ1bGVOYW1lIiwidGVybU5vZGUiLCJsYWJlbEpTT04iLCJMQUJFTF9SVUxFX05BTUUiLCJsYWJlbE5vZGUiLCJzdGF0ZW1lbnRKU09OIiwiVU5RVUFMSUZJRURfU1RBVEVNRU5UX1JVTEVfTkFNRSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJtZXRhc3RhdGVtZW50SlNPTiIsIlVOUVVBTElGSUVEX01FVEFTVEFURU1FTlRfUlVMRV9OQU1FIiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFzdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFXZ0JBLG9CQUFvQjtlQUFwQkE7O0lBU0FDLHNCQUFzQjtlQUF0QkE7O0lBU0FDLDhCQUE4QjtlQUE5QkE7O0lBV0FDLHNDQUFzQztlQUF0Q0E7OztxQkF0Q1U7eUJBSTBCO0FBRXBELElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQyxvQ0FDL0JDLHlCQUF5QkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVsQyxTQUFTTCxxQkFBcUJPLFFBQVEsRUFBRUMsY0FBYyxFQUFFO0lBQzdELElBQU1DLFdBQVdDLHlCQUFjLEVBQ3pCQyxVQUFVSixVQUNWSyxPQUFPSixlQUFlSywwQkFBMEIsQ0FBQ0YsU0FBU0YsV0FDMURLLFdBQVdGLE1BQU8sR0FBRztJQUUzQixPQUFPRTtBQUNUO0FBRU8sU0FBU2IsdUJBQXVCYyxTQUFTLEVBQUVQLGNBQWMsRUFBRTtJQUNoRSxJQUFNRyxVQUFVSSxXQUNWTixXQUFXTywwQkFBZSxFQUMxQkosT0FBT0osZUFBZUssMEJBQTBCLENBQUNGLFNBQVNGLFdBQzFEUSxZQUFZTCxNQUFNLEdBQUc7SUFFM0IsT0FBT0s7QUFDVDtBQUVPLFNBQVNmLCtCQUErQmdCLGFBQWEsRUFBRVYsY0FBYyxFQUFFO0lBQzVFLElBQU1DLFdBQVdVLDBDQUErQixFQUMxQ1IsVUFBVSxBQUFDLEdBQWdCLE9BQWRPLGVBQWMsT0FFM0JOLE9BQU9KLGVBQWVLLDBCQUEwQixDQUFDRixTQUFTRixXQUMxRFcsMkJBQTJCUixNQUMzQlMsZ0JBQWdCakIsbUJBQW1CZ0I7SUFFekMsT0FBT0M7QUFDVDtBQUVPLFNBQVNsQix1Q0FBdUNtQixpQkFBaUIsRUFBRWQsY0FBYyxFQUFFO0lBQ3hGLElBQU1DLFdBQVdjLDhDQUFtQyxFQUM5Q1osVUFBVSxBQUFDLEdBQW9CLE9BQWxCVyxtQkFBa0IsT0FFL0JWLE9BQU9KLGVBQWVLLDBCQUEwQixDQUFDRixTQUFTRixXQUMxRGUsK0JBQStCWixNQUMvQmEsb0JBQW9CbkIsdUJBQXVCa0I7SUFFakQsT0FBT0M7QUFDVCJ9
|
package/lib/verify/axiom.js
CHANGED
|
@@ -41,7 +41,7 @@ function verifyAxiom(axiomNode, fileContext) {
|
|
|
41
41
|
if (indicativeConditionalNode !== null) {
|
|
42
42
|
var indicativeConditionalVerified = (0, _indicativeConditional.default)(indicativeConditionalNode, proofContext);
|
|
43
43
|
if (indicativeConditionalVerified !== null) {
|
|
44
|
-
var statementNodes = statementNodesQuery(indicativeConditionalNode),
|
|
44
|
+
var statementNodes = statementNodesQuery(indicativeConditionalNode), lastStatementNode = (0, _array.last)(statementNodes), frontStatementNodes = (0, _array.front)(statementNodes), consequentStatementNode = lastStatementNode, suppositionStatementNodes = frontStatementNodes, axiom1 = _axiom.default.fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode);
|
|
45
45
|
fileContext.addAxiom(axiom1);
|
|
46
46
|
axiomVerified = true;
|
|
47
47
|
}
|
|
@@ -54,4 +54,4 @@ function verifyAxiom(axiomNode, fileContext) {
|
|
|
54
54
|
return axiomVerified;
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvYXhpb20uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBBeGlvbSBmcm9tIFwiLi4vYXhpb21cIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCBQcm9vZkNvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvcHJvb2ZcIjtcbmltcG9ydCB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudC91bnF1YWxpZmllZFwiO1xuaW1wb3J0IHZlcmlmeUluZGljYXRpdmVDb25kaXRpb25hbCBmcm9tIFwiLi4vdmVyaWZ5L2luZGljYXRpdmVDb25kaXRpb25hbFwiO1xuXG5pbXBvcnQgeyBmcm9udCwgbGFzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IG5vZGVzQXNTdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBsYWJlbE5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL2F4aW9tL2xhYmVsXCIpLFxuICAgICAgc3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3VucXVhbGlmaWVkU3RhdGVtZW50L3N0YXRlbWVudCFcIiksXG4gICAgICBzdGF0ZW1lbnROb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi9pbmRpY2F0aXZlQ29uZGl0aW9uYWwvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKSxcbiAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2F4aW9tL3VucXVhbGlmaWVkU3RhdGVtZW50IVwiKSxcbiAgICAgIGluZGljYXRpdmVDb25kaXRpb25hbE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9heGlvbS9pbmRpY2F0aXZlQ29uZGl0aW9uYWwhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlBeGlvbShheGlvbU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCBheGlvbVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgZmlsZUNvbnRleHQuYmVnaW4oYXhpb21Ob2RlKTtcblxuICBjb25zdCBsYWJlbE5vZGVzID0gbGFiZWxOb2Rlc1F1ZXJ5KGF4aW9tTm9kZSksXG4gICAgICAgIGxhYmVsc1N0cmluZyA9IG5vZGVzQXNTdHJpbmcobGFiZWxOb2RlcyksXG4gICAgICAgIHByb29mQ29udGV4dCA9IFByb29mQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke2xhYmVsc1N0cmluZ30nIGF4aW9tLi4uYCk7XG5cbiAgY29uc3QgbGFiZWxzID0gW10sXG4gICAgICAgIGxhYmVsc1ZlcmlmaWVkID0gdmVyaWZ5TGFiZWxzKGxhYmVsTm9kZXMsIGxhYmVscywgZmlsZUNvbnRleHQpO1xuXG4gIGlmIChsYWJlbHNWZXJpZmllZCkge1xuICAgIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSA9IHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5KGF4aW9tTm9kZSksXG4gICAgICAgICAgaW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZSA9IGluZGljYXRpdmVDb25kaXRpb25hbE5vZGVRdWVyeShheGlvbU5vZGUpO1xuXG4gICAgaWYgKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSAhPT0gbnVsbCkge1xuICAgICAgY29uc3QgdW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IHZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50KHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KTtcblxuICAgICAgaWYgKHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpLFxuICAgICAgICAgICAgICBheGlvbSA9IEF4aW9tLmZyb21MYWJlbHNBbmRTdGF0ZW1lbnROb2RlKGxhYmVscywgc3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgICAgZmlsZUNvbnRleHQuYWRkQXhpb20oYXhpb20pO1xuXG4gICAgICAgIGF4aW9tVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmIChpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBpbmRpY2F0aXZlQ29uZGl0aW9uYWxWZXJpZmllZCA9IHZlcmlmeUluZGljYXRpdmVDb25kaXRpb25hbChpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlLCBwcm9vZkNvbnRleHQpO1xuXG4gICAgICBpZiAoaW5kaWNhdGl2ZUNvbmRpdGlvbmFsVmVyaWZpZWQgIT09IG51bGwpIHtcbiAgICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZXMgPSBzdGF0ZW1lbnROb2Rlc1F1ZXJ5KGluZGljYXRpdmVDb25kaXRpb25hbE5vZGUpLFxuICAgICAgICAgICAgICBsYXN0U3RhdGVtZW50Tm9kZSA9IGxhc3Qoc3RhdGVtZW50Tm9kZXMpLFxuICAgICAgICAgICAgICBmcm9udFN0YXRlbWVudE5vZGVzID0gZnJvbnQoc3RhdGVtZW50Tm9kZXMpLFxuICAgICAgICAgICAgICBjb25zZXF1ZW50U3RhdGVtZW50Tm9kZSA9IGxhc3RTdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgICAgIHN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXMgPSBmcm9udFN0YXRlbWVudE5vZGVzLCAgLy8vXG4gICAgICAgICAgICAgIGF4aW9tID0gQXhpb20uZnJvbUxhYmVsc1N1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXNBbmRDb25zZXF1ZW50U3RhdGVtZW50Tm9kZShsYWJlbHMsIHN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXMsIGNvbnNlcXVlbnRTdGF0ZW1lbnROb2RlKTtcblxuICAgICAgICBmaWxlQ29udGV4dC5hZGRBeGlvbShheGlvbSk7XG5cbiAgICAgICAgYXhpb21WZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKGF4aW9tVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7bGFiZWxzU3RyaW5nfScgYXhpb20uYCk7XG4gIH1cblxuICBheGlvbVZlcmlmaWVkID9cbiAgICBmaWxlQ29udGV4dC5jb21wbGV0ZShheGlvbU5vZGUpIDpcbiAgICAgIGZpbGVDb250ZXh0LmhhbHQoYXhpb21Ob2RlKTtcblxuICByZXR1cm4gYXhpb21WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlBeGlvbSIsImxhYmVsTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJzdGF0ZW1lbnROb2Rlc1F1ZXJ5IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkiLCJpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlUXVlcnkiLCJheGlvbU5vZGUiLCJmaWxlQ29udGV4dCIsImF4aW9tVmVyaWZpZWQiLCJiZWdpbiIsImxhYmVsTm9kZXMiLCJsYWJlbHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwicHJvb2ZDb250ZXh0IiwiUHJvb2ZDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0IiwiZGVidWciLCJsYWJlbHMiLCJsYWJlbHNWZXJpZmllZCIsInZlcmlmeUxhYmVscyIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsImluZGljYXRpdmVDb25kaXRpb25hbE5vZGUiLCJ1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkIiwidmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwiYXhpb20iLCJBeGlvbSIsImZyb21MYWJlbHNBbmRTdGF0ZW1lbnROb2RlIiwiYWRkQXhpb20iLCJpbmRpY2F0aXZlQ29uZGl0aW9uYWxWZXJpZmllZCIsInZlcmlmeUluZGljYXRpdmVDb25kaXRpb25hbCIsInN0YXRlbWVudE5vZGVzIiwibGFzdFN0YXRlbWVudE5vZGUiLCJsYXN0IiwiZnJvbnRTdGF0ZW1lbnROb2RlcyIsImZyb250IiwiY29uc2VxdWVudFN0YXRlbWVudE5vZGUiLCJzdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzIiwiZnJvbUxhYmVsc1N1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXNBbmRDb25zZXF1ZW50U3RhdGVtZW50Tm9kZSIsImluZm8iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWtCQTs7O2VBQXdCQTs7OzBEQWhCTjsyREFDTzswREFDQTtnRUFDYzswRUFDQztxQkFFWjtzQkFDRTtxQkFDUTs7Ozs7O0FBRXRDLElBQU1DLGtCQUFrQkMsSUFBQUEsaUJBQVUsRUFBQyxpQkFDN0JDLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQyxxQ0FDL0JDLHNCQUFzQkgsSUFBQUEsaUJBQVUsRUFBQywyREFDakNJLGdDQUFnQ0YsSUFBQUEsZ0JBQVMsRUFBQyxpQ0FDMUNHLGlDQUFpQ0gsSUFBQUEsZ0JBQVMsRUFBQztBQUVsQyxTQUFTSixZQUFZUSxTQUFTLEVBQUVDLFdBQVcsRUFBRTtJQUMxRCxJQUFJQyxnQkFBZ0IsS0FBSztJQUV6QkQsWUFBWUUsS0FBSyxDQUFDSDtJQUVsQixJQUFNSSxhQUFhWCxnQkFBZ0JPLFlBQzdCSyxlQUFlQyxJQUFBQSxxQkFBYSxFQUFDRixhQUM3QkcsZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNSO0lBRWxEQSxZQUFZUyxLQUFLLENBQUMsQUFBQyxrQkFBOEIsT0FBYkwsY0FBYTtJQUVqRCxJQUFNTSxTQUFTLEVBQUUsRUFDWEMsaUJBQWlCQyxJQUFBQSxlQUFZLEVBQUNULFlBQVlPLFFBQVFWO0lBRXhELElBQUlXLGdCQUFnQjtRQUNsQixJQUFNRSwyQkFBMkJoQiw4QkFBOEJFLFlBQ3pEZSw0QkFBNEJoQiwrQkFBK0JDO1FBRWpFLElBQUljLDZCQUE2QixJQUFJLEVBQUU7WUFDckMsSUFBTUUsK0JBQStCQyxJQUFBQSxvQkFBMEIsRUFBQ0gsMEJBQTBCUDtZQUUxRixJQUFJUyw4QkFBOEI7Z0JBQ2hDLElBQU1FLGdCQUFnQnZCLG1CQUFtQm1CLDJCQUNuQ0ssUUFBUUMsY0FBSyxDQUFDQywwQkFBMEIsQ0FBQ1YsUUFBUU87Z0JBRXZEakIsWUFBWXFCLFFBQVEsQ0FBQ0g7Z0JBRXJCakIsZ0JBQWdCLElBQUk7WUFDdEIsQ0FBQztRQUNILENBQUM7UUFFRCxJQUFJYSw4QkFBOEIsSUFBSSxFQUFFO1lBQ3RDLElBQU1RLGdDQUFnQ0MsSUFBQUEsOEJBQTJCLEVBQUNULDJCQUEyQlI7WUFFN0YsSUFBSWdCLGtDQUFrQyxJQUFJLEVBQUU7Z0JBQzFDLElBQU1FLGlCQUFpQjVCLG9CQUFvQmtCLDRCQUNyQ1csb0JBQW9CQyxJQUFBQSxXQUFJLEVBQUNGLGlCQUN6Qkcsc0JBQXNCQyxJQUFBQSxZQUFLLEVBQUNKLGlCQUM1QkssMEJBQTBCSixtQkFDMUJLLDRCQUE0QkgscUJBQzVCVCxTQUFRQyxjQUFLLENBQUNZLDZEQUE2RCxDQUFDckIsUUFBUW9CLDJCQUEyQkQ7Z0JBRXJIN0IsWUFBWXFCLFFBQVEsQ0FBQ0g7Z0JBRXJCakIsZ0JBQWdCLElBQUk7WUFDdEIsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsZUFBZTtRQUNqQkQsWUFBWWdDLElBQUksQ0FBQyxBQUFDLGlCQUE2QixPQUFiNUIsY0FBYTtJQUNqRCxDQUFDO0lBRURILGdCQUNFRCxZQUFZaUMsUUFBUSxDQUFDbEMsYUFDbkJDLFlBQVlrQyxJQUFJLENBQUNuQyxVQUFVO0lBRS9CLE9BQU9FO0FBQ1QifQ==
|
|
@@ -70,28 +70,35 @@ function verifyMetaDerivation(metaDerivationNode, metaproofContext) {
|
|
|
70
70
|
function verifyMetaSubproof(metaSubproofNode, metaproofContext) {
|
|
71
71
|
var metaSubproofVerified = false;
|
|
72
72
|
metaproofContext = _metaproof.default.fromMetaproofContext(metaproofContext); ///
|
|
73
|
-
var qualifiedOrUnqualifiedMetastatementNodes = qualifiedOrUnqualifiedMetastatementNodesQuery(metaSubproofNode),
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
73
|
+
var qualifiedOrUnqualifiedMetastatementNodes = qualifiedOrUnqualifiedMetastatementNodesQuery(metaSubproofNode), frontQualifiedOrUnqualifiedMetastatementNodes = (0, _array.front)(qualifiedOrUnqualifiedMetastatementNodes), unqualifiedMetastatementNodes = frontQualifiedOrUnqualifiedMetastatementNodes, unqualifiedMetastatementsVerified = unqualifiedMetastatementNodes.every(function(unqualifiedMetastatementNode) {
|
|
74
|
+
var unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, metaproofContext);
|
|
75
|
+
if (unqualifiedMetastatementVerified) {
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
if (unqualifiedMetastatementsVerified) {
|
|
80
|
+
unqualifiedMetastatementNodes.forEach(function(unqualifiedMetastatementNode) {
|
|
81
|
+
var metaAssertion = _metaAssertion.default.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);
|
|
82
|
+
metaproofContext.addMetaAssertion(metaAssertion);
|
|
83
|
+
});
|
|
77
84
|
var metaDerivationVerified = true;
|
|
78
85
|
var metaDerivationNode = metaDerivationNodeQuery(metaSubproofNode);
|
|
79
86
|
if (metaDerivationNode !== null) {
|
|
80
87
|
metaDerivationVerified = verifyMetaDerivation(metaDerivationNode, metaproofContext);
|
|
81
88
|
}
|
|
82
89
|
if (metaDerivationVerified) {
|
|
83
|
-
var
|
|
90
|
+
var lastQualifiedOrUnqualifiedMetastatementNode = (0, _array.last)(qualifiedOrUnqualifiedMetastatementNodes), qualifiedOrUnqualifiedMetastatementNode = lastQualifiedOrUnqualifiedMetastatementNode, qualifiedMetastatementNode = qualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode), unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode);
|
|
84
91
|
if (qualifiedMetastatementNode !== null) {
|
|
85
92
|
var qualifiedMetastatementVerified = (0, _qualified.default)(qualifiedMetastatementNode, metaproofContext);
|
|
86
93
|
metaSubproofVerified = qualifiedMetastatementVerified; ///
|
|
87
94
|
}
|
|
88
|
-
if (
|
|
89
|
-
var
|
|
90
|
-
metaSubproofVerified =
|
|
95
|
+
if (unqualifiedMetastatementNode !== null) {
|
|
96
|
+
var unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, metaproofContext);
|
|
97
|
+
metaSubproofVerified = unqualifiedMetastatementVerified; ///
|
|
91
98
|
}
|
|
92
99
|
}
|
|
93
100
|
}
|
|
94
101
|
return metaSubproofVerified;
|
|
95
102
|
}
|
|
96
103
|
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metaDerivation.js"],"sourcesContent":["\"use strict\";\n\nimport MetaAssertion from \"../metaAssertion\";\nimport MetaproofContext from \"../context/metaproof\";\nimport verifyQualifiedMetastatement from \"../verify/metastatement/qualified\";\nimport verifyUnqualifiedMetastatement from \"../verify/metastatement/unqualified\";\n\nimport { first, second } from \"../utilities/array\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\nimport { META_SUBPROOF_RULE_NAME, QUALIFIED_METASTATEMENT_RULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from \"../ruleNames\";\n\nconst metaDerivationNodeQuery = nodeQuery(\"/metaSubproof/metaDerivation!\"),\n      metaDerivationChildNodesQuery = nodesQuery(\"/metaDerivation/*\"),\n      qualifiedMetastatementNodeQuery = nodeQuery(\"/qualifiedMetastatement\"),\n      unqualifiedMetastatementNodeQuery = nodeQuery(\"/unqualifiedMetastatement!\"),\n      qualifiedOrUnqualifiedMetastatementNodesQuery = nodesQuery(\"/metaSubproof/qualifiedMetastatement|unqualifiedMetastatement\")\n\nexport default function verifyMetaDerivation(metaDerivationNode, metaproofContext) {\n  let metaDerivationVerified;\n\n  metaproofContext.begin(metaDerivationNode);\n\n  const derived = true;\n\n  metaproofContext.setDerived(derived);\n\n  const metaDerivationChildNodes = metaDerivationChildNodesQuery(metaDerivationNode),\n        metaDerivationChildNodesVerified = metaDerivationChildNodes.every((metaDerivationChildNode) => {\n          let metaDerivationChildNodeVerified;\n\n          const ruleName = metaDerivationChildNode.getRuleName();\n\n          switch (ruleName) {\n            case META_SUBPROOF_RULE_NAME: {\n              const metaSubproofNode = metaDerivationChildNode,  ///\n                    metaSubproofVerified = verifyMetaSubproof(metaSubproofNode, metaproofContext);\n\n              if (metaSubproofVerified) {\n                const metaAssertion = MetaAssertion.fromMetaSubproofNode(metaSubproofNode);\n\n                metaproofContext.addMetaAssertion(metaAssertion);\n\n                metaDerivationChildNodeVerified = true;\n              }\n\n              break;\n            }\n\n            case QUALIFIED_METASTATEMENT_RULE_NAME: {\n              const qualifiedMetastatementNode = metaDerivationChildNode,  ///\n                    qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, metaproofContext);\n\n              if (qualifiedMetastatementVerified) {\n                const metaAssertion = MetaAssertion.fromQualifiedMetastatementNode(qualifiedMetastatementNode);\n\n                metaproofContext.addMetaAssertion(metaAssertion);\n\n                metaDerivationChildNodeVerified = qualifiedMetastatementVerified; ///\n              }\n\n              break;\n            }\n\n            case UNQUALIFIED_METASTATEMENT_RULE_NAME: {\n              const unqualifiedMetastatementNode = metaDerivationChildNode,  ///\n                    unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);\n\n              if (unqualifiedMetastatementVerified) {\n                const metaAssertion = MetaAssertion.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);\n\n                metaproofContext.addMetaAssertion(metaAssertion);\n\n                metaDerivationChildNodeVerified = true;\n              }\n\n              break;\n            }\n          }\n\n          return metaDerivationChildNodeVerified;\n        });\n\n  metaDerivationVerified = metaDerivationChildNodesVerified;  ///\n\n  metaDerivationVerified ?\n    metaproofContext.complete(metaDerivationNode) :\n      metaproofContext.halt(metaDerivationNode);\n\n  return metaDerivationVerified;\n}\n\nfunction verifyMetaSubproof(metaSubproofNode, metaproofContext) {\n  let metaSubproofVerified = false;\n\n  metaproofContext = MetaproofContext.fromMetaproofContext(metaproofContext); ///\n\n  const qualifiedOrUnqualifiedMetastatementNodes = qualifiedOrUnqualifiedMetastatementNodesQuery(metaSubproofNode),\n        firstQualifiedOrUnqualifiedMetastatementNode = first(qualifiedOrUnqualifiedMetastatementNodes),\n        unqualifiedMetastatementNode = firstQualifiedOrUnqualifiedMetastatementNode,  ///\n        unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);\n\n  if (unqualifiedMetastatementVerified) {\n    const metaAssertion = MetaAssertion.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);\n\n    metaproofContext.addMetaAssertion(metaAssertion);\n\n    let metaDerivationVerified = true;\n\n    const metaDerivationNode = metaDerivationNodeQuery(metaSubproofNode);\n\n    if (metaDerivationNode !== null) {\n      metaDerivationVerified = verifyMetaDerivation(metaDerivationNode, metaproofContext);\n    }\n\n    if (metaDerivationVerified) {\n      const secondQualifiedOrUnqualifiedMetastatementNode = second(qualifiedOrUnqualifiedMetastatementNodes),\n            qualifiedOrUnqualifiedMetastatementNode = secondQualifiedOrUnqualifiedMetastatementNode,  ///\n            qualifiedMetastatementNode = qualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode),\n            unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode);\n\n      if (qualifiedMetastatementNode !== null) {\n        const qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, metaproofContext);\n\n        metaSubproofVerified = qualifiedMetastatementVerified;  ///\n      }\n\n      if (unqualifiedMetastatementNode !== null) {\n        const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);\n\n        metaSubproofVerified = unqualifiedMetastatementVerified;  ///\n      }\n    }\n  }\n\n  return metaSubproofVerified;\n}\n"],"names":["verifyMetaDerivation","metaDerivationNodeQuery","nodeQuery","metaDerivationChildNodesQuery","nodesQuery","qualifiedMetastatementNodeQuery","unqualifiedMetastatementNodeQuery","qualifiedOrUnqualifiedMetastatementNodesQuery","metaDerivationNode","metaproofContext","metaDerivationVerified","begin","derived","setDerived","metaDerivationChildNodes","metaDerivationChildNodesVerified","every","metaDerivationChildNode","metaDerivationChildNodeVerified","ruleName","getRuleName","META_SUBPROOF_RULE_NAME","metaSubproofNode","metaSubproofVerified","verifyMetaSubproof","metaAssertion","MetaAssertion","fromMetaSubproofNode","addMetaAssertion","QUALIFIED_METASTATEMENT_RULE_NAME","qualifiedMetastatementNode","qualifiedMetastatementVerified","verifyQualifiedMetastatement","fromQualifiedMetastatementNode","UNQUALIFIED_METASTATEMENT_RULE_NAME","unqualifiedMetastatementNode","unqualifiedMetastatementVerified","verifyUnqualifiedMetastatement","fromUnqualifiedMetastatementNode","complete","halt","MetaproofContext","fromMetaproofContext","qualifiedOrUnqualifiedMetastatementNodes","firstQualifiedOrUnqualifiedMetastatementNode","first","secondQualifiedOrUnqualifiedMetastatementNode","second","qualifiedOrUnqualifiedMetastatementNode"],"mappings":"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"}
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metaDerivation.js"],"sourcesContent":["\"use strict\";\n\nimport MetaAssertion from \"../metaAssertion\";\nimport MetaproofContext from \"../context/metaproof\";\nimport verifyQualifiedMetastatement from \"../verify/metastatement/qualified\";\nimport verifyUnqualifiedMetastatement from \"../verify/metastatement/unqualified\";\n\nimport { front, last } from \"../utilities/array\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\nimport { META_SUBPROOF_RULE_NAME, QUALIFIED_METASTATEMENT_RULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from \"../ruleNames\";\n\nconst metaDerivationNodeQuery = nodeQuery(\"/metaSubproof/metaDerivation!\"),\n      metaDerivationChildNodesQuery = nodesQuery(\"/metaDerivation/*\"),\n      qualifiedMetastatementNodeQuery = nodeQuery(\"/qualifiedMetastatement\"),\n      unqualifiedMetastatementNodeQuery = nodeQuery(\"/unqualifiedMetastatement!\"),\n      qualifiedOrUnqualifiedMetastatementNodesQuery = nodesQuery(\"/metaSubproof/qualifiedMetastatement|unqualifiedMetastatement\")\n\nexport default function verifyMetaDerivation(metaDerivationNode, metaproofContext) {\n  let metaDerivationVerified;\n\n  metaproofContext.begin(metaDerivationNode);\n\n  const derived = true;\n\n  metaproofContext.setDerived(derived);\n\n  const metaDerivationChildNodes = metaDerivationChildNodesQuery(metaDerivationNode),\n        metaDerivationChildNodesVerified = metaDerivationChildNodes.every((metaDerivationChildNode) => {\n          let metaDerivationChildNodeVerified;\n\n          const ruleName = metaDerivationChildNode.getRuleName();\n\n          switch (ruleName) {\n            case META_SUBPROOF_RULE_NAME: {\n              const metaSubproofNode = metaDerivationChildNode,  ///\n                    metaSubproofVerified = verifyMetaSubproof(metaSubproofNode, metaproofContext);\n\n              if (metaSubproofVerified) {\n                const metaAssertion = MetaAssertion.fromMetaSubproofNode(metaSubproofNode);\n\n                metaproofContext.addMetaAssertion(metaAssertion);\n\n                metaDerivationChildNodeVerified = true;\n              }\n\n              break;\n            }\n\n            case QUALIFIED_METASTATEMENT_RULE_NAME: {\n              const qualifiedMetastatementNode = metaDerivationChildNode,  ///\n                    qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, metaproofContext);\n\n              if (qualifiedMetastatementVerified) {\n                const metaAssertion = MetaAssertion.fromQualifiedMetastatementNode(qualifiedMetastatementNode);\n\n                metaproofContext.addMetaAssertion(metaAssertion);\n\n                metaDerivationChildNodeVerified = qualifiedMetastatementVerified; ///\n              }\n\n              break;\n            }\n\n            case UNQUALIFIED_METASTATEMENT_RULE_NAME: {\n              const unqualifiedMetastatementNode = metaDerivationChildNode,  ///\n                    unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);\n\n              if (unqualifiedMetastatementVerified) {\n                const metaAssertion = MetaAssertion.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);\n\n                metaproofContext.addMetaAssertion(metaAssertion);\n\n                metaDerivationChildNodeVerified = true;\n              }\n\n              break;\n            }\n          }\n\n          return metaDerivationChildNodeVerified;\n        });\n\n  metaDerivationVerified = metaDerivationChildNodesVerified;  ///\n\n  metaDerivationVerified ?\n    metaproofContext.complete(metaDerivationNode) :\n      metaproofContext.halt(metaDerivationNode);\n\n  return metaDerivationVerified;\n}\n\nfunction verifyMetaSubproof(metaSubproofNode, metaproofContext) {\n  let metaSubproofVerified = false;\n\n  metaproofContext = MetaproofContext.fromMetaproofContext(metaproofContext); ///\n\n  const qualifiedOrUnqualifiedMetastatementNodes = qualifiedOrUnqualifiedMetastatementNodesQuery(metaSubproofNode),\n        frontQualifiedOrUnqualifiedMetastatementNodes = front(qualifiedOrUnqualifiedMetastatementNodes),\n        unqualifiedMetastatementNodes = frontQualifiedOrUnqualifiedMetastatementNodes,  ///\n        unqualifiedMetastatementsVerified = unqualifiedMetastatementNodes.every((unqualifiedMetastatementNode) => {\n          const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);\n\n          if (unqualifiedMetastatementVerified) {\n            return true;\n          }\n        });\n\n  if (unqualifiedMetastatementsVerified) {\n    unqualifiedMetastatementNodes.forEach((unqualifiedMetastatementNode) => {\n      const metaAssertion = MetaAssertion.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);\n\n      metaproofContext.addMetaAssertion(metaAssertion);\n    });\n\n    let metaDerivationVerified = true;\n\n    const metaDerivationNode = metaDerivationNodeQuery(metaSubproofNode);\n\n    if (metaDerivationNode !== null) {\n      metaDerivationVerified = verifyMetaDerivation(metaDerivationNode, metaproofContext);\n    }\n\n    if (metaDerivationVerified) {\n      const lastQualifiedOrUnqualifiedMetastatementNode = last(qualifiedOrUnqualifiedMetastatementNodes),\n            qualifiedOrUnqualifiedMetastatementNode = lastQualifiedOrUnqualifiedMetastatementNode,  ///\n            qualifiedMetastatementNode = qualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode),\n            unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode);\n\n      if (qualifiedMetastatementNode !== null) {\n        const qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, metaproofContext);\n\n        metaSubproofVerified = qualifiedMetastatementVerified;  ///\n      }\n\n      if (unqualifiedMetastatementNode !== null) {\n        const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);\n\n        metaSubproofVerified = unqualifiedMetastatementVerified;  ///\n      }\n    }\n  }\n\n  return metaSubproofVerified;\n}\n"],"names":["verifyMetaDerivation","metaDerivationNodeQuery","nodeQuery","metaDerivationChildNodesQuery","nodesQuery","qualifiedMetastatementNodeQuery","unqualifiedMetastatementNodeQuery","qualifiedOrUnqualifiedMetastatementNodesQuery","metaDerivationNode","metaproofContext","metaDerivationVerified","begin","derived","setDerived","metaDerivationChildNodes","metaDerivationChildNodesVerified","every","metaDerivationChildNode","metaDerivationChildNodeVerified","ruleName","getRuleName","META_SUBPROOF_RULE_NAME","metaSubproofNode","metaSubproofVerified","verifyMetaSubproof","metaAssertion","MetaAssertion","fromMetaSubproofNode","addMetaAssertion","QUALIFIED_METASTATEMENT_RULE_NAME","qualifiedMetastatementNode","qualifiedMetastatementVerified","verifyQualifiedMetastatement","fromQualifiedMetastatementNode","UNQUALIFIED_METASTATEMENT_RULE_NAME","unqualifiedMetastatementNode","unqualifiedMetastatementVerified","verifyUnqualifiedMetastatement","fromUnqualifiedMetastatementNode","complete","halt","MetaproofContext","fromMetaproofContext","qualifiedOrUnqualifiedMetastatementNodes","frontQualifiedOrUnqualifiedMetastatementNodes","front","unqualifiedMetastatementNodes","unqualifiedMetastatementsVerified","forEach","lastQualifiedOrUnqualifiedMetastatementNode","last","qualifiedOrUnqualifiedMetastatementNode"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.447",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.21",
|
|
14
14
|
"necessary": "^11.2.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.366",
|
|
16
16
|
"occam-dom": "^3.0.171",
|
|
17
|
-
"occam-file-system": "^5.0.
|
|
17
|
+
"occam-file-system": "^5.0.125",
|
|
18
18
|
"occam-grammar-utilities": "^7.0.66"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
package/src/axiom.js
CHANGED
|
@@ -2,18 +2,16 @@
|
|
|
2
2
|
|
|
3
3
|
import Label from "./label";
|
|
4
4
|
|
|
5
|
-
import { nodeQuery } from "./utilities/query";
|
|
6
5
|
import { AXIOM_KIND } from "./kinds";
|
|
7
6
|
import { nodeAsString } from "./utilities/string";
|
|
8
|
-
import { UNQUALIFIED_STATEMENT_RULE_NAME } from "./ruleNames";
|
|
9
7
|
|
|
10
|
-
|
|
8
|
+
import { statementNodeFromStatementJSON } from "./utilities/node";
|
|
11
9
|
|
|
12
10
|
export default class Axiom {
|
|
13
|
-
constructor(labels, statementNode,
|
|
11
|
+
constructor(labels, statementNode, suppositionStatementNodes, consequentStatementNode) {
|
|
14
12
|
this.labels = labels;
|
|
15
13
|
this.statementNode = statementNode;
|
|
16
|
-
this.
|
|
14
|
+
this.suppositionStatementNodes = suppositionStatementNodes;
|
|
17
15
|
this.consequentStatementNode = consequentStatementNode;
|
|
18
16
|
}
|
|
19
17
|
|
|
@@ -25,8 +23,8 @@ export default class Axiom {
|
|
|
25
23
|
return this.statementNode;
|
|
26
24
|
}
|
|
27
25
|
|
|
28
|
-
|
|
29
|
-
return this.
|
|
26
|
+
getSuppositionStatementNodes() {
|
|
27
|
+
return this.suppositionStatementNodes;
|
|
30
28
|
}
|
|
31
29
|
|
|
32
30
|
getConsequentStatementNode() {
|
|
@@ -54,18 +52,22 @@ export default class Axiom {
|
|
|
54
52
|
}),
|
|
55
53
|
statementString = nodeAsString(this.statementNode),
|
|
56
54
|
consequentStatementString = nodeAsString(this.consequentStatementNode),
|
|
57
|
-
|
|
55
|
+
suppositionStatementStrings = this.suppositionStatementNodes.map((suppositionStatementNode) => {
|
|
56
|
+
const suppositionStatementString = nodeAsString(suppositionStatementNode);
|
|
57
|
+
|
|
58
|
+
return suppositionStatementString;
|
|
59
|
+
}),
|
|
58
60
|
kind = AXIOM_KIND,
|
|
59
61
|
labels = labelsJSON, ///
|
|
60
62
|
statement = statementString, ///
|
|
61
63
|
consequent = consequentStatementString, ///
|
|
62
|
-
|
|
64
|
+
suppositions = suppositionStatementStrings, ///
|
|
63
65
|
json = {
|
|
64
66
|
kind,
|
|
65
67
|
labels,
|
|
66
68
|
statement,
|
|
67
69
|
consequent,
|
|
68
|
-
|
|
70
|
+
suppositions
|
|
69
71
|
};
|
|
70
72
|
|
|
71
73
|
return json;
|
|
@@ -83,72 +85,45 @@ export default class Axiom {
|
|
|
83
85
|
return label;
|
|
84
86
|
});
|
|
85
87
|
|
|
86
|
-
const { statement,
|
|
88
|
+
const { statement, suppositions, consequent } = json;
|
|
87
89
|
|
|
88
90
|
let axiom;
|
|
89
91
|
|
|
90
|
-
if (
|
|
91
|
-
///
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
const ruleName = UNQUALIFIED_STATEMENT_RULE_NAME;
|
|
110
|
-
|
|
111
|
-
content = `${consequent}
|
|
112
|
-
`;
|
|
113
|
-
|
|
114
|
-
node = releaseContext.nodeFromContentAndRuleName(content, ruleName);
|
|
115
|
-
|
|
116
|
-
unqualifiedStatementNode = node; ///
|
|
117
|
-
|
|
118
|
-
statementNode = statementNodeQuery(unqualifiedStatementNode);
|
|
119
|
-
|
|
120
|
-
const consequentNode = statementNode; ///
|
|
121
|
-
|
|
122
|
-
content = `${supposition}
|
|
123
|
-
`;
|
|
124
|
-
|
|
125
|
-
node = releaseContext.nodeFromContentAndRuleName(content, ruleName);
|
|
126
|
-
|
|
127
|
-
unqualifiedStatementNode = node; ///
|
|
128
|
-
|
|
129
|
-
statementNode = statementNodeQuery(unqualifiedStatementNode);
|
|
130
|
-
|
|
131
|
-
const suppositionNode = statementNode; ///
|
|
132
|
-
|
|
133
|
-
statementNode = null;
|
|
134
|
-
|
|
135
|
-
axiom = new Axiom(labels, statementNode, consequentNode, suppositionNode);
|
|
92
|
+
if (statement !== null) {
|
|
93
|
+
const statementJSON = statement, ///
|
|
94
|
+
statementNode = statementNodeFromStatementJSON(statementJSON, releaseContext),
|
|
95
|
+
suppositionStatementNodes = null,
|
|
96
|
+
consequentStatementNode = null;
|
|
97
|
+
|
|
98
|
+
axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
|
|
99
|
+
} else {
|
|
100
|
+
const statementNode = null,
|
|
101
|
+
suppositionStatementsJSON = suppositions, ///
|
|
102
|
+
suppositionStatementNodes = suppositionStatementsJSON.map((suppositionStatementJSON) => {
|
|
103
|
+
const suppositionStatementNode = statementNodeFromStatementJSON(suppositionStatementJSON, releaseContext);
|
|
104
|
+
|
|
105
|
+
return suppositionStatementNode;
|
|
106
|
+
}),
|
|
107
|
+
consequentStatementJSON = consequent, ///
|
|
108
|
+
consequentStatementNode = statementNodeFromStatementJSON(consequentStatementJSON, releaseContext);
|
|
109
|
+
|
|
110
|
+
axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
|
|
136
111
|
}
|
|
137
112
|
|
|
138
113
|
return axiom;
|
|
139
114
|
}
|
|
140
115
|
|
|
141
116
|
static fromLabelsAndStatementNode(labels, statementNode) {
|
|
142
|
-
const
|
|
117
|
+
const suppositionStatementNodes = [],
|
|
143
118
|
consequentStatementNode = null,
|
|
144
|
-
axiom = new Axiom(labels, statementNode,
|
|
119
|
+
axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
|
|
145
120
|
|
|
146
121
|
return axiom;
|
|
147
122
|
}
|
|
148
123
|
|
|
149
|
-
static
|
|
124
|
+
static fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode) {
|
|
150
125
|
const statementNode = null,
|
|
151
|
-
axiom = new Axiom(labels, statementNode,
|
|
126
|
+
axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
|
|
152
127
|
|
|
153
128
|
return axiom;
|
|
154
129
|
}
|
package/src/combinator.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { nodeQuery } from "./utilities/query";
|
|
4
3
|
import { nodeAsString } from "./utilities/string";
|
|
5
4
|
import { COMBINATOR_KIND } from "./kinds";
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
const statementNodeQuery = nodeQuery("/combinatorDeclaration/statement");
|
|
5
|
+
import { statementNodeFromStatementJSON } from "./utilities/node";
|
|
9
6
|
|
|
10
7
|
export default class Combinator {
|
|
11
8
|
constructor(statementNode) {
|
|
@@ -36,12 +33,8 @@ export default class Combinator {
|
|
|
36
33
|
|
|
37
34
|
static fromJSON(json, releaseContext) {
|
|
38
35
|
const { statement } = json,
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
`,
|
|
42
|
-
node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
|
|
43
|
-
combinatorDeclarationNode = node, ///
|
|
44
|
-
statementNode = statementNodeQuery(combinatorDeclarationNode),
|
|
36
|
+
statementJSON = statement, ///
|
|
37
|
+
statementNode = statementNodeFromStatementJSON(statementJSON, releaseContext),
|
|
45
38
|
combinator = new Combinator(statementNode);
|
|
46
39
|
|
|
47
40
|
return combinator;
|
package/src/conclusion.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { first } from "./utilities/array";
|
|
4
|
-
import { nodeQuery } from "./utilities/query";
|
|
5
4
|
import { nodeAsString } from "./utilities/string";
|
|
6
5
|
import { metavariableNameFromMetavariableNode } from "./utilities/query";
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
const metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement");
|
|
6
|
+
import { metastatementNodeFromMetastatementJSON } from "./utilities/node";
|
|
7
|
+
import { METAVARIABLE_RULE_NAME, METASTATEMENT_RULE_NAME } from "./ruleNames";
|
|
10
8
|
|
|
11
9
|
export default class Conclusion {
|
|
12
10
|
constructor(metastatementNode) {
|
|
@@ -38,12 +36,8 @@ export default class Conclusion {
|
|
|
38
36
|
|
|
39
37
|
static fromJSON(json, releaseContext) {
|
|
40
38
|
const { metastatement } = json,
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
`,
|
|
44
|
-
node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
|
|
45
|
-
unqualifiedMetastatementNode = node, ///
|
|
46
|
-
metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
|
|
39
|
+
metastatementJSON = metastatement, ///
|
|
40
|
+
metastatementNode = metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext),
|
|
47
41
|
conclusion = new Conclusion(metastatementNode);
|
|
48
42
|
|
|
49
43
|
return conclusion;
|
package/src/constructor.js
CHANGED
|
@@ -2,12 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
import Type from "./type";
|
|
4
4
|
|
|
5
|
-
import { nodeQuery } from "./utilities/query";
|
|
6
5
|
import { nodeAsString } from "./utilities/string";
|
|
7
6
|
import { CONSTRUCTOR_KIND } from "./kinds";
|
|
8
|
-
import {
|
|
9
|
-
|
|
10
|
-
const statementNodeQuery = nodeQuery("/constructorDeclaration/term");
|
|
7
|
+
import { termNodeFromTermJSON } from "./utilities/node";
|
|
11
8
|
|
|
12
9
|
export default class Constructor {
|
|
13
10
|
constructor(termNode, type) {
|
|
@@ -59,12 +56,8 @@ export default class Constructor {
|
|
|
59
56
|
|
|
60
57
|
static fromJSON(json, releaseContext) {
|
|
61
58
|
const { term } = json,
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
`,
|
|
65
|
-
node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
|
|
66
|
-
constructorDeclarationNode = node, ///
|
|
67
|
-
termNode = statementNodeQuery(constructorDeclarationNode);
|
|
59
|
+
termJSON = term, ///
|
|
60
|
+
termNode = termNodeFromTermJSON(termJSON, releaseContext);
|
|
68
61
|
|
|
69
62
|
let { type } = json;
|
|
70
63
|
|
package/src/label.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { nodeAsString } from "./utilities/string";
|
|
4
|
-
import {
|
|
4
|
+
import { labelNodeFromLabelJSON } from "./utilities/node";
|
|
5
5
|
import { labelNameFromLabelNode } from "./utilities/query";
|
|
6
6
|
|
|
7
7
|
export default class Label {
|
|
@@ -35,9 +35,9 @@ export default class Label {
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
static fromJSON(json, releaseContext) {
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
node =
|
|
38
|
+
const labelJSON = json, ///
|
|
39
|
+
labelNode = labelNodeFromLabelJSON(labelJSON, releaseContext),
|
|
40
|
+
node = labelNode, ///
|
|
41
41
|
label = new Label(node);
|
|
42
42
|
|
|
43
43
|
return label;
|