occam-verify-cli 0.0.925 → 0.0.926
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/conclusion.js +2 -2
- package/lib/consequent.js +12 -7
- package/lib/verifier/nodes/metaLevel.js +7 -7
- package/lib/verify/proof.js +4 -4
- package/package.json +2 -2
- package/src/conclusion.js +1 -1
- package/src/consequent.js +19 -12
- package/src/verifier/nodes/metaLevel.js +6 -5
- package/src/verify/proof.js +5 -6
package/lib/conclusion.js
CHANGED
|
@@ -82,7 +82,7 @@ var Conclusion = /*#__PURE__*/ function() {
|
|
|
82
82
|
{
|
|
83
83
|
key: "fromJSONAndFileContext",
|
|
84
84
|
value: function fromJSONAndFileContext(json, fileContext) {
|
|
85
|
-
var statement = json.statement, statementString = statement, lexer = fileContext.getLexer(), parser = fileContext.getParser(), statementNode = (0, _node.statementNodeFromStatementString)(statementString, lexer, parser), conclusion = new Conclusion(statementNode
|
|
85
|
+
var statement = json.statement, statementString = statement, lexer = fileContext.getLexer(), parser = fileContext.getParser(), statementNode = (0, _node.statementNodeFromStatementString)(statementString, lexer, parser), conclusion = new Conclusion(statementNode);
|
|
86
86
|
return conclusion;
|
|
87
87
|
}
|
|
88
88
|
}
|
|
@@ -90,4 +90,4 @@ var Conclusion = /*#__PURE__*/ function() {
|
|
|
90
90
|
return Conclusion;
|
|
91
91
|
}();
|
|
92
92
|
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25jbHVzaW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCBtZXRhTGV2ZWxOb2Rlc1ZlcmlmaWVyIGZyb20gXCIuL3ZlcmlmaWVyL25vZGVzL21ldGFMZXZlbFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyB9IGZyb20gXCIuL3V0aWxpdGllcy9ub2RlXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbmNsdXNpb24ge1xuICBjb25zdHJ1Y3RvcihzdGF0ZW1lbnROb2RlKSB7XG4gICAgdGhpcy5zdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldFN0YXRlbWVudE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIG1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBzdWJzdGl0dXRpb25zLCBmaWxlQ29udGV4dCwgbG9jYWxDb250ZXh0KSB7XG4gICAgbGV0IG1hdGNoZXNTdGF0ZW1lbnROb2RlID0gZmFsc2U7XG5cbiAgICBpZiAodGhpcy5zdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBmaWxlQ29udGV4dEEgPSBmaWxlQ29udGV4dCwgLy8vXG4gICAgICAgICAgICBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5zdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgICBub25UZXJtaW5hbE5vZGVCID0gc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgICAgbG9jYWxDb250ZXh0QSA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHRBKSxcbiAgICAgICAgICAgIGxvY2FsQ29udGV4dEIgPSBsb2NhbENvbnRleHQsICAvLy9cbiAgICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gbWV0YUxldmVsTm9kZXNWZXJpZmllci52ZXJpZnlOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0QSwgbG9jYWxDb250ZXh0QiwgKCkgPT4ge1xuICAgICAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgICAgIH0pO1xuXG4gICAgICBtYXRjaGVzU3RhdGVtZW50Tm9kZSA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAvLy9cbiAgICB9XG5cbiAgICByZXR1cm4gbWF0Y2hlc1N0YXRlbWVudE5vZGU7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMuc3RhdGVtZW50Tm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBzdGF0ZW1lbnQgPSBzdGF0ZW1lbnRTdHJpbmcsICAvLy9cbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAgc3RhdGVtZW50XG4gICAgICAgICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpIHtcbiAgICBjb25zdCBjb25jbHVzaW9uID0gbmV3IENvbmNsdXNpb24oc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uY2x1c2lvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTkFuZEZpbGVDb250ZXh0KGpzb24sIGZpbGVDb250ZXh0KSB7XG4gICAgY29uc3QgeyBzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgc3RhdGVtZW50U3RyaW5nID0gc3RhdGVtZW50LCAgLy8vXG4gICAgICAgICAgbGV4ZXIgPSBmaWxlQ29udGV4dC5nZXRMZXhlcigpLFxuICAgICAgICAgIHBhcnNlciA9IGZpbGVDb250ZXh0LmdldFBhcnNlcigpLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyhzdGF0ZW1lbnRTdHJpbmcsIGxleGVyLCBwYXJzZXIpLFxuICAgICAgICAgIGNvbmNsdXNpb24gPSBuZXcgQ29uY2x1c2lvbihzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25jbHVzaW9uO1xuICB9XG59XG4iXSwibmFtZXMiOlsiQ29uY2x1c2lvbiIsInN0YXRlbWVudE5vZGUiLCJnZXRTdGF0ZW1lbnROb2RlIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwic3Vic3RpdHV0aW9ucyIsImZpbGVDb250ZXh0IiwibG9jYWxDb250ZXh0IiwibWF0Y2hlc1N0YXRlbWVudE5vZGUiLCJmaWxlQ29udGV4dEEiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsImxvY2FsQ29udGV4dEEiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJsb2NhbENvbnRleHRCIiwibm9uVGVybWluYWxOb2RlVmVyaWZpZWQiLCJtZXRhTGV2ZWxOb2Rlc1ZlcmlmaWVyIiwidmVyaWZ5Tm9uVGVybWluYWxOb2RlIiwidmVyaWZpZWRBaGVhZCIsInRvSlNPTiIsInRva2VucyIsInN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsInN0YXRlbWVudCIsImpzb24iLCJmcm9tU3RhdGVtZW50Tm9kZSIsImNvbmNsdXNpb24iLCJmcm9tSlNPTkFuZEZpbGVDb250ZXh0IiwibGV4ZXIiLCJnZXRMZXhlciIsInBhcnNlciIsImdldFBhcnNlciIsInN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVFxQkE7Ozs0REFOSTtnRUFDVTtzQkFFTjtvQkFDb0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFbEMsSUFBQSxBQUFNQSwyQkFBRCxBQUFMO2FBQU1BLFdBQ1BDLGFBQWE7Z0NBRE5EO1FBRWpCLElBQUksQ0FBQ0MsYUFBYSxHQUFHQTs7a0JBRkpEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxhQUFhO1lBQzNCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQkYsYUFBYSxFQUFFRyxhQUFhLEVBQUVDLFdBQVcsRUFBRUMsWUFBWTtnQkFDeEUsSUFBSUMsdUJBQXVCO2dCQUUzQixJQUFJLElBQUksQ0FBQ04sYUFBYSxLQUFLLE1BQU07b0JBQy9CLElBQU1PLGVBQWVILGFBQ2ZJLG1CQUFtQixJQUFJLENBQUNSLGFBQWEsRUFDckNTLG1CQUFtQlQsZUFDbkJVLGdCQUFnQkMsY0FBWSxDQUFDQyxlQUFlLENBQUNMLGVBQzdDTSxnQkFBZ0JSLGNBQ2hCUywwQkFBMEJDLGtCQUFzQixDQUFDQyxxQkFBcUIsQ0FBQ1Isa0JBQWtCQyxrQkFBa0JOLGVBQWVPLGVBQWVHLGVBQWU7d0JBQ3RKLElBQU1JLGdCQUFnQjt3QkFFdEIsT0FBT0E7b0JBQ1Q7b0JBRU5YLHVCQUF1QlEseUJBQXlCLEdBQUc7Z0JBQ3JEO2dCQUVBLE9BQU9SO1lBQ1Q7OztZQUVBWSxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTTtnQkFDWCxJQUFNQyxrQkFBa0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDckIsYUFBYSxFQUFFbUIsU0FDbkRHLFlBQVlGLGlCQUNaRyxPQUFPO29CQUNMRCxXQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQnhCLGFBQWE7Z0JBQ3BDLElBQU15QixhQUFhLElBekNGMUIsV0F5Q2lCQztnQkFFbEMsT0FBT3lCO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSx1QkFBdUJILElBQUksRUFBRW5CLFdBQVc7Z0JBQzdDLElBQU0sQUFBRWtCLFlBQWNDLEtBQWRELFdBQ0ZGLGtCQUFrQkUsV0FDbEJLLFFBQVF2QixZQUFZd0IsUUFBUSxJQUM1QkMsU0FBU3pCLFlBQVkwQixTQUFTLElBQzlCOUIsZ0JBQWdCK0IsSUFBQUEsc0NBQWdDLEVBQUNYLGlCQUFpQk8sT0FBT0UsU0FDekVKLGFBQWEsSUFwREYxQixXQW9EaUJDO2dCQUVsQyxPQUFPeUI7WUFDVDs7O1dBdkRtQjFCIn0=
|
package/lib/consequent.js
CHANGED
|
@@ -8,7 +8,8 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Consequent;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var
|
|
11
|
+
var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
|
|
12
|
+
var _metaLevel = /*#__PURE__*/ _interop_require_default(require("./verifier/nodes/metaLevel"));
|
|
12
13
|
var _string = require("./utilities/string");
|
|
13
14
|
var _node = require("./utilities/node");
|
|
14
15
|
function _class_call_check(instance, Constructor) {
|
|
@@ -49,11 +50,15 @@ var Consequent = /*#__PURE__*/ function() {
|
|
|
49
50
|
},
|
|
50
51
|
{
|
|
51
52
|
key: "matchStatementNode",
|
|
52
|
-
value: function matchStatementNode(statementNode, substitutions,
|
|
53
|
-
var
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
value: function matchStatementNode(statementNode, substitutions, fileContext, localContext) {
|
|
54
|
+
var matchesStatementNode = false;
|
|
55
|
+
if (this.statementNode !== null) {
|
|
56
|
+
var fileContextA = fileContext, nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, localContextA = _local.default.fromFileContext(fileContextA), localContextB = localContext, nonTerminalNodeVerified = _metaLevel.default.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, function() {
|
|
57
|
+
var verifiedAhead = true;
|
|
58
|
+
return verifiedAhead;
|
|
59
|
+
});
|
|
60
|
+
matchesStatementNode = nonTerminalNodeVerified; ///
|
|
61
|
+
}
|
|
57
62
|
return matchesStatementNode;
|
|
58
63
|
}
|
|
59
64
|
},
|
|
@@ -85,4 +90,4 @@ var Consequent = /*#__PURE__*/ function() {
|
|
|
85
90
|
return Consequent;
|
|
86
91
|
}();
|
|
87
92
|
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zZXF1ZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCBtZXRhTGV2ZWxOb2Rlc1ZlcmlmaWVyIGZyb20gXCIuL3ZlcmlmaWVyL25vZGVzL21ldGFMZXZlbFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyB9IGZyb20gXCIuL3V0aWxpdGllcy9ub2RlXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbnNlcXVlbnQge1xuICBjb25zdHJ1Y3RvcihzdGF0ZW1lbnROb2RlKSB7XG4gICAgdGhpcy5zdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldFN0YXRlbWVudE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIG1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBzdWJzdGl0dXRpb25zLCBmaWxlQ29udGV4dCwgbG9jYWxDb250ZXh0KSB7XG4gICAgbGV0IG1hdGNoZXNTdGF0ZW1lbnROb2RlID0gZmFsc2U7XG5cbiAgICBpZiAodGhpcy5zdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBmaWxlQ29udGV4dEEgPSBmaWxlQ29udGV4dCwgLy8vXG4gICAgICAgICAgICBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5zdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgICBub25UZXJtaW5hbE5vZGVCID0gc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgICAgbG9jYWxDb250ZXh0QSA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHRBKSxcbiAgICAgICAgICAgIGxvY2FsQ29udGV4dEIgPSBsb2NhbENvbnRleHQsICAvLy9cbiAgICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gbWV0YUxldmVsTm9kZXNWZXJpZmllci52ZXJpZnlOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0QSwgbG9jYWxDb250ZXh0QiwgKCkgPT4ge1xuICAgICAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgICAgIH0pO1xuXG4gICAgICBtYXRjaGVzU3RhdGVtZW50Tm9kZSA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAvLy9cbiAgICB9XG5cbiAgICByZXR1cm4gbWF0Y2hlc1N0YXRlbWVudE5vZGU7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMuc3RhdGVtZW50Tm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBzdGF0ZW1lbnQgPSBzdGF0ZW1lbnRTdHJpbmcsICAvLy9cbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAgc3RhdGVtZW50XG4gICAgICAgICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpIHtcbiAgICBjb25zdCBjb25zZXF1ZW50ID0gbmV3IENvbnNlcXVlbnQoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uc2VxdWVudDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTkFuZEZpbGVDb250ZXh0KGpzb24sIGZpbGVDb250ZXh0KSB7XG4gICAgY29uc3QgeyBzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgc3RhdGVtZW50U3RyaW5nID0gc3RhdGVtZW50LCAgLy8vXG4gICAgICAgICAgbGV4ZXIgPSBmaWxlQ29udGV4dC5nZXRMZXhlcigpLFxuICAgICAgICAgIHBhcnNlciA9IGZpbGVDb250ZXh0LmdldFBhcnNlcigpLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyhzdGF0ZW1lbnRTdHJpbmcsIGxleGVyLCBwYXJzZXIpLFxuICAgICAgICAgIGNvbnNlcXVlbnQgPSBuZXcgQ29uc2VxdWVudChzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25zZXF1ZW50O1xuICB9XG59XG4iXSwibmFtZXMiOlsiQ29uc2VxdWVudCIsInN0YXRlbWVudE5vZGUiLCJnZXRTdGF0ZW1lbnROb2RlIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwic3Vic3RpdHV0aW9ucyIsImZpbGVDb250ZXh0IiwibG9jYWxDb250ZXh0IiwibWF0Y2hlc1N0YXRlbWVudE5vZGUiLCJmaWxlQ29udGV4dEEiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsImxvY2FsQ29udGV4dEEiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJsb2NhbENvbnRleHRCIiwibm9uVGVybWluYWxOb2RlVmVyaWZpZWQiLCJtZXRhTGV2ZWxOb2Rlc1ZlcmlmaWVyIiwidmVyaWZ5Tm9uVGVybWluYWxOb2RlIiwidmVyaWZpZWRBaGVhZCIsInRvSlNPTiIsInRva2VucyIsInN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsInN0YXRlbWVudCIsImpzb24iLCJmcm9tU3RhdGVtZW50Tm9kZSIsImNvbnNlcXVlbnQiLCJmcm9tSlNPTkFuZEZpbGVDb250ZXh0IiwibGV4ZXIiLCJnZXRMZXhlciIsInBhcnNlciIsImdldFBhcnNlciIsInN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVFxQkE7Ozs0REFOSTtnRUFDVTtzQkFFTjtvQkFDb0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFbEMsSUFBQSxBQUFNQSwyQkFBRCxBQUFMO2FBQU1BLFdBQ1BDLGFBQWE7Z0NBRE5EO1FBRWpCLElBQUksQ0FBQ0MsYUFBYSxHQUFHQTs7a0JBRkpEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxhQUFhO1lBQzNCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQkYsYUFBYSxFQUFFRyxhQUFhLEVBQUVDLFdBQVcsRUFBRUMsWUFBWTtnQkFDeEUsSUFBSUMsdUJBQXVCO2dCQUUzQixJQUFJLElBQUksQ0FBQ04sYUFBYSxLQUFLLE1BQU07b0JBQy9CLElBQU1PLGVBQWVILGFBQ2ZJLG1CQUFtQixJQUFJLENBQUNSLGFBQWEsRUFDckNTLG1CQUFtQlQsZUFDbkJVLGdCQUFnQkMsY0FBWSxDQUFDQyxlQUFlLENBQUNMLGVBQzdDTSxnQkFBZ0JSLGNBQ2hCUywwQkFBMEJDLGtCQUFzQixDQUFDQyxxQkFBcUIsQ0FBQ1Isa0JBQWtCQyxrQkFBa0JOLGVBQWVPLGVBQWVHLGVBQWU7d0JBQ3RKLElBQU1JLGdCQUFnQjt3QkFFdEIsT0FBT0E7b0JBQ1Q7b0JBRU5YLHVCQUF1QlEseUJBQXlCLEdBQUc7Z0JBQ3JEO2dCQUVBLE9BQU9SO1lBQ1Q7OztZQUVBWSxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTTtnQkFDWCxJQUFNQyxrQkFBa0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDckIsYUFBYSxFQUFFbUIsU0FDbkRHLFlBQVlGLGlCQUNaRyxPQUFPO29CQUNMRCxXQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQnhCLGFBQWE7Z0JBQ3BDLElBQU15QixhQUFhLElBekNGMUIsV0F5Q2lCQztnQkFFbEMsT0FBT3lCO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSx1QkFBdUJILElBQUksRUFBRW5CLFdBQVc7Z0JBQzdDLElBQU0sQUFBRWtCLFlBQWNDLEtBQWRELFdBQ0ZGLGtCQUFrQkUsV0FDbEJLLFFBQVF2QixZQUFZd0IsUUFBUSxJQUM1QkMsU0FBU3pCLFlBQVkwQixTQUFTLElBQzlCOUIsZ0JBQWdCK0IsSUFBQUEsc0NBQWdDLEVBQUNYLGlCQUFpQk8sT0FBT0UsU0FDekVKLGFBQWEsSUFwREYxQixXQW9EaUJDO2dCQUVsQyxPQUFPeUI7WUFDVDs7O1dBdkRtQjFCIn0=
|
|
@@ -114,7 +114,7 @@ function _is_native_reflect_construct() {
|
|
|
114
114
|
return !!result;
|
|
115
115
|
})();
|
|
116
116
|
}
|
|
117
|
-
var termNodeQuery = (0, _query.nodeQuery)("/term!"), statementNodeQuery = (0, _query.nodeQuery)("/statement!"), nonTerminalNodeQuery = (0, _query.nodeQuery)("/*"), termVariableNodeQuery = (0, _query.nodeQuery)("/term/variable!"),
|
|
117
|
+
var termNodeQuery = (0, _query.nodeQuery)("/term!"), statementNodeQuery = (0, _query.nodeQuery)("/statement!"), nonTerminalNodeQuery = (0, _query.nodeQuery)("/*"), termVariableNodeQuery = (0, _query.nodeQuery)("/term/variable!"), statementMetavariableNodeQuery = (0, _query.nodeQuery)("/statement/metavariable!");
|
|
118
118
|
var MetaLevelNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
119
119
|
_inherits(MetaLevelNodesVerifier, NodesVerifier);
|
|
120
120
|
function MetaLevelNodesVerifier() {
|
|
@@ -129,11 +129,11 @@ var MetaLevelNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
|
129
129
|
var nonTerminalNodeVerified;
|
|
130
130
|
var nodeQueryMaps = [
|
|
131
131
|
{
|
|
132
|
-
nodeQueryA:
|
|
132
|
+
nodeQueryA: statementMetavariableNodeQuery,
|
|
133
133
|
nodeQueryB: statementNodeQuery,
|
|
134
134
|
verifyNodes: function(nodeA, nodeB, substitutions, localContextA, localContextB, verifyAhead) {
|
|
135
135
|
var nonTerminalNodeVerified;
|
|
136
|
-
var statementNodeB = nodeB,
|
|
136
|
+
var statementNodeB = nodeB, statementMetavariableNodeA = nodeA, metavariableNodeVerifiedAgainstStatementNode = _this.verifyStatementeMetavariableNodeAgainstStatementNode(statementMetavariableNodeA, statementNodeB, substitutions, localContextA, localContextB, verifyAhead);
|
|
137
137
|
nonTerminalNodeVerified = metavariableNodeVerifiedAgainstStatementNode; ///
|
|
138
138
|
return nonTerminalNodeVerified;
|
|
139
139
|
}
|
|
@@ -165,10 +165,10 @@ var MetaLevelNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
|
165
165
|
}
|
|
166
166
|
},
|
|
167
167
|
{
|
|
168
|
-
key: "
|
|
169
|
-
value: function
|
|
168
|
+
key: "verifyStatementeMetavariableNodeAgainstStatementNode",
|
|
169
|
+
value: function verifyStatementeMetavariableNodeAgainstStatementNode(statementMetavariableNodeA, statementNodeB, substitutions, localContextA, localContextB, verifyAhead) {
|
|
170
170
|
var metavariableNodeVerifiedAgainstStatementNode;
|
|
171
|
-
var substitutionNode = null, metavariableVerifiedAgainstStatement = (0, _metavariableAgainstStatement.default)(metavariableNodeA, statementNodeB, substitutionNode, substitutions, localContextA, localContextB, verifyAhead);
|
|
171
|
+
var substitutionNode = null, metavariableNodeA = statementMetavariableNodeA, metavariableVerifiedAgainstStatement = (0, _metavariableAgainstStatement.default)(metavariableNodeA, statementNodeB, substitutionNode, substitutions, localContextA, localContextB, verifyAhead);
|
|
172
172
|
metavariableNodeVerifiedAgainstStatementNode = metavariableVerifiedAgainstStatement; ///
|
|
173
173
|
return metavariableNodeVerifiedAgainstStatementNode;
|
|
174
174
|
}
|
|
@@ -188,4 +188,4 @@ var MetaLevelNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
|
188
188
|
var metaLevelNodesVerifier = new MetaLevelNodesVerifier();
|
|
189
189
|
var _default = metaLevelNodesVerifier;
|
|
190
190
|
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verifier/nodes/metaLevel.js"],"sourcesContent":["\"use strict\";\n\nimport NodesVerifier from \"../../verifier/nodes\";\nimport verifyVariableAgainstTerm from \"../../verify/variableAgainstTerm\";\nimport verifyMetavariableAgainstStatement from \"../../verify/metavariableAgainstStatement\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { verifyNodes } from \"../../utilities/verifier\";\n\nconst termNodeQuery = nodeQuery(\"/term!\"),\n      statementNodeQuery = nodeQuery(\"/statement!\"),\n      nonTerminalNodeQuery = nodeQuery(\"/*\"),\n      termVariableNodeQuery = nodeQuery(\"/term/variable!\"),\n      statementMetavariableNodeQuery = nodeQuery(\"/statement/metavariable!\");\n\nclass MetaLevelNodesVerifier extends NodesVerifier {\n  verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, verifyAhead) {\n    let nonTerminalNodeVerified;\n\n    const nodeQueryMaps = [\n      {\n        nodeQueryA: statementMetavariableNodeQuery,\n        nodeQueryB: statementNodeQuery,\n        verifyNodes: (nodeA, nodeB, substitutions, localContextA, localContextB, verifyAhead) => {\n          let nonTerminalNodeVerified;\n\n          const statementNodeB = nodeB, ///\n                statementMetavariableNodeA = nodeA, ///\n                metavariableNodeVerifiedAgainstStatementNode =\n\n                  this.verifyStatementeMetavariableNodeAgainstStatementNode(statementMetavariableNodeA, statementNodeB, substitutions, localContextA, localContextB, verifyAhead);\n\n          nonTerminalNodeVerified = metavariableNodeVerifiedAgainstStatementNode;  ///\n\n          return nonTerminalNodeVerified;\n        }\n      },\n      {\n        nodeQueryA: termVariableNodeQuery,\n        nodeQueryB: termNodeQuery,\n        verifyNodes: (nodeA, nodeB, substitutions, localContextA, localContextB, verifyAhead) => {\n          let nonTerminalNodeVerified;\n\n          const termNodeB = nodeB,  ///\n                termVariableNodeA = nodeA,  ///\n                termVariableNodeVerifiedAgainstTermNode =\n\n                  this.verifyTermVariableNodeAgainstTermNode(termVariableNodeA, termNodeB, substitutions, localContextA, localContextB, verifyAhead);\n\n          nonTerminalNodeVerified = termVariableNodeVerifiedAgainstTermNode;  ///\n\n          return nonTerminalNodeVerified;\n        }\n      },\n      {\n        nodeQueryA: nonTerminalNodeQuery,\n        nodeQueryB: nonTerminalNodeQuery,\n        verifyNodes: (nodeA, nodeB, substitutions, localContextA, localContextB, verifyAhead) => {\n          let nonTerminalNodeVerified;\n\n          const nonTerminalNodeA = nodeA, ///\n                nonTerminalNodeB = nodeB; ///\n\n          nonTerminalNodeVerified =\n\n            super.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, verifyAhead);\n\n          return nonTerminalNodeVerified;\n        }\n      }\n    ];\n\n    const nodesVerified = verifyNodes(nodeQueryMaps, nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, verifyAhead);\n\n    nonTerminalNodeVerified = nodesVerified;  ///\n\n    return nonTerminalNodeVerified;\n  }\n\n  verifyStatementeMetavariableNodeAgainstStatementNode(statementMetavariableNodeA, statementNodeB, substitutions, localContextA, localContextB, verifyAhead) {\n    let metavariableNodeVerifiedAgainstStatementNode;\n\n    const substitutionNode = null,\n          metavariableNodeA = statementMetavariableNodeA, ///\n          metavariableVerifiedAgainstStatement = verifyMetavariableAgainstStatement(metavariableNodeA, statementNodeB, substitutionNode, substitutions, localContextA, localContextB, verifyAhead);\n\n    metavariableNodeVerifiedAgainstStatementNode = metavariableVerifiedAgainstStatement;  ///\n\n    return metavariableNodeVerifiedAgainstStatementNode;\n  }\n\n  verifyTermVariableNodeAgainstTermNode(termVariableNodeA, termNodeB, substitutions, localContextA, localContextB, verifyAhead) {\n    let termVariableNodeVerifiedAgainstTermNode;\n\n    const variableNodeA = termVariableNodeA, ///\n          termVerifiedAgainstVariable = verifyVariableAgainstTerm(variableNodeA, termNodeB, substitutions, localContextA, localContextB, verifyAhead);\n\n    termVariableNodeVerifiedAgainstTermNode = termVerifiedAgainstVariable;  ///\n\n    return termVariableNodeVerifiedAgainstTermNode;\n  }\n}\n\nconst metaLevelNodesVerifier = new MetaLevelNodesVerifier();\n\nexport default metaLevelNodesVerifier;\n"],"names":["termNodeQuery","nodeQuery","statementNodeQuery","nonTerminalNodeQuery","termVariableNodeQuery","statementMetavariableNodeQuery","MetaLevelNodesVerifier","verifyNonTerminalNode","nonTerminalNodeA","nonTerminalNodeB","substitutions","localContextA","localContextB","verifyAhead","nonTerminalNodeVerified","nodeQueryMaps","nodeQueryA","nodeQueryB","verifyNodes","nodeA","nodeB","statementNodeB","statementMetavariableNodeA","metavariableNodeVerifiedAgainstStatementNode","verifyStatementeMetavariableNodeAgainstStatementNode","termNodeB","termVariableNodeA","termVariableNodeVerifiedAgainstTermNode","verifyTermVariableNodeAgainstTermNode","nodesVerified","substitutionNode","metavariableNodeA","metavariableVerifiedAgainstStatement","verifyMetavariableAgainstStatement","variableNodeA","termVerifiedAgainstVariable","verifyVariableAgainstTerm","NodesVerifier","metaLevelNodesVerifier"],"mappings":"AAAA;;;;+BAyGA;;;eAAA;;;4DAvG0B;0EACY;mFACS;qBAErB;wBACE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5B,IAAMA,gBAAgBC,IAAAA,gBAAS,EAAC,WAC1BC,qBAAqBD,IAAAA,gBAAS,EAAC,gBAC/BE,uBAAuBF,IAAAA,gBAAS,EAAC,OACjCG,wBAAwBH,IAAAA,gBAAS,EAAC,oBAClCI,iCAAiCJ,IAAAA,gBAAS,EAAC;AAEjD,IAAA,AAAMK,uCAAD,AAAL;cAAMA;aAAAA;gCAAAA;iCAAAA;;kBAAAA;;YACJC,KAAAA;mBAAAA,SAAAA,sBAAsBC,gBAAgB,EAAEC,gBAAgB,EAAEC,aAAa,EAAEC,aAAa,EAAEC,aAAa,EAAEC,WAAW;;gBAChH,IAAIC;gBAEJ,IAAMC,gBAAgB;oBACpB;wBACEC,YAAYX;wBACZY,YAAYf;wBACZgB,aAAa,SAACC,OAAOC,OAAOV,eAAeC,eAAeC,eAAeC;4BACvE,IAAIC;4BAEJ,IAAMO,iBAAiBD,OACjBE,6BAA6BH,OAC7BI,+CAEE,MAAKC,oDAAoD,CAACF,4BAA4BD,gBAAgBX,eAAeC,eAAeC,eAAeC;4BAE3JC,0BAA0BS,8CAA+C,GAAG;4BAE5E,OAAOT;wBACT;oBACF;oBACA;wBACEE,YAAYZ;wBACZa,YAAYjB;wBACZkB,aAAa,SAACC,OAAOC,OAAOV,eAAeC,eAAeC,eAAeC;4BACvE,IAAIC;4BAEJ,IAAMW,YAAYL,OACZM,oBAAoBP,OACpBQ,0CAEE,MAAKC,qCAAqC,CAACF,mBAAmBD,WAAWf,eAAeC,eAAeC,eAAeC;4BAE9HC,0BAA0Ba,yCAA0C,GAAG;4BAEvE,OAAOb;wBACT;oBACF;oBACA;wBACEE,YAAYb;wBACZc,YAAYd;wBACZe,aAAa,SAACC,OAAOC,OAAOV,eAAeC,eAAeC,eAAeC;4BACvE,IAAIC;4BAEJ,IAAMN,qBAAmBW,OACnBV,qBAAmBW,OAAO,GAAG;4BAEnCN,0BAEE,uBAlDNR,mCAkDYC,4CAAsBC,oBAAkBC,oBAAkBC,eAAeC,eAAeC,eAAeC;4BAE/G,OAAOC;wBACT;oBACF;iBACD;gBAED,IAAMe,gBAAgBX,IAAAA,qBAAW,EAACH,eAAeP,kBAAkBC,kBAAkBC,eAAeC,eAAeC,eAAeC;gBAElIC,0BAA0Be,eAAgB,GAAG;gBAE7C,OAAOf;YACT;;;YAEAU,KAAAA;mBAAAA,SAAAA,qDAAqDF,0BAA0B,EAAED,cAAc,EAAEX,aAAa,EAAEC,aAAa,EAAEC,aAAa,EAAEC,WAAW;gBACvJ,IAAIU;gBAEJ,IAAMO,mBAAmB,MACnBC,oBAAoBT,4BACpBU,uCAAuCC,IAAAA,qCAAkC,EAACF,mBAAmBV,gBAAgBS,kBAAkBpB,eAAeC,eAAeC,eAAeC;gBAElLU,+CAA+CS,sCAAuC,GAAG;gBAEzF,OAAOT;YACT;;;YAEAK,KAAAA;mBAAAA,SAAAA,sCAAsCF,iBAAiB,EAAED,SAAS,EAAEf,aAAa,EAAEC,aAAa,EAAEC,aAAa,EAAEC,WAAW;gBAC1H,IAAIc;gBAEJ,IAAMO,gBAAgBR,mBAChBS,8BAA8BC,IAAAA,4BAAyB,EAACF,eAAeT,WAAWf,eAAeC,eAAeC,eAAeC;gBAErIc,0CAA0CQ,6BAA8B,GAAG;gBAE3E,OAAOR;YACT;;;WArFIrB;EAA+B+B,cAAa;AAwFlD,IAAMC,yBAAyB,IAAIhC;IAEnC,WAAegC"}
|
package/lib/verify/proof.js
CHANGED
|
@@ -17,18 +17,18 @@ function _interop_require_default(obj) {
|
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
19
|
var derivationNodeQuery = (0, _query.nodeQuery)("/proof/derivation!");
|
|
20
|
-
function verifyProof(proofNode,
|
|
20
|
+
function verifyProof(proofNode, statementNode, substitutions, localContext) {
|
|
21
21
|
var proofVerified = false;
|
|
22
22
|
localContext = _local.default.fromLocalContext(localContext); ///
|
|
23
23
|
var derivationNode = derivationNodeQuery(proofNode), derivationVerified = (0, _derivation.default)(derivationNode, substitutions, localContext);
|
|
24
24
|
if (derivationVerified) {
|
|
25
25
|
var lastProofStep = localContext.getLastProofStep();
|
|
26
26
|
if (lastProofStep !== null) {
|
|
27
|
-
var
|
|
28
|
-
proofVerified =
|
|
27
|
+
var lastProofStepStatementNode = lastProofStep.getStatementNode(), lastStatementNode = lastProofStepStatementNode, statementNodeMatchesLastStatementNode = statementNode.match(lastStatementNode);
|
|
28
|
+
proofVerified = statementNodeMatchesLastStatementNode; ///
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
return proofVerified;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB2ZXJpZnlEZXJpdmF0aW9uIGZyb20gXCIuLi92ZXJpZnkvZGVyaXZhdGlvblwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IGRlcml2YXRpb25Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcHJvb2YvZGVyaXZhdGlvbiFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVByb29mKHByb29mTm9kZSwgc3RhdGVtZW50Tm9kZSwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KSB7XG4gIGxldCBwcm9vZlZlcmlmaWVkID0gZmFsc2U7XG5cbiAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21Mb2NhbENvbnRleHQobG9jYWxDb250ZXh0KTsgLy8vXG5cbiAgY29uc3QgZGVyaXZhdGlvbk5vZGUgPSBkZXJpdmF0aW9uTm9kZVF1ZXJ5KHByb29mTm9kZSksXG4gICAgICAgIGRlcml2YXRpb25WZXJpZmllZCA9IHZlcmlmeURlcml2YXRpb24oZGVyaXZhdGlvbk5vZGUsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dCk7XG5cbiAgaWYgKGRlcml2YXRpb25WZXJpZmllZCkge1xuICAgIGNvbnN0IGxhc3RQcm9vZlN0ZXAgPSBsb2NhbENvbnRleHQuZ2V0TGFzdFByb29mU3RlcCgpO1xuXG4gICAgaWYgKGxhc3RQcm9vZlN0ZXAgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IGxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnROb2RlID0gbGFzdFByb29mU3RlcC5nZXRTdGF0ZW1lbnROb2RlKCksXG4gICAgICAgICAgICBsYXN0U3RhdGVtZW50Tm9kZSA9IGxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnROb2RlLCAvLy9cbiAgICAgICAgICAgIHN0YXRlbWVudE5vZGVNYXRjaGVzTGFzdFN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlLm1hdGNoKGxhc3RTdGF0ZW1lbnROb2RlKTtcblxuICAgICAgcHJvb2ZWZXJpZmllZCA9IHN0YXRlbWVudE5vZGVNYXRjaGVzTGFzdFN0YXRlbWVudE5vZGU7ICAvLy9cbiAgICB9XG4gIH1cblxuICByZXR1cm4gcHJvb2ZWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlQcm9vZiIsImRlcml2YXRpb25Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJwcm9vZk5vZGUiLCJzdGF0ZW1lbnROb2RlIiwic3Vic3RpdHV0aW9ucyIsImxvY2FsQ29udGV4dCIsInByb29mVmVyaWZpZWQiLCJMb2NhbENvbnRleHQiLCJmcm9tTG9jYWxDb250ZXh0IiwiZGVyaXZhdGlvbk5vZGUiLCJkZXJpdmF0aW9uVmVyaWZpZWQiLCJ2ZXJpZnlEZXJpdmF0aW9uIiwibGFzdFByb29mU3RlcCIsImdldExhc3RQcm9vZlN0ZXAiLCJsYXN0UHJvb2ZTdGVwU3RhdGVtZW50Tm9kZSIsImdldFN0YXRlbWVudE5vZGUiLCJsYXN0U3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGVNYXRjaGVzTGFzdFN0YXRlbWVudE5vZGUiLCJtYXRjaCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU0E7OztlQUF3QkE7Ozs0REFQQztpRUFDSTtxQkFFSDs7Ozs7O0FBRTFCLElBQU1DLHNCQUFzQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUV2QixTQUFTRixZQUFZRyxTQUFTLEVBQUVDLGFBQWEsRUFBRUMsYUFBYSxFQUFFQyxZQUFZO0lBQ3ZGLElBQUlDLGdCQUFnQjtJQUVwQkQsZUFBZUUsY0FBWSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsZUFBZSxHQUFHO0lBRS9ELElBQU1JLGlCQUFpQlQsb0JBQW9CRSxZQUNyQ1EscUJBQXFCQyxJQUFBQSxtQkFBZ0IsRUFBQ0YsZ0JBQWdCTCxlQUFlQztJQUUzRSxJQUFJSyxvQkFBb0I7UUFDdEIsSUFBTUUsZ0JBQWdCUCxhQUFhUSxnQkFBZ0I7UUFFbkQsSUFBSUQsa0JBQWtCLE1BQU07WUFDMUIsSUFBTUUsNkJBQTZCRixjQUFjRyxnQkFBZ0IsSUFDM0RDLG9CQUFvQkYsNEJBQ3BCRyx3Q0FBd0NkLGNBQWNlLEtBQUssQ0FBQ0Y7WUFFbEVWLGdCQUFnQlcsdUNBQXdDLEdBQUc7UUFDN0Q7SUFDRjtJQUVBLE9BQU9YO0FBQ1QifQ==
|
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.926",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.28",
|
|
14
14
|
"necessary": "^14.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.831",
|
|
16
16
|
"occam-entities": "^1.0.149",
|
|
17
17
|
"occam-file-system": "^6.0.190",
|
|
18
18
|
"occam-grammar-utilities": "^8.0.207",
|
package/src/conclusion.js
CHANGED
|
@@ -58,7 +58,7 @@ export default class Conclusion {
|
|
|
58
58
|
lexer = fileContext.getLexer(),
|
|
59
59
|
parser = fileContext.getParser(),
|
|
60
60
|
statementNode = statementNodeFromStatementString(statementString, lexer, parser),
|
|
61
|
-
conclusion = new Conclusion(statementNode
|
|
61
|
+
conclusion = new Conclusion(statementNode);
|
|
62
62
|
|
|
63
63
|
return conclusion;
|
|
64
64
|
}
|
package/src/consequent.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import LocalContext from "./context/local";
|
|
4
|
+
import metaLevelNodesVerifier from "./verifier/nodes/metaLevel";
|
|
4
5
|
|
|
5
6
|
import { nodeAsString } from "./utilities/string";
|
|
6
7
|
import { statementNodeFromStatementString } from "./utilities/node";
|
|
@@ -14,17 +15,23 @@ export default class Consequent {
|
|
|
14
15
|
return this.statementNode;
|
|
15
16
|
}
|
|
16
17
|
|
|
17
|
-
matchStatementNode(statementNode, substitutions,
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
18
|
+
matchStatementNode(statementNode, substitutions, fileContext, localContext) {
|
|
19
|
+
let matchesStatementNode = false;
|
|
20
|
+
|
|
21
|
+
if (this.statementNode !== null) {
|
|
22
|
+
const fileContextA = fileContext, ///
|
|
23
|
+
nonTerminalNodeA = this.statementNode, ///
|
|
24
|
+
nonTerminalNodeB = statementNode, ///
|
|
25
|
+
localContextA = LocalContext.fromFileContext(fileContextA),
|
|
26
|
+
localContextB = localContext, ///
|
|
27
|
+
nonTerminalNodeVerified = metaLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {
|
|
28
|
+
const verifiedAhead = true;
|
|
29
|
+
|
|
30
|
+
return verifiedAhead;
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
matchesStatementNode = nonTerminalNodeVerified; ///
|
|
34
|
+
}
|
|
28
35
|
|
|
29
36
|
return matchesStatementNode;
|
|
30
37
|
}
|
|
@@ -11,7 +11,7 @@ const termNodeQuery = nodeQuery("/term!"),
|
|
|
11
11
|
statementNodeQuery = nodeQuery("/statement!"),
|
|
12
12
|
nonTerminalNodeQuery = nodeQuery("/*"),
|
|
13
13
|
termVariableNodeQuery = nodeQuery("/term/variable!"),
|
|
14
|
-
|
|
14
|
+
statementMetavariableNodeQuery = nodeQuery("/statement/metavariable!");
|
|
15
15
|
|
|
16
16
|
class MetaLevelNodesVerifier extends NodesVerifier {
|
|
17
17
|
verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, verifyAhead) {
|
|
@@ -19,16 +19,16 @@ class MetaLevelNodesVerifier extends NodesVerifier {
|
|
|
19
19
|
|
|
20
20
|
const nodeQueryMaps = [
|
|
21
21
|
{
|
|
22
|
-
nodeQueryA:
|
|
22
|
+
nodeQueryA: statementMetavariableNodeQuery,
|
|
23
23
|
nodeQueryB: statementNodeQuery,
|
|
24
24
|
verifyNodes: (nodeA, nodeB, substitutions, localContextA, localContextB, verifyAhead) => {
|
|
25
25
|
let nonTerminalNodeVerified;
|
|
26
26
|
|
|
27
27
|
const statementNodeB = nodeB, ///
|
|
28
|
-
|
|
28
|
+
statementMetavariableNodeA = nodeA, ///
|
|
29
29
|
metavariableNodeVerifiedAgainstStatementNode =
|
|
30
30
|
|
|
31
|
-
this.
|
|
31
|
+
this.verifyStatementeMetavariableNodeAgainstStatementNode(statementMetavariableNodeA, statementNodeB, substitutions, localContextA, localContextB, verifyAhead);
|
|
32
32
|
|
|
33
33
|
nonTerminalNodeVerified = metavariableNodeVerifiedAgainstStatementNode; ///
|
|
34
34
|
|
|
@@ -77,10 +77,11 @@ class MetaLevelNodesVerifier extends NodesVerifier {
|
|
|
77
77
|
return nonTerminalNodeVerified;
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
|
|
80
|
+
verifyStatementeMetavariableNodeAgainstStatementNode(statementMetavariableNodeA, statementNodeB, substitutions, localContextA, localContextB, verifyAhead) {
|
|
81
81
|
let metavariableNodeVerifiedAgainstStatementNode;
|
|
82
82
|
|
|
83
83
|
const substitutionNode = null,
|
|
84
|
+
metavariableNodeA = statementMetavariableNodeA, ///
|
|
84
85
|
metavariableVerifiedAgainstStatement = verifyMetavariableAgainstStatement(metavariableNodeA, statementNodeB, substitutionNode, substitutions, localContextA, localContextB, verifyAhead);
|
|
85
86
|
|
|
86
87
|
metavariableNodeVerifiedAgainstStatementNode = metavariableVerifiedAgainstStatement; ///
|
package/src/verify/proof.js
CHANGED
|
@@ -7,7 +7,7 @@ import { nodeQuery } from "../utilities/query";
|
|
|
7
7
|
|
|
8
8
|
const derivationNodeQuery = nodeQuery("/proof/derivation!");
|
|
9
9
|
|
|
10
|
-
export default function verifyProof(proofNode,
|
|
10
|
+
export default function verifyProof(proofNode, statementNode, substitutions, localContext) {
|
|
11
11
|
let proofVerified = false;
|
|
12
12
|
|
|
13
13
|
localContext = LocalContext.fromLocalContext(localContext); ///
|
|
@@ -19,12 +19,11 @@ export default function verifyProof(proofNode, conclusion, substitutions, localC
|
|
|
19
19
|
const lastProofStep = localContext.getLastProofStep();
|
|
20
20
|
|
|
21
21
|
if (lastProofStep !== null) {
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
statementNodeMatchesConclusionStatementNode = statementNode.match(conclusionStatementNode);
|
|
22
|
+
const lastProofStepStatementNode = lastProofStep.getStatementNode(),
|
|
23
|
+
lastStatementNode = lastProofStepStatementNode, ///
|
|
24
|
+
statementNodeMatchesLastStatementNode = statementNode.match(lastStatementNode);
|
|
26
25
|
|
|
27
|
-
proofVerified =
|
|
26
|
+
proofVerified = statementNodeMatchesLastStatementNode; ///
|
|
28
27
|
}
|
|
29
28
|
}
|
|
30
29
|
|