occam-verify-cli 0.0.908 → 0.0.910
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/context/file.js +1 -29
- package/lib/context/local.js +9 -14
- package/lib/context/localMeta.js +9 -14
- package/lib/declaration.js +3 -3
- package/lib/metaSupposition.js +4 -4
- package/lib/premise.js +4 -4
- package/lib/step/metaproof.js +12 -51
- package/lib/step/proof.js +8 -20
- package/lib/substitution/metastatementForMetavariable.js +4 -4
- package/lib/substitution/statementForMetavariable.js +5 -5
- package/lib/utilities/match.js +96 -0
- package/lib/verify/metaDerivation.js +7 -7
- package/lib/verify/metaSubDerivation.js +6 -6
- package/lib/verify/{metaProofStep.js → metaproofStep.js} +11 -11
- package/lib/verify/metastatement/unqualified.js +2 -5
- package/package.json +4 -4
- package/src/context/file.js +0 -24
- package/src/context/local.js +9 -15
- package/src/context/localMeta.js +9 -15
- package/src/declaration.js +2 -2
- package/src/metaSupposition.js +3 -3
- package/src/premise.js +3 -3
- package/src/step/metaproof.js +11 -72
- package/src/step/proof.js +7 -25
- package/src/substitution/metastatementForMetavariable.js +3 -3
- package/src/substitution/statementForMetavariable.js +1 -1
- package/src/utilities/match.js +100 -0
- package/src/verify/metaDerivation.js +6 -6
- package/src/verify/metaSubDerivation.js +6 -6
- package/src/verify/{metaProofStep.js → metaproofStep.js} +17 -17
- package/src/verify/metastatement/unqualified.js +1 -5
- package/lib/utilities/metaproof.js +0 -59
- package/lib/utilities/proof.js +0 -59
- package/src/utilities/metaproof.js +0 -53
- package/src/utilities/proof.js +0 -53
|
@@ -0,0 +1,96 @@
|
|
|
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
|
+
bracketedMetastatementChildNodeFromMetastatementNode: function() {
|
|
13
|
+
return bracketedMetastatementChildNodeFromMetastatementNode;
|
|
14
|
+
},
|
|
15
|
+
bracketedStatementChildNodeFromStatementNode: function() {
|
|
16
|
+
return bracketedStatementChildNodeFromStatementNode;
|
|
17
|
+
},
|
|
18
|
+
matchMetastatementModuloBrackets: function() {
|
|
19
|
+
return matchMetastatementModuloBrackets;
|
|
20
|
+
},
|
|
21
|
+
matchStatementModuloBrackets: function() {
|
|
22
|
+
return matchStatementModuloBrackets;
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
var _bracketed = /*#__PURE__*/ _interop_require_default(require("../node/statement/bracketed"));
|
|
26
|
+
var _bracketed1 = /*#__PURE__*/ _interop_require_default(require("../node/metastatement/bracketed"));
|
|
27
|
+
var _query = require("../utilities/query");
|
|
28
|
+
var _constants = require("../constants");
|
|
29
|
+
function _interop_require_default(obj) {
|
|
30
|
+
return obj && obj.__esModule ? obj : {
|
|
31
|
+
default: obj
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
var bracketedStatementChildNodeQuery = (0, _query.nodeQuery)("/statement/metaArgument!/statement!"), bracketedMetastatementChildNodeQuery = (0, _query.nodeQuery)("/metastatement/metastatement!");
|
|
35
|
+
function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
|
|
36
|
+
var statementMatchesModuloBrackets = false;
|
|
37
|
+
if (!statementMatchesModuloBrackets) {
|
|
38
|
+
var statementNodeMatches = statementNodeA.match(statementNodeB);
|
|
39
|
+
statementMatchesModuloBrackets = statementNodeMatches; ///
|
|
40
|
+
}
|
|
41
|
+
if (!statementMatchesModuloBrackets) {
|
|
42
|
+
var bracketedStatementChildNodeA = bracketedStatementChildNodeFromStatementNode(statementNodeA);
|
|
43
|
+
if (bracketedStatementChildNodeA !== null) {
|
|
44
|
+
var bracketedStatementChildNodeAMatchStatementNodeB = bracketedStatementChildNodeA.match(statementNodeB);
|
|
45
|
+
statementMatchesModuloBrackets = bracketedStatementChildNodeAMatchStatementNodeB; ///
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
if (!statementMatchesModuloBrackets) {
|
|
49
|
+
var bracketedStatementChildNodeB = bracketedStatementChildNodeFromStatementNode(statementNodeB);
|
|
50
|
+
if (bracketedStatementChildNodeB !== null) {
|
|
51
|
+
var statementNodeAMatchBracketedStatementChildNodeB = statementNodeA.match(bracketedStatementChildNodeB);
|
|
52
|
+
statementMatchesModuloBrackets = statementNodeAMatchBracketedStatementChildNodeB; ///
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return statementMatchesModuloBrackets;
|
|
56
|
+
}
|
|
57
|
+
function matchMetastatementModuloBrackets(metastatementNodeA, metastatementNodeB) {
|
|
58
|
+
var metastatementMatches = false;
|
|
59
|
+
if (!metastatementMatches) {
|
|
60
|
+
var metastatementNodeMatches = metastatementNodeA.match(metastatementNodeB);
|
|
61
|
+
metastatementMatches = metastatementNodeMatches; ///
|
|
62
|
+
}
|
|
63
|
+
if (!metastatementMatches) {
|
|
64
|
+
var bracketedMetastatementChildNodeA = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeA);
|
|
65
|
+
if (bracketedMetastatementChildNodeA !== null) {
|
|
66
|
+
var bracketedMetastatementChildNodeAMatchesMetastatementNodeB = bracketedMetastatementChildNodeA.match(metastatementNodeB);
|
|
67
|
+
metastatementMatches = bracketedMetastatementChildNodeAMatchesMetastatementNodeB; ///
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (!metastatementMatches) {
|
|
71
|
+
var bracketedMetastatementChildNodeB = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeB);
|
|
72
|
+
if (bracketedMetastatementChildNodeB !== null) {
|
|
73
|
+
var metastatementNodeAMatchesBracketedMetastatementChildNodeB = metastatementNodeA.match(bracketedMetastatementChildNodeB);
|
|
74
|
+
metastatementMatches = metastatementNodeAMatchesBracketedMetastatementChildNodeB; ///
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return metastatementMatches;
|
|
78
|
+
}
|
|
79
|
+
function bracketedStatementChildNodeFromStatementNode(statementNode) {
|
|
80
|
+
var bracketedStatementChildNode = null;
|
|
81
|
+
var depth = _constants.BRACKETED_STATEMENT_DEPTH, statementNodeMatchBracketedStatementNode = statementNode.match(_bracketed.default, depth);
|
|
82
|
+
if (statementNodeMatchBracketedStatementNode) {
|
|
83
|
+
bracketedStatementChildNode = bracketedStatementChildNodeQuery(statementNode);
|
|
84
|
+
}
|
|
85
|
+
return bracketedStatementChildNode;
|
|
86
|
+
}
|
|
87
|
+
function bracketedMetastatementChildNodeFromMetastatementNode(metastatementNode) {
|
|
88
|
+
var bracketedMetastatementChildNode = null;
|
|
89
|
+
var depth = _constants.BRACKETED_METASTATEMENT_DEPTH, metastatementNodeMatchesBracketedMetastatementNode = metastatementNode.match(_bracketed1.default, depth);
|
|
90
|
+
if (metastatementNodeMatchesBracketedMetastatementNode) {
|
|
91
|
+
bracketedMetastatementChildNode = bracketedMetastatementChildNodeQuery(metastatementNode);
|
|
92
|
+
}
|
|
93
|
+
return bracketedMetastatementChildNode;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/match.js"],"sourcesContent":["\"use strict\";\n\nimport bracketedStatementNode from \"../node/statement/bracketed\";\nimport bracketedMetastatementNode from \"../node/metastatement/bracketed\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { BRACKETED_STATEMENT_DEPTH, BRACKETED_METASTATEMENT_DEPTH } from \"../constants\";\n\nconst bracketedStatementChildNodeQuery = nodeQuery(\"/statement/metaArgument!/statement!\"),\n      bracketedMetastatementChildNodeQuery = nodeQuery(\"/metastatement/metastatement!\");\n\nexport function matchStatementModuloBrackets(statementNodeA, statementNodeB) {\n  let statementMatchesModuloBrackets = false;\n\n  if (!statementMatchesModuloBrackets) {\n    const statementNodeMatches = statementNodeA.match(statementNodeB);\n\n    statementMatchesModuloBrackets = statementNodeMatches;  ///\n  }\n\n  if (!statementMatchesModuloBrackets) {\n    const bracketedStatementChildNodeA = bracketedStatementChildNodeFromStatementNode(statementNodeA);\n\n    if (bracketedStatementChildNodeA !== null) {\n      const bracketedStatementChildNodeAMatchStatementNodeB = bracketedStatementChildNodeA.match(statementNodeB);\n\n      statementMatchesModuloBrackets = bracketedStatementChildNodeAMatchStatementNodeB; ///\n    }\n  }\n\n  if (!statementMatchesModuloBrackets) {\n    const bracketedStatementChildNodeB = bracketedStatementChildNodeFromStatementNode(statementNodeB);\n\n    if (bracketedStatementChildNodeB !== null) {\n      const statementNodeAMatchBracketedStatementChildNodeB = statementNodeA.match(bracketedStatementChildNodeB);\n\n      statementMatchesModuloBrackets = statementNodeAMatchBracketedStatementChildNodeB; ///\n    }\n  }\n\n  return statementMatchesModuloBrackets;\n}\n\nexport function matchMetastatementModuloBrackets(metastatementNodeA, metastatementNodeB) {\n  let metastatementMatches = false;\n\n  if (!metastatementMatches) {\n    const metastatementNodeMatches = metastatementNodeA.match(metastatementNodeB);\n\n    metastatementMatches = metastatementNodeMatches;  ///\n  }\n\n  if (!metastatementMatches) {\n    const bracketedMetastatementChildNodeA = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeA);\n\n    if (bracketedMetastatementChildNodeA !== null) {\n      const bracketedMetastatementChildNodeAMatchesMetastatementNodeB = bracketedMetastatementChildNodeA.match(metastatementNodeB);\n\n      metastatementMatches = bracketedMetastatementChildNodeAMatchesMetastatementNodeB; ///\n    }\n  }\n\n  if (!metastatementMatches) {\n    const bracketedMetastatementChildNodeB = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeB);\n\n    if (bracketedMetastatementChildNodeB !== null) {\n      const metastatementNodeAMatchesBracketedMetastatementChildNodeB = metastatementNodeA.match(bracketedMetastatementChildNodeB);\n\n      metastatementMatches = metastatementNodeAMatchesBracketedMetastatementChildNodeB; ///\n    }\n  }\n\n  return metastatementMatches;\n}\n\nexport function bracketedStatementChildNodeFromStatementNode(statementNode) {\n  let bracketedStatementChildNode = null;\n\n  const depth = BRACKETED_STATEMENT_DEPTH,\n        statementNodeMatchBracketedStatementNode = statementNode.match(bracketedStatementNode, depth);\n\n  if (statementNodeMatchBracketedStatementNode) {\n    bracketedStatementChildNode = bracketedStatementChildNodeQuery(statementNode);\n  }\n\n  return bracketedStatementChildNode;\n}\n\nexport function bracketedMetastatementChildNodeFromMetastatementNode(metastatementNode) {\n  let bracketedMetastatementChildNode = null;\n\n  const depth = BRACKETED_METASTATEMENT_DEPTH,\n        metastatementNodeMatchesBracketedMetastatementNode = metastatementNode.match(bracketedMetastatementNode, depth);\n\n  if (metastatementNodeMatchesBracketedMetastatementNode) {\n    bracketedMetastatementChildNode = bracketedMetastatementChildNodeQuery(metastatementNode);\n  }\n\n  return bracketedMetastatementChildNode;\n}\n"],"names":["bracketedMetastatementChildNodeFromMetastatementNode","bracketedStatementChildNodeFromStatementNode","matchMetastatementModuloBrackets","matchStatementModuloBrackets","bracketedStatementChildNodeQuery","nodeQuery","bracketedMetastatementChildNodeQuery","statementNodeA","statementNodeB","statementMatchesModuloBrackets","statementNodeMatches","match","bracketedStatementChildNodeA","bracketedStatementChildNodeAMatchStatementNodeB","bracketedStatementChildNodeB","statementNodeAMatchBracketedStatementChildNodeB","metastatementNodeA","metastatementNodeB","metastatementMatches","metastatementNodeMatches","bracketedMetastatementChildNodeA","bracketedMetastatementChildNodeAMatchesMetastatementNodeB","bracketedMetastatementChildNodeB","metastatementNodeAMatchesBracketedMetastatementChildNodeB","statementNode","bracketedStatementChildNode","depth","BRACKETED_STATEMENT_DEPTH","statementNodeMatchBracketedStatementNode","bracketedStatementNode","metastatementNode","bracketedMetastatementChildNode","BRACKETED_METASTATEMENT_DEPTH","metastatementNodeMatchesBracketedMetastatementNode","bracketedMetastatementNode"],"mappings":"AAAA;;;;;;;;;;;IAwFgBA,oDAAoD;eAApDA;;IAbAC,4CAA4C;eAA5CA;;IAhCAC,gCAAgC;eAAhCA;;IAhCAC,4BAA4B;eAA5BA;;;gEATmB;iEACI;qBAEb;yBAC+C;;;;;;AAEzE,IAAMC,mCAAmCC,IAAAA,gBAAS,EAAC,wCAC7CC,uCAAuCD,IAAAA,gBAAS,EAAC;AAEhD,SAASF,6BAA6BI,cAAc,EAAEC,cAAc;IACzE,IAAIC,iCAAiC;IAErC,IAAI,CAACA,gCAAgC;QACnC,IAAMC,uBAAuBH,eAAeI,KAAK,CAACH;QAElDC,iCAAiCC,sBAAuB,GAAG;IAC7D;IAEA,IAAI,CAACD,gCAAgC;QACnC,IAAMG,+BAA+BX,6CAA6CM;QAElF,IAAIK,iCAAiC,MAAM;YACzC,IAAMC,kDAAkDD,6BAA6BD,KAAK,CAACH;YAE3FC,iCAAiCI,iDAAiD,GAAG;QACvF;IACF;IAEA,IAAI,CAACJ,gCAAgC;QACnC,IAAMK,+BAA+Bb,6CAA6CO;QAElF,IAAIM,iCAAiC,MAAM;YACzC,IAAMC,kDAAkDR,eAAeI,KAAK,CAACG;YAE7EL,iCAAiCM,iDAAiD,GAAG;QACvF;IACF;IAEA,OAAON;AACT;AAEO,SAASP,iCAAiCc,kBAAkB,EAAEC,kBAAkB;IACrF,IAAIC,uBAAuB;IAE3B,IAAI,CAACA,sBAAsB;QACzB,IAAMC,2BAA2BH,mBAAmBL,KAAK,CAACM;QAE1DC,uBAAuBC,0BAA2B,GAAG;IACvD;IAEA,IAAI,CAACD,sBAAsB;QACzB,IAAME,mCAAmCpB,qDAAqDgB;QAE9F,IAAII,qCAAqC,MAAM;YAC7C,IAAMC,4DAA4DD,iCAAiCT,KAAK,CAACM;YAEzGC,uBAAuBG,2DAA2D,GAAG;QACvF;IACF;IAEA,IAAI,CAACH,sBAAsB;QACzB,IAAMI,mCAAmCtB,qDAAqDiB;QAE9F,IAAIK,qCAAqC,MAAM;YAC7C,IAAMC,4DAA4DP,mBAAmBL,KAAK,CAACW;YAE3FJ,uBAAuBK,2DAA2D,GAAG;QACvF;IACF;IAEA,OAAOL;AACT;AAEO,SAASjB,6CAA6CuB,aAAa;IACxE,IAAIC,8BAA8B;IAElC,IAAMC,QAAQC,oCAAyB,EACjCC,2CAA2CJ,cAAcb,KAAK,CAACkB,kBAAsB,EAAEH;IAE7F,IAAIE,0CAA0C;QAC5CH,8BAA8BrB,iCAAiCoB;IACjE;IAEA,OAAOC;AACT;AAEO,SAASzB,qDAAqD8B,iBAAiB;IACpF,IAAIC,kCAAkC;IAEtC,IAAML,QAAQM,wCAA6B,EACrCC,qDAAqDH,kBAAkBnB,KAAK,CAACuB,mBAA0B,EAAER;IAE/G,IAAIO,oDAAoD;QACtDF,kCAAkCzB,qCAAqCwB;IACzE;IAEA,OAAOC;AACT"}
|
|
@@ -8,24 +8,24 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return verifyMetaDerivation;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var
|
|
11
|
+
var _metaproofStep = /*#__PURE__*/ _interop_require_default(require("../verify/metaproofStep"));
|
|
12
12
|
var _query = require("../utilities/query");
|
|
13
13
|
function _interop_require_default(obj) {
|
|
14
14
|
return obj && obj.__esModule ? obj : {
|
|
15
15
|
default: obj
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
|
-
var
|
|
18
|
+
var metaproofStepNodesQuery = (0, _query.nodesQuery)("/metaDerivation/metaproofStep|lastMetaproofStep");
|
|
19
19
|
function verifyMetaDerivation(metaDerivationNode, substitutions, localMetaContext) {
|
|
20
20
|
var metaDerivationVerified;
|
|
21
|
-
var
|
|
22
|
-
metaDerivationVerified =
|
|
23
|
-
var
|
|
24
|
-
if (
|
|
21
|
+
var metaproofStepNodes = metaproofStepNodesQuery(metaDerivationNode);
|
|
22
|
+
metaDerivationVerified = metaproofStepNodes.every(function(metaproofStepNode) {
|
|
23
|
+
var metaproofStepVerified = (0, _metaproofStep.default)(metaproofStepNode, substitutions, localMetaContext);
|
|
24
|
+
if (metaproofStepVerified) {
|
|
25
25
|
return true;
|
|
26
26
|
}
|
|
27
27
|
});
|
|
28
28
|
return metaDerivationVerified;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YURlcml2YXRpb24uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlNZXRhcHJvb2ZTdGVwIGZyb20gXCIuLi92ZXJpZnkvbWV0YXByb29mU3RlcFwiO1xuXG5pbXBvcnQgeyBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBtZXRhcHJvb2ZTdGVwTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvbWV0YURlcml2YXRpb24vbWV0YXByb29mU3RlcHxsYXN0TWV0YXByb29mU3RlcFwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5TWV0YURlcml2YXRpb24obWV0YURlcml2YXRpb25Ob2RlLCBzdWJzdGl0dXRpb25zLCBsb2NhbE1ldGFDb250ZXh0KSB7XG4gIGxldCBtZXRhRGVyaXZhdGlvblZlcmlmaWVkO1xuXG4gIGNvbnN0IG1ldGFwcm9vZlN0ZXBOb2RlcyA9IG1ldGFwcm9vZlN0ZXBOb2Rlc1F1ZXJ5KG1ldGFEZXJpdmF0aW9uTm9kZSk7XG5cbiAgbWV0YURlcml2YXRpb25WZXJpZmllZCA9IG1ldGFwcm9vZlN0ZXBOb2Rlcy5ldmVyeSgobWV0YXByb29mU3RlcE5vZGUpID0+IHtcbiAgICBjb25zdCBtZXRhcHJvb2ZTdGVwVmVyaWZpZWQgPSB2ZXJpZnlNZXRhcHJvb2ZTdGVwKG1ldGFwcm9vZlN0ZXBOb2RlLCBzdWJzdGl0dXRpb25zLCBsb2NhbE1ldGFDb250ZXh0KTtcblxuICAgIGlmIChtZXRhcHJvb2ZTdGVwVmVyaWZpZWQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIG1ldGFEZXJpdmF0aW9uVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5TWV0YURlcml2YXRpb24iLCJtZXRhcHJvb2ZTdGVwTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJtZXRhRGVyaXZhdGlvbk5vZGUiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxNZXRhQ29udGV4dCIsIm1ldGFEZXJpdmF0aW9uVmVyaWZpZWQiLCJtZXRhcHJvb2ZTdGVwTm9kZXMiLCJldmVyeSIsIm1ldGFwcm9vZlN0ZXBOb2RlIiwibWV0YXByb29mU3RlcFZlcmlmaWVkIiwidmVyaWZ5TWV0YXByb29mU3RlcCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBUUE7OztlQUF3QkE7OztvRUFOUTtxQkFFTDs7Ozs7O0FBRTNCLElBQU1DLDBCQUEwQkMsSUFBQUEsaUJBQVUsRUFBQztBQUU1QixTQUFTRixxQkFBcUJHLGtCQUFrQixFQUFFQyxhQUFhLEVBQUVDLGdCQUFnQjtJQUM5RixJQUFJQztJQUVKLElBQU1DLHFCQUFxQk4sd0JBQXdCRTtJQUVuREcseUJBQXlCQyxtQkFBbUJDLEtBQUssQ0FBQyxTQUFDQztRQUNqRCxJQUFNQyx3QkFBd0JDLElBQUFBLHNCQUFtQixFQUFDRixtQkFBbUJMLGVBQWVDO1FBRXBGLElBQUlLLHVCQUF1QjtZQUN6QixPQUFPO1FBQ1Q7SUFDRjtJQUVBLE9BQU9KO0FBQ1QifQ==
|
|
@@ -9,17 +9,17 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
var _query = require("../utilities/query");
|
|
12
|
-
var
|
|
12
|
+
var metaproofStepNodesQuery = (0, _query.nodesQuery)("/metaSubDerivation/metaproofStep|lastMetaproofStep");
|
|
13
13
|
function verifyMetaSubDerivation(metaSubDerivationNode, substitutions, localMetaContext) {
|
|
14
14
|
var metaSubDerivationVerified;
|
|
15
|
-
var
|
|
16
|
-
metaSubDerivationVerified =
|
|
17
|
-
var
|
|
18
|
-
if (
|
|
15
|
+
var metaproofStepNodes = metaproofStepNodesQuery(metaSubDerivationNode);
|
|
16
|
+
metaSubDerivationVerified = metaproofStepNodes.every(function(metaproofStepNode) {
|
|
17
|
+
var verifyMetaproofStep = verifyMetaSubDerivation.verifyMetaproofStep, metaproofStepVerified = verifyMetaproofStep(metaproofStepNode, substitutions, localMetaContext);
|
|
18
|
+
if (metaproofStepVerified) {
|
|
19
19
|
return true;
|
|
20
20
|
}
|
|
21
21
|
});
|
|
22
22
|
return metaSubDerivationVerified;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YVN1YkRlcml2YXRpb24uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IG1ldGFwcm9vZlN0ZXBOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi9tZXRhU3ViRGVyaXZhdGlvbi9tZXRhcHJvb2ZTdGVwfGxhc3RNZXRhcHJvb2ZTdGVwXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlNZXRhU3ViRGVyaXZhdGlvbihtZXRhU3ViRGVyaXZhdGlvbk5vZGUsIHN1YnN0aXR1dGlvbnMsIGxvY2FsTWV0YUNvbnRleHQpIHtcbiAgbGV0IG1ldGFTdWJEZXJpdmF0aW9uVmVyaWZpZWQ7XG5cbiAgY29uc3QgbWV0YXByb29mU3RlcE5vZGVzID0gbWV0YXByb29mU3RlcE5vZGVzUXVlcnkobWV0YVN1YkRlcml2YXRpb25Ob2RlKTtcblxuICBtZXRhU3ViRGVyaXZhdGlvblZlcmlmaWVkID0gbWV0YXByb29mU3RlcE5vZGVzLmV2ZXJ5KChtZXRhcHJvb2ZTdGVwTm9kZSkgPT4ge1xuICAgIGNvbnN0IHsgdmVyaWZ5TWV0YXByb29mU3RlcCB9ID0gdmVyaWZ5TWV0YVN1YkRlcml2YXRpb24sXG4gICAgICAgICAgbWV0YXByb29mU3RlcFZlcmlmaWVkID0gdmVyaWZ5TWV0YXByb29mU3RlcChtZXRhcHJvb2ZTdGVwTm9kZSwgc3Vic3RpdHV0aW9ucywgbG9jYWxNZXRhQ29udGV4dCk7XG5cbiAgICBpZiAobWV0YXByb29mU3RlcFZlcmlmaWVkKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH0pO1xuXG4gIHJldHVybiBtZXRhU3ViRGVyaXZhdGlvblZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeU1ldGFTdWJEZXJpdmF0aW9uIiwibWV0YXByb29mU3RlcE5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5IiwibWV0YVN1YkRlcml2YXRpb25Ob2RlIiwic3Vic3RpdHV0aW9ucyIsImxvY2FsTWV0YUNvbnRleHQiLCJtZXRhU3ViRGVyaXZhdGlvblZlcmlmaWVkIiwibWV0YXByb29mU3RlcE5vZGVzIiwiZXZlcnkiLCJtZXRhcHJvb2ZTdGVwTm9kZSIsInZlcmlmeU1ldGFwcm9vZlN0ZXAiLCJtZXRhcHJvb2ZTdGVwVmVyaWZpZWQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU1BOzs7ZUFBd0JBOzs7cUJBSkc7QUFFM0IsSUFBTUMsMEJBQTBCQyxJQUFBQSxpQkFBVSxFQUFDO0FBRTVCLFNBQVNGLHdCQUF3QkcscUJBQXFCLEVBQUVDLGFBQWEsRUFBRUMsZ0JBQWdCO0lBQ3BHLElBQUlDO0lBRUosSUFBTUMscUJBQXFCTix3QkFBd0JFO0lBRW5ERyw0QkFBNEJDLG1CQUFtQkMsS0FBSyxDQUFDLFNBQUNDO1FBQ3BELElBQU0sQUFBRUMsc0JBQXdCVix3QkFBeEJVLHFCQUNGQyx3QkFBd0JELG9CQUFvQkQsbUJBQW1CTCxlQUFlQztRQUVwRixJQUFJTSx1QkFBdUI7WUFDekIsT0FBTztRQUNUO0lBQ0Y7SUFFQSxPQUFPTDtBQUNUIn0=
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
Object.defineProperty(exports, "default", {
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: function() {
|
|
8
|
-
return
|
|
8
|
+
return verifyMetaproofStep;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
var _metaproof = /*#__PURE__*/ _interop_require_default(require("../step/metaproof"));
|
|
@@ -22,10 +22,10 @@ function _interop_require_default(obj) {
|
|
|
22
22
|
default: obj
|
|
23
23
|
};
|
|
24
24
|
}
|
|
25
|
-
var metaSubproofNodeQuery = (0, _query.nodeQuery)("/
|
|
26
|
-
function
|
|
27
|
-
var
|
|
28
|
-
var metaSubproofNode = metaSubproofNodeQuery(
|
|
25
|
+
var metaSubproofNodeQuery = (0, _query.nodeQuery)("/metaproofStep|lastMetaproofStep/metaSubproof!"), metastatementNodeQuery = (0, _query.nodeQuery)("/qualifiedMetastatement|unqualifiedMetastatement/metastatement!"), qualifiedStatementNodeQuery = (0, _query.nodeQuery)("/metaproofStep|lastMetaproofStep/qualifiedStatement!"), unqualifiedStatementNodeQuery = (0, _query.nodeQuery)("/metaproofStep|lastMetaproofStep/unqualifiedStatement!"), qualifiedMetastatementNodeQuery = (0, _query.nodeQuery)("/metaproofStep|lastMetaproofStep/qualifiedMetastatement!"), unqualifiedMetastatementNodeQuery = (0, _query.nodeQuery)("/metaproofStep|lastMetaproofStep/unqualifiedMetastatement!");
|
|
26
|
+
function verifyMetaproofStep(metaproofStepNode, substitutions, localMetaContext) {
|
|
27
|
+
var metaproofStepVerified = false;
|
|
28
|
+
var metaSubproofNode = metaSubproofNodeQuery(metaproofStepNode), qualifiedStatementNode = qualifiedStatementNodeQuery(metaproofStepNode), unqualifiedStatementNode = unqualifiedStatementNodeQuery(metaproofStepNode), qualifiedMetastatementNode = qualifiedMetastatementNodeQuery(metaproofStepNode), unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(metaproofStepNode);
|
|
29
29
|
if (false) {
|
|
30
30
|
///
|
|
31
31
|
} else if (metaSubproofNode !== null) {
|
|
@@ -34,7 +34,7 @@ function verifyMetaProofStep(metaProofStepNode, substitutions, localMetaContext)
|
|
|
34
34
|
if (metaSubproofVerified) {
|
|
35
35
|
var metaproofStep = _metaproof.default.fromMetaSubproofNode(metaSubproofNode);
|
|
36
36
|
localMetaContext.addMetaproofStep(metaproofStep);
|
|
37
|
-
|
|
37
|
+
metaproofStepVerified = true;
|
|
38
38
|
}
|
|
39
39
|
} else if (qualifiedStatementNode !== null) {
|
|
40
40
|
debugger;
|
|
@@ -51,7 +51,7 @@ function verifyMetaProofStep(metaProofStepNode, substitutions, localMetaContext)
|
|
|
51
51
|
if (qualifiedMetastatementVerified) {
|
|
52
52
|
var metastatementNode = metastatementNodeQuery(qualifiedMetastatementNode), metaproofStep1 = _metaproof.default.fromMetastatementNode(metastatementNode);
|
|
53
53
|
localMetaContext.addMetaproofStep(metaproofStep1);
|
|
54
|
-
|
|
54
|
+
metaproofStepVerified = qualifiedMetastatementVerified; ///
|
|
55
55
|
}
|
|
56
56
|
} else if (unqualifiedMetastatementNode !== null) {
|
|
57
57
|
var unqualifiedMetastatementVerified;
|
|
@@ -64,13 +64,13 @@ function verifyMetaProofStep(metaProofStepNode, substitutions, localMetaContext)
|
|
|
64
64
|
if (unqualifiedMetastatementVerified) {
|
|
65
65
|
var metastatementNode1 = metastatementNodeQuery(unqualifiedMetastatementNode), metaproofStep2 = _metaproof.default.fromMetastatementNode(metastatementNode1);
|
|
66
66
|
localMetaContext.addMetaproofStep(metaproofStep2);
|
|
67
|
-
|
|
67
|
+
metaproofStepVerified = true;
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
-
return
|
|
70
|
+
return metaproofStepVerified;
|
|
71
71
|
}
|
|
72
72
|
Object.assign(_metaSubDerivation.default, {
|
|
73
|
-
|
|
73
|
+
verifyMetaproofStep: verifyMetaproofStep
|
|
74
74
|
});
|
|
75
75
|
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metaproofStep.js"],"sourcesContent":["\"use strict\";\n\nimport MetaproofStep from \"../step/metaproof\";\nimport verifyMetaSubproof from \"../verify/metaSubproof\";\nimport verifyMetaSubDerivation from \"../verify/metaSubDerivation\";\nimport verifyQualifiedStatement from \"../verify/statement/qualified\";\nimport verifyUnqualifiedStatement from \"../verify/statement/unqualified\";\nimport verifyQualifiedMetastatement from \"../verify/metastatement/qualified\";\nimport verifyUnqualifiedMetastatement from \"../verify/metastatement/unqualified\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { assignAssignment } from \"../utilities/assignments\";\n\nconst metaSubproofNodeQuery = nodeQuery(\"/metaproofStep|lastMetaproofStep/metaSubproof!\"),\n      metastatementNodeQuery = nodeQuery(\"/qualifiedMetastatement|unqualifiedMetastatement/metastatement!\"),\n      qualifiedStatementNodeQuery = nodeQuery(\"/metaproofStep|lastMetaproofStep/qualifiedStatement!\"),\n      unqualifiedStatementNodeQuery = nodeQuery(\"/metaproofStep|lastMetaproofStep/unqualifiedStatement!\"),\n      qualifiedMetastatementNodeQuery = nodeQuery(\"/metaproofStep|lastMetaproofStep/qualifiedMetastatement!\"),\n      unqualifiedMetastatementNodeQuery = nodeQuery(\"/metaproofStep|lastMetaproofStep/unqualifiedMetastatement!\");\n\nexport default function verifyMetaproofStep(metaproofStepNode, substitutions, localMetaContext) {\n  let metaproofStepVerified = false;\n\n  const metaSubproofNode = metaSubproofNodeQuery(metaproofStepNode),\n        qualifiedStatementNode = qualifiedStatementNodeQuery(metaproofStepNode),\n        unqualifiedStatementNode = unqualifiedStatementNodeQuery(metaproofStepNode),\n        qualifiedMetastatementNode = qualifiedMetastatementNodeQuery(metaproofStepNode),\n        unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(metaproofStepNode);\n\n  if (false) {\n    ///\n  } else if (metaSubproofNode !== null) {\n    let metaSubproofVerified;\n\n    metaSubproofVerified = verifyMetaSubproof(metaSubproofNode, substitutions, localMetaContext);\n\n    if (metaSubproofVerified) {\n      const metaproofStep = MetaproofStep.fromMetaSubproofNode(metaSubproofNode);\n\n      localMetaContext.addMetaproofStep(metaproofStep);\n\n      metaproofStepVerified = true;\n    }\n  } else if (qualifiedStatementNode !== null) {\n    debugger\n  } else if (unqualifiedStatementNode !== null) {\n    debugger\n  } else if (qualifiedMetastatementNode !== null) {\n    let qualifiedMetastatementVerified;\n\n    const assignments = [];\n\n    qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, substitutions, assignments, localMetaContext);\n\n    if (qualifiedMetastatementVerified) {\n      const localContext = localMetaContext,  ///\n            assignmentAssigned = assignAssignment(assignments, localContext);\n\n      qualifiedMetastatementVerified = assignmentAssigned; ///\n    }\n\n    if (qualifiedMetastatementVerified) {\n      const metastatementNode = metastatementNodeQuery(qualifiedMetastatementNode),\n            metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);\n\n      localMetaContext.addMetaproofStep(metaproofStep);\n\n      metaproofStepVerified = qualifiedMetastatementVerified; ///\n    }\n  } else if (unqualifiedMetastatementNode !== null) {\n    let unqualifiedMetastatementVerified;\n\n    const derived = true,\n          assignments = [];\n\n    unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localMetaContext);\n\n    if (unqualifiedMetastatementVerified) {\n      const localContext = localMetaContext,  ///\n            assignmentAssigned = assignAssignment(assignments, localContext);\n\n      unqualifiedMetastatementVerified = assignmentAssigned; ///\n    }\n\n    if (unqualifiedMetastatementVerified) {\n      const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),\n            metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);\n\n      localMetaContext.addMetaproofStep(metaproofStep);\n\n      metaproofStepVerified = true;\n    }\n  }\n\n  return metaproofStepVerified;\n}\n\nObject.assign(verifyMetaSubDerivation, {\n  verifyMetaproofStep\n});\n"],"names":["verifyMetaproofStep","metaSubproofNodeQuery","nodeQuery","metastatementNodeQuery","qualifiedStatementNodeQuery","unqualifiedStatementNodeQuery","qualifiedMetastatementNodeQuery","unqualifiedMetastatementNodeQuery","metaproofStepNode","substitutions","localMetaContext","metaproofStepVerified","metaSubproofNode","qualifiedStatementNode","unqualifiedStatementNode","qualifiedMetastatementNode","unqualifiedMetastatementNode","metaSubproofVerified","verifyMetaSubproof","metaproofStep","MetaproofStep","fromMetaSubproofNode","addMetaproofStep","qualifiedMetastatementVerified","assignments","verifyQualifiedMetastatement","localContext","assignmentAssigned","assignAssignment","metastatementNode","fromMetastatementNode","unqualifiedMetastatementVerified","derived","verifyUnqualifiedMetastatement","Object","assign","verifyMetaSubDerivation"],"mappings":"AAAA;;;;+BAoBA;;;eAAwBA;;;gEAlBE;mEACK;wEACK;gEACC;kEACE;iEACE;mEACE;qBAEjB;2BACO;;;;;;AAEjC,IAAMC,wBAAwBC,IAAAA,gBAAS,EAAC,mDAClCC,yBAAyBD,IAAAA,gBAAS,EAAC,oEACnCE,8BAA8BF,IAAAA,gBAAS,EAAC,yDACxCG,gCAAgCH,IAAAA,gBAAS,EAAC,2DAC1CI,kCAAkCJ,IAAAA,gBAAS,EAAC,6DAC5CK,oCAAoCL,IAAAA,gBAAS,EAAC;AAErC,SAASF,oBAAoBQ,iBAAiB,EAAEC,aAAa,EAAEC,gBAAgB;IAC5F,IAAIC,wBAAwB;IAE5B,IAAMC,mBAAmBX,sBAAsBO,oBACzCK,yBAAyBT,4BAA4BI,oBACrDM,2BAA2BT,8BAA8BG,oBACzDO,6BAA6BT,gCAAgCE,oBAC7DQ,+BAA+BT,kCAAkCC;IAEvE,IAAI,OAAO;IACT,GAAG;IACL,OAAO,IAAII,qBAAqB,MAAM;QACpC,IAAIK;QAEJA,uBAAuBC,IAAAA,qBAAkB,EAACN,kBAAkBH,eAAeC;QAE3E,IAAIO,sBAAsB;YACxB,IAAME,gBAAgBC,kBAAa,CAACC,oBAAoB,CAACT;YAEzDF,iBAAiBY,gBAAgB,CAACH;YAElCR,wBAAwB;QAC1B;IACF,OAAO,IAAIE,2BAA2B,MAAM;QAC1C,QAAQ;IACV,OAAO,IAAIC,6BAA6B,MAAM;QAC5C,QAAQ;IACV,OAAO,IAAIC,+BAA+B,MAAM;QAC9C,IAAIQ;QAEJ,IAAMC,cAAc,EAAE;QAEtBD,iCAAiCE,IAAAA,mBAA4B,EAACV,4BAA4BN,eAAee,aAAad;QAEtH,IAAIa,gCAAgC;YAClC,IAAMG,eAAehB,kBACfiB,qBAAqBC,IAAAA,6BAAgB,EAACJ,aAAaE;YAEzDH,iCAAiCI,oBAAoB,GAAG;QAC1D;QAEA,IAAIJ,gCAAgC;YAClC,IAAMM,oBAAoB1B,uBAAuBY,6BAC3CI,iBAAgBC,kBAAa,CAACU,qBAAqB,CAACD;YAE1DnB,iBAAiBY,gBAAgB,CAACH;YAElCR,wBAAwBY,gCAAgC,GAAG;QAC7D;IACF,OAAO,IAAIP,iCAAiC,MAAM;QAChD,IAAIe;QAEJ,IAAMC,UAAU,MACVR,eAAc,EAAE;QAEtBO,mCAAmCE,IAAAA,qBAA8B,EAACjB,8BAA8BQ,cAAaQ,SAAStB;QAEtH,IAAIqB,kCAAkC;YACpC,IAAML,gBAAehB,kBACfiB,sBAAqBC,IAAAA,6BAAgB,EAACJ,cAAaE;YAEzDK,mCAAmCJ,qBAAoB,GAAG;QAC5D;QAEA,IAAII,kCAAkC;YACpC,IAAMF,qBAAoB1B,uBAAuBa,+BAC3CG,iBAAgBC,kBAAa,CAACU,qBAAqB,CAACD;YAE1DnB,iBAAiBY,gBAAgB,CAACH;YAElCR,wBAAwB;QAC1B;IACF;IAEA,OAAOA;AACT;AAEAuB,OAAOC,MAAM,CAACC,0BAAuB,EAAE;IACrCpC,qBAAAA;AACF"}
|
|
@@ -25,10 +25,7 @@ function verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignment
|
|
|
25
25
|
unqualifiedMetastatementVerified = metastatementMatches; ///
|
|
26
26
|
}
|
|
27
27
|
if (!unqualifiedMetastatementVerified) {
|
|
28
|
-
var metastatementVerified = (0, _metastatement.default)(metastatementNode, assignments, derived, localMetaContext
|
|
29
|
-
var verifiedAhead = true;
|
|
30
|
-
return verifiedAhead;
|
|
31
|
-
});
|
|
28
|
+
var metastatementVerified = (0, _metastatement.default)(metastatementNode, assignments, derived, localMetaContext);
|
|
32
29
|
unqualifiedMetastatementVerified = metastatementVerified; ///
|
|
33
30
|
}
|
|
34
31
|
if (unqualifiedMetastatementVerified) {
|
|
@@ -37,4 +34,4 @@ function verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignment
|
|
|
37
34
|
return unqualifiedMetastatementVerified;
|
|
38
35
|
}
|
|
39
36
|
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvbWV0YXN0YXRlbWVudC91bnF1YWxpZmllZC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHZlcmlmeU1ldGFzdGF0ZW1lbnQgZnJvbSBcIi4uLy4uL3ZlcmlmeS9tZXRhc3RhdGVtZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbWV0YXN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQvbWV0YXN0YXRlbWVudCFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVVucXVhbGlmaWVkTWV0YXN0YXRlbWVudCh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlLCBhc3NpZ25tZW50cywgZGVyaXZlZCwgbG9jYWxNZXRhQ29udGV4dCkge1xuICBsZXQgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBtZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlUXVlcnkodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSksXG4gICAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudFN0cmluZyA9IGxvY2FsTWV0YUNvbnRleHQubm9kZUFzU3RyaW5nKHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gIGxvY2FsTWV0YUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7dW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50U3RyaW5nfScgdW5xdWFsaWZpZWQgbWV0YXN0YXRlbWVudC4uLmAsIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gIGlmIChkZXJpdmVkKSB7XG4gICAgY29uc3QgbWV0YXN0YXRlbWVudE1hdGNoZXMgPSBsb2NhbE1ldGFDb250ZXh0Lm1hdGNoTWV0YXN0YXRlbWVudChtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRWZXJpZmllZCA9IG1ldGFzdGF0ZW1lbnRNYXRjaGVzOyAgLy8vXG4gIH1cblxuICBpZiAoIXVucXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgY29uc3QgbWV0YXN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5TWV0YXN0YXRlbWVudChtZXRhc3RhdGVtZW50Tm9kZSwgYXNzaWdubWVudHMsIGRlcml2ZWQsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gICAgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQgPSBtZXRhc3RhdGVtZW50VmVyaWZpZWQ7IC8vL1xuICB9XG5cbiAgaWYgKHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgbG9jYWxNZXRhQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3VucXVhbGlmaWVkTWV0YXN0YXRlbWVudFN0cmluZ30nIHVucXVhbGlmaWVkIG1ldGFzdGF0ZW1lbnQuYCwgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSk7XG4gIH1cblxuICByZXR1cm4gdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50IiwibWV0YXN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUiLCJhc3NpZ25tZW50cyIsImRlcml2ZWQiLCJsb2NhbE1ldGFDb250ZXh0IiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQiLCJtZXRhc3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkTWV0YXN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwibWV0YXN0YXRlbWVudE1hdGNoZXMiLCJtYXRjaE1ldGFzdGF0ZW1lbnQiLCJtZXRhc3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlNZXRhc3RhdGVtZW50IiwiZGVidWciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFBOzs7ZUFBd0JBOzs7b0VBTlE7cUJBRU47Ozs7OztBQUUxQixJQUFNQyx5QkFBeUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFMUIsU0FBU0YsK0JBQStCRyw0QkFBNEIsRUFBRUMsV0FBVyxFQUFFQyxPQUFPLEVBQUVDLGdCQUFnQjtJQUN6SCxJQUFJQyxtQ0FBbUM7SUFFdkMsSUFBTUMsb0JBQW9CUCx1QkFBdUJFLCtCQUMzQ00saUNBQWlDSCxpQkFBaUJJLFlBQVksQ0FBQ1A7SUFFckVHLGlCQUFpQkssS0FBSyxDQUFDLEFBQUMsa0JBQWdELE9BQS9CRixnQ0FBK0IsbUNBQWlDTjtJQUV6RyxJQUFJRSxTQUFTO1FBQ1gsSUFBTU8sdUJBQXVCTixpQkFBaUJPLGtCQUFrQixDQUFDTDtRQUVqRUQsbUNBQW1DSyxzQkFBdUIsR0FBRztJQUMvRDtJQUVBLElBQUksQ0FBQ0wsa0NBQWtDO1FBQ3JDLElBQU1PLHdCQUF3QkMsSUFBQUEsc0JBQW1CLEVBQUNQLG1CQUFtQkosYUFBYUMsU0FBU0M7UUFFM0ZDLG1DQUFtQ08sdUJBQXVCLEdBQUc7SUFDL0Q7SUFFQSxJQUFJUCxrQ0FBa0M7UUFDcENELGlCQUFpQlUsS0FBSyxDQUFDLEFBQUMsb0JBQWtELE9BQS9CUCxnQ0FBK0IsaUNBQStCTjtJQUMzRztJQUVBLE9BQU9JO0FBQ1QifQ==
|
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.910",
|
|
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.28",
|
|
14
14
|
"necessary": "^14.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
16
|
-
"occam-entities": "^1.0.
|
|
17
|
-
"occam-file-system": "^6.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.809",
|
|
16
|
+
"occam-entities": "^1.0.146",
|
|
17
|
+
"occam-file-system": "^6.0.187",
|
|
18
18
|
"occam-grammar-utilities": "^8.0.207",
|
|
19
19
|
"occam-query": "^3.1.174"
|
|
20
20
|
},
|
package/src/context/file.js
CHANGED
|
@@ -520,30 +520,6 @@ export default class FileContext {
|
|
|
520
520
|
return metavariablePresent;
|
|
521
521
|
}
|
|
522
522
|
|
|
523
|
-
isTermGrounded(term) {
|
|
524
|
-
const termGrounded = false; ///
|
|
525
|
-
|
|
526
|
-
return termGrounded;
|
|
527
|
-
}
|
|
528
|
-
|
|
529
|
-
isVariableDefined(variable) {
|
|
530
|
-
const variableDefined = false; ///
|
|
531
|
-
|
|
532
|
-
return variableDefined;
|
|
533
|
-
}
|
|
534
|
-
|
|
535
|
-
matchStatement(statementNode) {
|
|
536
|
-
const statementMatches = false;
|
|
537
|
-
|
|
538
|
-
return statementMatches;
|
|
539
|
-
}
|
|
540
|
-
|
|
541
|
-
matchMetastatement(metastatementNode) {
|
|
542
|
-
const metastatementMatches = false;
|
|
543
|
-
|
|
544
|
-
return metastatementMatches;
|
|
545
|
-
}
|
|
546
|
-
|
|
547
523
|
nodeAsString(node) {
|
|
548
524
|
const string = nodeAsString(node, this.tokens);
|
|
549
525
|
|
package/src/context/local.js
CHANGED
|
@@ -4,7 +4,7 @@ import Variable from "../variable";
|
|
|
4
4
|
import Equivalence from "../equivalence";
|
|
5
5
|
import contextMixins from "../mixins/context";
|
|
6
6
|
|
|
7
|
-
import { last } from "../utilities/array";
|
|
7
|
+
import { last, reverse } from "../utilities/array";
|
|
8
8
|
import { mergeEquivalences, findEquivalenceByTerm, groundedTermsAndDefinedVariablesFromFromEquivalences } from "../utilities/equivalences";
|
|
9
9
|
|
|
10
10
|
class LocalContext {
|
|
@@ -216,23 +216,17 @@ class LocalContext {
|
|
|
216
216
|
}
|
|
217
217
|
|
|
218
218
|
matchStatement(statementNode) {
|
|
219
|
-
let
|
|
219
|
+
let proofSteps = this.getProofSteps();
|
|
220
220
|
|
|
221
|
-
|
|
222
|
-
const proofStepMatchesStatement = this.proofSteps.some((proofStep) => {
|
|
223
|
-
const proofStepMatchesStatement = proofStep.match(statementNode);
|
|
221
|
+
proofSteps = reverse(proofSteps); ///
|
|
224
222
|
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
}
|
|
228
|
-
});
|
|
229
|
-
|
|
230
|
-
statementMatches = proofStepMatchesStatement; ///
|
|
231
|
-
}
|
|
223
|
+
const statementMatches = proofSteps.some((proofStep) => {
|
|
224
|
+
const proofStepMatchesStatement = proofStep.matchStatement(statementNode);
|
|
232
225
|
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
226
|
+
if (proofStepMatchesStatement) {
|
|
227
|
+
return true;
|
|
228
|
+
}
|
|
229
|
+
});
|
|
236
230
|
|
|
237
231
|
return statementMatches;
|
|
238
232
|
}
|
package/src/context/localMeta.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import LocalContext from "../context/local";
|
|
4
4
|
|
|
5
|
-
import { last } from "../utilities/array";
|
|
5
|
+
import { last, reverse } from "../utilities/array";
|
|
6
6
|
|
|
7
7
|
class LocalMetaContext extends LocalContext {
|
|
8
8
|
constructor(context, variables, proofSteps, equivalences, metavariables, metaproofSteps, frameAssertions) {
|
|
@@ -99,23 +99,17 @@ class LocalMetaContext extends LocalContext {
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
matchMetastatement(metastatementNode) {
|
|
102
|
-
let
|
|
102
|
+
let metaproofSteps = this.getMetaproofSteps();
|
|
103
103
|
|
|
104
|
-
|
|
105
|
-
const proofStepMatchesMetastatement = this.metaproofSteps.some((metaproofStep) => {
|
|
106
|
-
const proofStepMatchesMetastatement = metaproofStep.match(metastatementNode);
|
|
104
|
+
metaproofSteps = reverse(metaproofSteps); ///
|
|
107
105
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
}
|
|
111
|
-
});
|
|
106
|
+
const metastatementMatches = metaproofSteps.some((metaproofStep) => {
|
|
107
|
+
const proofStepMatchesMetastatement = metaproofStep.matchMetastatement(metastatementNode);
|
|
112
108
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
metastatementMatches = this.context.matchMetastatement(metastatementNode);
|
|
118
|
-
}
|
|
109
|
+
if (proofStepMatchesMetastatement) {
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
112
|
+
});
|
|
119
113
|
|
|
120
114
|
return metastatementMatches;
|
|
121
115
|
}
|
package/src/declaration.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { matchMetastatementModuloBrackets } from "./utilities/match";
|
|
4
4
|
|
|
5
5
|
export default class Declaration {
|
|
6
6
|
constructor(metavariableNode, metastatementNode) {
|
|
@@ -35,7 +35,7 @@ export default class Declaration {
|
|
|
35
35
|
matchMetastatementNode(metastatementNode) {
|
|
36
36
|
const metastatementNodeA = metastatementNode, ///
|
|
37
37
|
metastatementNodeB = this.metastatementNode, ///
|
|
38
|
-
metastatementMatches =
|
|
38
|
+
metastatementMatches = matchMetastatementModuloBrackets(metastatementNodeA, metastatementNodeB),
|
|
39
39
|
metastatementNodeMatches = metastatementMatches; ///
|
|
40
40
|
|
|
41
41
|
return metastatementNodeMatches;
|
package/src/metaSupposition.js
CHANGED
|
@@ -11,7 +11,7 @@ import { statementNodeFromStatementString, metastatementNodeFromMetastatementStr
|
|
|
11
11
|
const subproofAssertionNodeQuery = nodeQuery("/metastatement/subproofAssertion!"),
|
|
12
12
|
subproofAssertionMetastatementNodesQuery = nodesQuery("/subproofAssertion/metastatement"),
|
|
13
13
|
metaSubproofMetaSuppositionMetastatementNodesQuery = nodesQuery("/metaSubproof/metaSupposition/unqualifiedMetastatement/metastatement!"),
|
|
14
|
-
|
|
14
|
+
metaSubproofLastMetpProofStepMetastatementNodeQuery = nodeQuery("/metaSubproof/metaSubDerivation/lastMetpProofStep/unqualifiedMetastatement|qualifiedMetastatement/metastatement!");
|
|
15
15
|
|
|
16
16
|
export default class MetaSupposition {
|
|
17
17
|
constructor(metastatementNode, statementNode) {
|
|
@@ -35,10 +35,10 @@ export default class MetaSupposition {
|
|
|
35
35
|
|
|
36
36
|
if (subproofAssertionNode !== null) {
|
|
37
37
|
const metaSubproofMetaSuppositionMetastatementNodes = metaSubproofMetaSuppositionMetastatementNodesQuery(metaSubproofNode),
|
|
38
|
-
|
|
38
|
+
metaSubproofLastMetpProofStepMetastatementNode = metaSubproofLastMetpProofStepMetastatementNodeQuery(metaSubproofNode),
|
|
39
39
|
metaSubproofMetastatementNodes = [
|
|
40
40
|
...metaSubproofMetaSuppositionMetastatementNodes,
|
|
41
|
-
|
|
41
|
+
metaSubproofLastMetpProofStepMetastatementNode
|
|
42
42
|
],
|
|
43
43
|
subproofAssertionMetastatementNodes = subproofAssertionMetastatementNodesQuery(subproofAssertionNode);
|
|
44
44
|
|
package/src/premise.js
CHANGED
|
@@ -17,7 +17,7 @@ const subproofAssertionNodeQuery = nodeQuery("/metastatement/subproofAssertion!"
|
|
|
17
17
|
ruleSubproofPremiseMetastatementNodesQuery = nodesQuery("/ruleSubproof/premise/unqualifiedMetastatement!/metastatement!"),
|
|
18
18
|
metaSubproofMetaSuppositionMetastatementNodesQuery = nodesQuery("/metaSubproof/metaSupposition/unqualifiedMetastatement!/metastatement!"),
|
|
19
19
|
ruleSubproofLastRuleProofStepMetastatementNodeQuery = nodeQuery("/ruleSubproof/ruleSubDerivation/lastRuleProofStep/unqualifiedMetastatement|qualifiedMetastatement/metastatement!"),
|
|
20
|
-
|
|
20
|
+
metaSubproofLastMetaproofStepMetastatementNodeQuery = nodeQuery("/metaSubproof/metaSubDerivation/lastMetaproofStep/unqualifiedMetastatement|qualifiedMetastatement/metastatement!");
|
|
21
21
|
|
|
22
22
|
export default class Premise {
|
|
23
23
|
constructor(metastatementNode, statementNode) {
|
|
@@ -136,10 +136,10 @@ export default class Premise {
|
|
|
136
136
|
|
|
137
137
|
if (subproofAssertionNode !== null) {
|
|
138
138
|
const metaSubproofMetaSuppositionMetastatementNodes = metaSubproofMetaSuppositionMetastatementNodesQuery(metaSubproofNode),
|
|
139
|
-
|
|
139
|
+
metaSubproofLastMetaproofStepMetastatementNode = metaSubproofLastMetaproofStepMetastatementNodeQuery(metaSubproofNode),
|
|
140
140
|
metaSubproofMetastatementNodes = [
|
|
141
141
|
...metaSubproofMetaSuppositionMetastatementNodes,
|
|
142
|
-
|
|
142
|
+
metaSubproofLastMetaproofStepMetastatementNode
|
|
143
143
|
],
|
|
144
144
|
subproofAssertionMetastatementNodes = subproofAssertionMetastatementNodesQuery(subproofAssertionNode);
|
|
145
145
|
|