occam-verify-cli 0.0.919 → 0.0.921
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/utilities/verify.js +22 -6
- package/lib/verifier/nodes/metaLevel.js +22 -2
- package/lib/verify/metaLemma.js +2 -2
- package/lib/verify/metaSubproof.js +3 -3
- package/lib/verify/metaSupposition.js +2 -2
- package/lib/verify/metaproof.js +4 -4
- package/lib/verify/metastatement.js +5 -1
- package/lib/verify/metastatementAsContainedAssertion.js +109 -0
- package/lib/verify/metastatementAsDefinedAssertion.js +132 -0
- package/lib/verify/metatheorem.js +2 -2
- package/lib/verify/premise.js +2 -2
- package/lib/verify/rule.js +9 -8
- package/lib/verify/statementAsContainedAssertion.js +15 -20
- package/package.json +4 -4
- package/src/utilities/verify.js +20 -4
- package/src/verifier/nodes/metaLevel.js +32 -1
- package/src/verify/metaLemma.js +2 -1
- package/src/verify/metaSubproof.js +3 -3
- package/src/verify/metaSupposition.js +1 -2
- package/src/verify/metaproof.js +5 -6
- package/src/verify/metastatement.js +4 -0
- package/src/verify/metastatementAsContainedAssertion.js +127 -0
- package/src/verify/metastatementAsDefinedAssertion.js +156 -0
- package/src/verify/metatheorem.js +2 -1
- package/src/verify/premise.js +1 -2
- package/src/verify/rule.js +11 -8
- package/src/verify/statementAsContainedAssertion.js +21 -26
- package/lib/verify/ruleDerivation.js +0 -31
- package/lib/verify/ruleProof.js +0 -32
- package/lib/verify/ruleProofStep.js +0 -98
- package/lib/verify/ruleSubDerivation.js +0 -25
- package/lib/verify/ruleSubproof.js +0 -35
- package/src/verify/ruleDerivation.js +0 -23
- package/src/verify/ruleProof.js +0 -31
- package/src/verify/ruleProofStep.js +0 -139
- package/src/verify/ruleSubDerivation.js +0 -22
- package/src/verify/ruleSubproof.js +0 -34
|
@@ -0,0 +1,132 @@
|
|
|
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
|
+
default: function() {
|
|
13
|
+
return verifyMetastatementAsDefinedAssertion;
|
|
14
|
+
},
|
|
15
|
+
isMetastatementDefinedAssertion: function() {
|
|
16
|
+
return isMetastatementDefinedAssertion;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
var _term = /*#__PURE__*/ _interop_require_default(require("./term"));
|
|
20
|
+
var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../verifier/node/metaLevel"));
|
|
21
|
+
var _array = require("../utilities/array");
|
|
22
|
+
var _constants = require("../constants");
|
|
23
|
+
var _query = require("../utilities/query");
|
|
24
|
+
var _verify = require("../utilities/verify");
|
|
25
|
+
function _interop_require_default(obj) {
|
|
26
|
+
return obj && obj.__esModule ? obj : {
|
|
27
|
+
default: obj
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
var termNodeQuery = (0, _query.nodeQuery)("/metastatement/term!"), variableNodeQuery = (0, _query.nodeQuery)("/metastatement/term/variable!"), operatorTerminalNodesQuery = (0, _query.nodesQuery)("/metastatement/@operator");
|
|
31
|
+
function verifyMetastatementAsDefinedAssertion(metastatementNode, assignments, derived, localContext) {
|
|
32
|
+
var metastatementVerifiedAsDefinedAssertion = false;
|
|
33
|
+
var metastatementDefinedAssertion = isMetastatementDefinedAssertion(metastatementNode);
|
|
34
|
+
if (metastatementDefinedAssertion) {
|
|
35
|
+
var metastatementString = localContext.nodeAsString(metastatementNode);
|
|
36
|
+
localContext.trace("Verifying the '".concat(metastatementString, "' metastatement as a defined assertion..."), metastatementNode);
|
|
37
|
+
var definedAssertionFunctions = [
|
|
38
|
+
verifyDerivedMetastatementAsDefinedAssertion,
|
|
39
|
+
verifyStatedMetastatementAsDefinedAssertion
|
|
40
|
+
];
|
|
41
|
+
metastatementVerifiedAsDefinedAssertion = definedAssertionFunctions.some(function(definedAssertionFunction) {
|
|
42
|
+
var metastatementVerifiedAsDefinedAssertion = definedAssertionFunction(metastatementNode, assignments, derived, localContext);
|
|
43
|
+
if (metastatementVerifiedAsDefinedAssertion) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
if (metastatementVerifiedAsDefinedAssertion) {
|
|
48
|
+
localContext.debug("...verified the '".concat(metastatementString, "' metastatement as a defined assertion."), metastatementNode);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return metastatementVerifiedAsDefinedAssertion;
|
|
52
|
+
}
|
|
53
|
+
function verifyDerivedMetastatementAsDefinedAssertion(metastatementNode, assignments, derived, localContext) {
|
|
54
|
+
var derivedMetastatementVerifiedAsDefeindAssertion = false;
|
|
55
|
+
if (derived) {
|
|
56
|
+
var metastatementString = localContext.nodeAsString(metastatementNode);
|
|
57
|
+
localContext.trace("Verifying the derived '".concat(metastatementString, "' metastatement as a defined assertion..."), metastatementNode);
|
|
58
|
+
var metastatementNegated = (0, _verify.isMetastatementNegated)(metastatementNode), variableNode = variableNodeQuery(metastatementNode), termNode = termNodeQuery(metastatementNode);
|
|
59
|
+
if (false) {
|
|
60
|
+
///
|
|
61
|
+
} else if (variableNode !== null) {
|
|
62
|
+
var variable = localContext.findVariableByVariableNode(variableNode);
|
|
63
|
+
if (variable !== null) {
|
|
64
|
+
var variableDefined = localContext.isVariableDefined(variable);
|
|
65
|
+
if (!metastatementNegated) {
|
|
66
|
+
if (variableDefined) {
|
|
67
|
+
derivedMetastatementVerifiedAsDefeindAssertion = true;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (metastatementNegated) {
|
|
71
|
+
if (!variableDefined) {
|
|
72
|
+
derivedMetastatementVerifiedAsDefeindAssertion = true;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
} else if (termNode !== null) {
|
|
77
|
+
var terms = [], termVerified = (0, _term.default)(termNode, terms, localContext, function() {
|
|
78
|
+
var verifiedAhead = true;
|
|
79
|
+
return verifiedAhead;
|
|
80
|
+
});
|
|
81
|
+
if (termVerified) {
|
|
82
|
+
var firstTerm = (0, _array.first)(terms), term = firstTerm, termGrounded = localContext.isTermGrounded(term);
|
|
83
|
+
if (!metastatementNegated) {
|
|
84
|
+
if (termGrounded) {
|
|
85
|
+
derivedMetastatementVerifiedAsDefeindAssertion = true;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (metastatementNegated) {
|
|
89
|
+
if (!termGrounded) {
|
|
90
|
+
derivedMetastatementVerifiedAsDefeindAssertion = true;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
if (derivedMetastatementVerifiedAsDefeindAssertion) {
|
|
96
|
+
localContext.debug("...verified the derived '".concat(metastatementString, "' metastatement as a defined assertion."), metastatementNode);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
return derivedMetastatementVerifiedAsDefeindAssertion;
|
|
100
|
+
}
|
|
101
|
+
function verifyStatedMetastatementAsDefinedAssertion(metastatementNode, assignments, derived, localContext) {
|
|
102
|
+
var statedMetastatementVerifiedAsDefinedAssertion = false;
|
|
103
|
+
if (!derived) {
|
|
104
|
+
var metastatementString = localContext.nodeAsString(metastatementNode);
|
|
105
|
+
localContext.trace("Verifying the stated '".concat(metastatementString, "' metastatement as a defined assertion..."), metastatementNode);
|
|
106
|
+
var intrinsicLevel = localContext.isIntrinsicLevel();
|
|
107
|
+
if (intrinsicLevel) {
|
|
108
|
+
localContext.debug("The stated '".concat(metastatementString, "' metastatement as a defined assertion cannot be verified at intrinsic level."), metastatementNode);
|
|
109
|
+
} else {
|
|
110
|
+
var nonTerminalNode = metastatementNode, nonTerminalNodeVerified = _metaLevel.default.verifyNonTerminalNode(nonTerminalNode, localContext, function() {
|
|
111
|
+
var verifiedAhead = true;
|
|
112
|
+
return verifiedAhead;
|
|
113
|
+
});
|
|
114
|
+
statedMetastatementVerifiedAsDefinedAssertion = nonTerminalNodeVerified; ///
|
|
115
|
+
}
|
|
116
|
+
if (statedMetastatementVerifiedAsDefinedAssertion) {
|
|
117
|
+
localContext.debug("...verified the stated '".concat(metastatementString, "' metastatement as a defined assertion."), metastatementNode);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
return statedMetastatementVerifiedAsDefinedAssertion;
|
|
121
|
+
}
|
|
122
|
+
function isMetastatementDefinedAssertion(metastatementNode) {
|
|
123
|
+
var operatorTerminalNodes = operatorTerminalNodesQuery(metastatementNode), metastatementDefinedAssertion = operatorTerminalNodes.some(function(operatorTerminalNode) {
|
|
124
|
+
var content = operatorTerminalNode.getContent(), contentDefined = content === _constants.DEFINED;
|
|
125
|
+
if (contentDefined) {
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
return metastatementDefinedAssertion;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metastatementAsDefinedAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport verifyTerm from \"./term\";\nimport metaLevelNodeVerifier from \"../verifier/node/metaLevel\";\n\nimport { first } from \"../utilities/array\";\nimport { DEFINED } from \"../constants\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\nimport { isMetastatementNegated } from \"../utilities/verify\";\n\nconst termNodeQuery = nodeQuery(\"/metastatement/term!\"),\n      variableNodeQuery = nodeQuery(\"/metastatement/term/variable!\"),\n      operatorTerminalNodesQuery = nodesQuery(\"/metastatement/@operator\");\n\nexport default function verifyMetastatementAsDefinedAssertion(metastatementNode, assignments, derived, localContext) {\n  let metastatementVerifiedAsDefinedAssertion = false;\n\n  const metastatementDefinedAssertion = isMetastatementDefinedAssertion(metastatementNode);\n\n  if (metastatementDefinedAssertion) {\n    const metastatementString = localContext.nodeAsString(metastatementNode);\n\n    localContext.trace(`Verifying the '${metastatementString}' metastatement as a defined assertion...`, metastatementNode);\n\n    const definedAssertionFunctions = [\n      verifyDerivedMetastatementAsDefinedAssertion,\n      verifyStatedMetastatementAsDefinedAssertion\n    ];\n\n    metastatementVerifiedAsDefinedAssertion = definedAssertionFunctions.some((definedAssertionFunction) => {\n      const metastatementVerifiedAsDefinedAssertion = definedAssertionFunction(metastatementNode, assignments, derived, localContext);\n\n      if (metastatementVerifiedAsDefinedAssertion) {\n        return true;\n      }\n    });\n\n    if (metastatementVerifiedAsDefinedAssertion) {\n      localContext.debug(`...verified the '${metastatementString}' metastatement as a defined assertion.`, metastatementNode);\n    }\n  }\n\n  return metastatementVerifiedAsDefinedAssertion;\n}\n\nfunction verifyDerivedMetastatementAsDefinedAssertion(metastatementNode, assignments, derived, localContext) {\n  let derivedMetastatementVerifiedAsDefeindAssertion = false;\n\n  if (derived) {\n    const metastatementString = localContext.nodeAsString(metastatementNode);\n\n    localContext.trace(`Verifying the derived '${metastatementString}' metastatement as a defined assertion...`, metastatementNode);\n\n    const metastatementNegated = isMetastatementNegated(metastatementNode),\n          variableNode = variableNodeQuery(metastatementNode),\n          termNode = termNodeQuery(metastatementNode);\n\n    if (false) {\n      ///\n    } else if (variableNode !== null) {\n      const variable = localContext.findVariableByVariableNode(variableNode);\n\n      if (variable !== null) {\n        const variableDefined = localContext.isVariableDefined(variable);\n\n        if (!metastatementNegated) {\n          if (variableDefined) {\n            derivedMetastatementVerifiedAsDefeindAssertion = true;\n          }\n        }\n\n        if (metastatementNegated) {\n          if (!variableDefined) {\n            derivedMetastatementVerifiedAsDefeindAssertion = true;\n          }\n        }\n      }\n    } else if (termNode !== null) {\n      const terms = [],\n            termVerified = verifyTerm(termNode, terms, localContext, () => {\n              const verifiedAhead = true;\n\n              return verifiedAhead;\n            });\n\n      if (termVerified) {\n        const firstTerm = first(terms),\n              term = firstTerm, ///\n              termGrounded = localContext.isTermGrounded(term);\n\n        if (!metastatementNegated) {\n          if (termGrounded) {\n            derivedMetastatementVerifiedAsDefeindAssertion = true;\n          }\n        }\n\n        if (metastatementNegated) {\n          if (!termGrounded) {\n            derivedMetastatementVerifiedAsDefeindAssertion = true;\n          }\n        }\n      }\n    }\n\n    if (derivedMetastatementVerifiedAsDefeindAssertion) {\n      localContext.debug(`...verified the derived '${metastatementString}' metastatement as a defined assertion.`, metastatementNode);\n    }\n  }\n\n  return derivedMetastatementVerifiedAsDefeindAssertion;\n}\n\nfunction verifyStatedMetastatementAsDefinedAssertion(metastatementNode, assignments, derived, localContext) {\n  let statedMetastatementVerifiedAsDefinedAssertion = false;\n\n  if (!derived) {\n    const metastatementString = localContext.nodeAsString(metastatementNode);\n\n    localContext.trace(`Verifying the stated '${metastatementString}' metastatement as a defined assertion...`, metastatementNode);\n\n    const intrinsicLevel = localContext.isIntrinsicLevel();\n\n    if (intrinsicLevel) {\n      localContext.debug(`The stated '${metastatementString}' metastatement as a defined assertion cannot be verified at intrinsic level.`, metastatementNode);\n    } else {\n      const nonTerminalNode = metastatementNode, ///\n            nonTerminalNodeVerified = metaLevelNodeVerifier.verifyNonTerminalNode(nonTerminalNode, localContext, () => {\n              const verifiedAhead = true;\n\n              return verifiedAhead;\n            });\n\n      statedMetastatementVerifiedAsDefinedAssertion = nonTerminalNodeVerified; ///\n    }\n\n    if (statedMetastatementVerifiedAsDefinedAssertion) {\n      localContext.debug(`...verified the stated '${metastatementString}' metastatement as a defined assertion.`, metastatementNode);\n    }\n  }\n\n  return statedMetastatementVerifiedAsDefinedAssertion;\n}\n\nexport function isMetastatementDefinedAssertion(metastatementNode) {\n  const operatorTerminalNodes = operatorTerminalNodesQuery(metastatementNode),\n        metastatementDefinedAssertion = operatorTerminalNodes.some((operatorTerminalNode) => {\n          const content = operatorTerminalNode.getContent(),\n                contentDefined = (content === DEFINED);\n\n          if (contentDefined) {\n            return true;\n          }\n        });\n\n  return metastatementDefinedAssertion;\n}\n"],"names":["verifyMetastatementAsDefinedAssertion","isMetastatementDefinedAssertion","termNodeQuery","nodeQuery","variableNodeQuery","operatorTerminalNodesQuery","nodesQuery","metastatementNode","assignments","derived","localContext","metastatementVerifiedAsDefinedAssertion","metastatementDefinedAssertion","metastatementString","nodeAsString","trace","definedAssertionFunctions","verifyDerivedMetastatementAsDefinedAssertion","verifyStatedMetastatementAsDefinedAssertion","some","definedAssertionFunction","debug","derivedMetastatementVerifiedAsDefeindAssertion","metastatementNegated","isMetastatementNegated","variableNode","termNode","variable","findVariableByVariableNode","variableDefined","isVariableDefined","terms","termVerified","verifyTerm","verifiedAhead","firstTerm","first","term","termGrounded","isTermGrounded","statedMetastatementVerifiedAsDefinedAssertion","intrinsicLevel","isIntrinsicLevel","nonTerminalNode","nonTerminalNodeVerified","metaLevelNodeVerifier","verifyNonTerminalNode","operatorTerminalNodes","operatorTerminalNode","content","getContent","contentDefined","DEFINED"],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ function verifyMetatheorem(metatheoremNode, fileContext) {
|
|
|
32
32
|
if (metaSuppositionsVerified) {
|
|
33
33
|
var metaConsequents = [], metaConsequentNode = metaConsequentNodeQuery(metatheoremNode), metaConsequentVerified = (0, _metaConsequent.default)(metaConsequentNode, metaConsequents, substitutions, localContext);
|
|
34
34
|
if (metaConsequentVerified) {
|
|
35
|
-
var metaproofNode = metaproofNodeQuery(metatheoremNode), firstMetaConsequent = (0, _array.first)(metaConsequents), metaConsequent = firstMetaConsequent, metaproofVerified = (0, _metaproof.default)(metaproofNode,
|
|
35
|
+
var metaproofNode = metaproofNodeQuery(metatheoremNode), firstMetaConsequent = (0, _array.first)(metaConsequents), metaConsequent = firstMetaConsequent, metastatementNode = metaConsequent.getMetastatementNode(), metaproofVerified = (0, _metaproof.default)(metaproofNode, metastatementNode, substitutions, localContext);
|
|
36
36
|
if (metaproofVerified) {
|
|
37
37
|
var metatheorem = _metatheorem.default.fromLabelsMetaSuppositionsMetaConsequentSubstitutionsAndFileContext(labels, metaSuppositions, metaConsequent, substitutions, fileContext);
|
|
38
38
|
fileContext.addMetatheorem(metatheorem);
|
|
@@ -47,4 +47,4 @@ function verifyMetatheorem(metatheoremNode, fileContext) {
|
|
|
47
47
|
return metatheoremVerified;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YXRoZW9yZW0uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBNZXRhdGhlb3JlbSBmcm9tIFwiLi4vbWV0YXRoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCB2ZXJpZnlNZXRhcHJvb2YgZnJvbSBcIi4uL3ZlcmlmeS9tZXRhcHJvb2ZcIjtcbmltcG9ydCB2ZXJpZnlNZXRhQ29uc2VxdWVudCBmcm9tIFwiLi4vdmVyaWZ5L21ldGFDb25zZXF1ZW50XCI7XG5pbXBvcnQgTWV0YUxldmVsTG9jYWxDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsL21ldGFMZXZlbFwiO1xuaW1wb3J0IHZlcmlmeU1ldGFTdXBwb3NpdGlvbnMgZnJvbSBcIi4uL3ZlcmlmeS9tZXRhU3VwcG9zaXRpb25zXCI7XG5cbmltcG9ydCB7IGZpcnN0IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBsYWJlbE5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL21ldGF0aGVvcmVtL2xhYmVsXCIpLFxuICAgICAgbWV0YXByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGF0aGVvcmVtL21ldGFwcm9vZiFcIiksXG4gICAgICBtZXRhQ29uc2VxdWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9tZXRhdGhlb3JlbS9tZXRhQ29uc2VxdWVudCFcIiksXG4gICAgICBtZXRhU3VwcG9zaXRpb25zTm9kZVF1ZXJ5ID0gbm9kZXNRdWVyeShcIi9tZXRhdGhlb3JlbS9tZXRhU3VwcG9zaXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeU1ldGF0aGVvcmVtKG1ldGF0aGVvcmVtTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IG1ldGF0aGVvcmVtVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBsYWJlbE5vZGVzID0gbGFiZWxOb2Rlc1F1ZXJ5KG1ldGF0aGVvcmVtTm9kZSksXG4gICAgICAgIGxhYmVsc1N0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVzQXNTdHJpbmcobGFiZWxOb2Rlcyk7XG5cbiAgZmlsZUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bGFiZWxzU3RyaW5nfScgbWV0YXRoZW9yZW0uLi5gLCBtZXRhdGhlb3JlbU5vZGUpO1xuXG4gIGNvbnN0IGxhYmVscyA9IFtdLFxuICAgICAgICBsYWJlbHNWZXJpZmllZCA9IHZlcmlmeUxhYmVscyhsYWJlbE5vZGVzLCBsYWJlbHMsIGZpbGVDb250ZXh0KTtcblxuICBpZiAobGFiZWxzVmVyaWZpZWQpIHtcbiAgICBjb25zdCBtZXRhTGV2ZWxMb2NhbENvbnRleHQgPSBNZXRhTGV2ZWxMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgICBsb2NhbENvbnRleHQgPSBtZXRhTGV2ZWxMb2NhbENvbnRleHQsIC8vL1xuICAgICAgICAgIHN1YnN0aXR1dGlvbnMgPSBbXSxcbiAgICAgICAgICBtZXRhU3VwcG9zaXRpb25zID0gW10sXG4gICAgICAgICAgbWV0YVN1cHBvc2l0aW9uTm9kZXMgPSBtZXRhU3VwcG9zaXRpb25zTm9kZVF1ZXJ5KG1ldGF0aGVvcmVtTm9kZSksXG4gICAgICAgICAgbWV0YVN1cHBvc2l0aW9uc1ZlcmlmaWVkID0gdmVyaWZ5TWV0YVN1cHBvc2l0aW9ucyhtZXRhU3VwcG9zaXRpb25Ob2RlcywgbWV0YVN1cHBvc2l0aW9ucywgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KTtcblxuICAgIGlmIChtZXRhU3VwcG9zaXRpb25zVmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IG1ldGFDb25zZXF1ZW50cyA9IFtdLFxuICAgICAgICAgICAgbWV0YUNvbnNlcXVlbnROb2RlID0gbWV0YUNvbnNlcXVlbnROb2RlUXVlcnkobWV0YXRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICAgIG1ldGFDb25zZXF1ZW50VmVyaWZpZWQgPSB2ZXJpZnlNZXRhQ29uc2VxdWVudChtZXRhQ29uc2VxdWVudE5vZGUsIG1ldGFDb25zZXF1ZW50cywgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KTtcblxuICAgICAgaWYgKG1ldGFDb25zZXF1ZW50VmVyaWZpZWQpIHtcbiAgICAgICAgY29uc3QgbWV0YXByb29mTm9kZSA9IG1ldGFwcm9vZk5vZGVRdWVyeShtZXRhdGhlb3JlbU5vZGUpLFxuICAgICAgICAgICAgICBmaXJzdE1ldGFDb25zZXF1ZW50ID0gZmlyc3QobWV0YUNvbnNlcXVlbnRzKSxcbiAgICAgICAgICAgICAgbWV0YUNvbnNlcXVlbnQgPSBmaXJzdE1ldGFDb25zZXF1ZW50LCAvLy9cbiAgICAgICAgICAgICAgbWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhQ29uc2VxdWVudC5nZXRNZXRhc3RhdGVtZW50Tm9kZSgpLFxuICAgICAgICAgICAgICBtZXRhcHJvb2ZWZXJpZmllZCA9IHZlcmlmeU1ldGFwcm9vZihtZXRhcHJvb2ZOb2RlLCBtZXRhc3RhdGVtZW50Tm9kZSwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICBpZiAobWV0YXByb29mVmVyaWZpZWQpIHtcbiAgICAgICAgICBjb25zdCBtZXRhdGhlb3JlbSA9IE1ldGF0aGVvcmVtLmZyb21MYWJlbHNNZXRhU3VwcG9zaXRpb25zTWV0YUNvbnNlcXVlbnRTdWJzdGl0dXRpb25zQW5kRmlsZUNvbnRleHQobGFiZWxzLCBtZXRhU3VwcG9zaXRpb25zLCBtZXRhQ29uc2VxdWVudCwgc3Vic3RpdHV0aW9ucywgZmlsZUNvbnRleHQpO1xuXG4gICAgICAgICAgZmlsZUNvbnRleHQuYWRkTWV0YXRoZW9yZW0obWV0YXRoZW9yZW0pO1xuXG4gICAgICAgICAgbWV0YXRoZW9yZW1WZXJpZmllZCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICBpZiAobWV0YXRoZW9yZW1WZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7bGFiZWxzU3RyaW5nfScgbWV0YXRoZW9yZW0uYCwgbWV0YXRoZW9yZW1Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiBtZXRhdGhlb3JlbVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeU1ldGF0aGVvcmVtIiwibGFiZWxOb2Rlc1F1ZXJ5Iiwibm9kZXNRdWVyeSIsIm1ldGFwcm9vZk5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsIm1ldGFDb25zZXF1ZW50Tm9kZVF1ZXJ5IiwibWV0YVN1cHBvc2l0aW9uc05vZGVRdWVyeSIsIm1ldGF0aGVvcmVtTm9kZSIsImZpbGVDb250ZXh0IiwibWV0YXRoZW9yZW1WZXJpZmllZCIsImxhYmVsTm9kZXMiLCJsYWJlbHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwidHJhY2UiLCJsYWJlbHMiLCJsYWJlbHNWZXJpZmllZCIsInZlcmlmeUxhYmVscyIsIm1ldGFMZXZlbExvY2FsQ29udGV4dCIsIk1ldGFMZXZlbExvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsImxvY2FsQ29udGV4dCIsInN1YnN0aXR1dGlvbnMiLCJtZXRhU3VwcG9zaXRpb25zIiwibWV0YVN1cHBvc2l0aW9uTm9kZXMiLCJtZXRhU3VwcG9zaXRpb25zVmVyaWZpZWQiLCJ2ZXJpZnlNZXRhU3VwcG9zaXRpb25zIiwibWV0YUNvbnNlcXVlbnRzIiwibWV0YUNvbnNlcXVlbnROb2RlIiwibWV0YUNvbnNlcXVlbnRWZXJpZmllZCIsInZlcmlmeU1ldGFDb25zZXF1ZW50IiwibWV0YXByb29mTm9kZSIsImZpcnN0TWV0YUNvbnNlcXVlbnQiLCJmaXJzdCIsIm1ldGFDb25zZXF1ZW50IiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFwcm9vZlZlcmlmaWVkIiwidmVyaWZ5TWV0YXByb29mIiwibWV0YXRoZW9yZW0iLCJNZXRhdGhlb3JlbSIsImZyb21MYWJlbHNNZXRhU3VwcG9zaXRpb25zTWV0YUNvbnNlcXVlbnRTdWJzdGl0dXRpb25zQW5kRmlsZUNvbnRleHQiLCJhZGRNZXRhdGhlb3JlbSIsImRlYnVnIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFpQkE7OztlQUF3QkE7OztrRUFmQTs2REFDQztnRUFDRztxRUFDSztnRUFDQzt1RUFDQztxQkFFYjtxQkFDZ0I7Ozs7OztBQUV0QyxJQUFNQyxrQkFBa0JDLElBQUFBLGlCQUFVLEVBQUMsdUJBQzdCQyxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUMsNEJBQy9CQywwQkFBMEJELElBQUFBLGdCQUFTLEVBQUMsaUNBQ3BDRSw0QkFBNEJKLElBQUFBLGlCQUFVLEVBQUM7QUFFOUIsU0FBU0Ysa0JBQWtCTyxlQUFlLEVBQUVDLFdBQVc7SUFDcEUsSUFBSUMsc0JBQXNCO0lBRTFCLElBQU1DLGFBQWFULGdCQUFnQk0sa0JBQzdCSSxlQUFlSCxZQUFZSSxhQUFhLENBQUNGO0lBRS9DRixZQUFZSyxLQUFLLENBQUMsQUFBQyxrQkFBOEIsT0FBYkYsY0FBYSxxQkFBbUJKO0lBRXBFLElBQU1PLFNBQVMsRUFBRSxFQUNYQyxpQkFBaUJDLElBQUFBLGVBQVksRUFBQ04sWUFBWUksUUFBUU47SUFFeEQsSUFBSU8sZ0JBQWdCO1FBQ2xCLElBQU1FLHdCQUF3QkMsa0JBQXFCLENBQUNDLGVBQWUsQ0FBQ1gsY0FDOURZLGVBQWVILHVCQUNmSSxnQkFBZ0IsRUFBRSxFQUNsQkMsbUJBQW1CLEVBQUUsRUFDckJDLHVCQUF1QmpCLDBCQUEwQkMsa0JBQ2pEaUIsMkJBQTJCQyxJQUFBQSx5QkFBc0IsRUFBQ0Ysc0JBQXNCRCxrQkFBa0JELGVBQWVEO1FBRS9HLElBQUlJLDBCQUEwQjtZQUM1QixJQUFNRSxrQkFBa0IsRUFBRSxFQUNwQkMscUJBQXFCdEIsd0JBQXdCRSxrQkFDN0NxQix5QkFBeUJDLElBQUFBLHVCQUFvQixFQUFDRixvQkFBb0JELGlCQUFpQkwsZUFBZUQ7WUFFeEcsSUFBSVEsd0JBQXdCO2dCQUMxQixJQUFNRSxnQkFBZ0IzQixtQkFBbUJJLGtCQUNuQ3dCLHNCQUFzQkMsSUFBQUEsWUFBSyxFQUFDTixrQkFDNUJPLGlCQUFpQkYscUJBQ2pCRyxvQkFBb0JELGVBQWVFLG9CQUFvQixJQUN2REMsb0JBQW9CQyxJQUFBQSxrQkFBZSxFQUFDUCxlQUFlSSxtQkFBbUJiLGVBQWVEO2dCQUUzRixJQUFJZ0IsbUJBQW1CO29CQUNyQixJQUFNRSxjQUFjQyxvQkFBVyxDQUFDQyxtRUFBbUUsQ0FBQzFCLFFBQVFRLGtCQUFrQlcsZ0JBQWdCWixlQUFlYjtvQkFFN0pBLFlBQVlpQyxjQUFjLENBQUNIO29CQUUzQjdCLHNCQUFzQjtnQkFDeEI7WUFDRjtRQUNGO0lBQ0Y7SUFFQSxJQUFJQSxxQkFBcUI7UUFDdkJELFlBQVlrQyxLQUFLLENBQUMsQUFBQyxvQkFBZ0MsT0FBYi9CLGNBQWEsbUJBQWlCSjtJQUN0RTtJQUVBLE9BQU9FO0FBQ1QifQ==
|
package/lib/verify/premise.js
CHANGED
|
@@ -35,7 +35,7 @@ function verifyPremise(premiseNode, premises, localContext) {
|
|
|
35
35
|
if (unqualifiedMetastatementNode !== null) {
|
|
36
36
|
var derived1 = false, assignments1 = [], unqualifiedMetastatementVerified = (0, _unqualified1.default)(unqualifiedMetastatementNode, assignments1, derived1, localContext);
|
|
37
37
|
if (unqualifiedMetastatementVerified) {
|
|
38
|
-
var
|
|
38
|
+
var assignmentAssigned1 = (0, _assignments.assignAssignment)(assignments1, localContext);
|
|
39
39
|
premiseVerified = assignmentAssigned1; ///
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -58,4 +58,4 @@ function verifyPremise(premiseNode, premises, localContext) {
|
|
|
58
58
|
return premiseVerified;
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcHJlbWlzZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFByZW1pc2UgZnJvbSBcIi4uL3ByZW1pc2VcIjtcbmltcG9ydCBNZXRhcHJvb2ZTdGVwIGZyb20gXCIuLi9zdGVwL21ldGFwcm9vZlwiO1xuaW1wb3J0IHZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50IGZyb20gXCIuLi92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkXCI7XG5pbXBvcnQgdmVyaWZ5VW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50IGZyb20gXCIuLi92ZXJpZnkvbWV0YXN0YXRlbWVudC91bnF1YWxpZmllZFwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBhc3NpZ25Bc3NpZ25tZW50IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hc3NpZ25tZW50c1wiO1xuXG5jb25zdCBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKSxcbiAgICAgIG1ldGFzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50L21ldGFzdGF0ZW1lbnQhXCIpLFxuICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcHJlbWlzZS91bnF1YWxpZmllZFN0YXRlbWVudCFcIiksXG4gICAgICB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcHJlbWlzZS91bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlQcmVtaXNlKHByZW1pc2VOb2RlLCBwcmVtaXNlcywgbG9jYWxDb250ZXh0KSB7XG4gIGxldCBwcmVtaXNlVmVyaWZpZWQ7XG5cbiAgY29uc3QgcHJlbWlzZVN0cmluZyA9IGxvY2FsQ29udGV4dC5ub2RlQXNTdHJpbmcocHJlbWlzZU5vZGUpO1xuXG4gIGxvY2FsQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHtwcmVtaXNlU3RyaW5nfScgcHJlbWlzZS4uLmAsIHByZW1pc2VOb2RlKTtcblxuICBjb25zdCB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgPSB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeShwcmVtaXNlTm9kZSksXG4gICAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUgPSB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlUXVlcnkocHJlbWlzZU5vZGUpO1xuXG4gIGlmICh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBkZXJpdmVkID0gZmFsc2UsXG4gICAgICAgICAgYXNzaWdubWVudHMgPSBbXSxcbiAgICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlLCBhc3NpZ25tZW50cywgZGVyaXZlZCwgbG9jYWxDb250ZXh0KTtcblxuICAgIGlmICh1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgICBjb25zdCBhc3NpZ25tZW50QXNzaWduZWQgPSBhc3NpZ25Bc3NpZ25tZW50KGFzc2lnbm1lbnRzLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICBwcmVtaXNlVmVyaWZpZWQgPSBhc3NpZ25tZW50QXNzaWduZWQ7IC8vL1xuICAgIH1cbiAgfVxuXG4gIGlmICh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgZGVyaXZlZCA9IGZhbHNlLFxuICAgICAgICAgIGFzc2lnbm1lbnRzID0gW10sXG4gICAgICAgICAgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlVbnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSwgYXNzaWdubWVudHMsIGRlcml2ZWQsIGxvY2FsQ29udGV4dCk7XG5cbiAgICBpZiAodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IGFzc2lnbm1lbnRBc3NpZ25lZCA9IGFzc2lnbkFzc2lnbm1lbnQoYXNzaWdubWVudHMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgIHByZW1pc2VWZXJpZmllZCA9IGFzc2lnbm1lbnRBc3NpZ25lZDsgLy8vXG4gICAgfVxuICB9XG5cbiAgaWYgKHByZW1pc2VWZXJpZmllZCkge1xuICAgIGxldCBwcmVtaXNlLFxuICAgICAgICBtZXRhcHJvb2ZTdGVwO1xuXG4gICAgaWYgKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSAhPT0gbnVsbCkge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gICAgICBtZXRhcHJvb2ZTdGVwID0gTWV0YXByb29mU3RlcC5mcm9tTWV0YXN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgIHByZW1pc2UgPSBQcmVtaXNlLmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpO1xuICAgIH1cblxuICAgIGlmICh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBtZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlUXVlcnkodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgIG1ldGFwcm9vZlN0ZXAgPSBNZXRhcHJvb2ZTdGVwLmZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgIHByZW1pc2UgPSBQcmVtaXNlLmZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSk7XG4gICAgfVxuXG4gICAgcHJlbWlzZXMucHVzaChwcmVtaXNlKTtcblxuICAgIGxvY2FsQ29udGV4dC5hZGRNZXRhcHJvb2ZTdGVwKG1ldGFwcm9vZlN0ZXApO1xuXG4gICAgbG9jYWxDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7cHJlbWlzZVN0cmluZ30nIHByZW1pc2UuYCwgcHJlbWlzZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHByZW1pc2VWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlQcmVtaXNlIiwic3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwibWV0YXN0YXRlbWVudE5vZGVRdWVyeSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5IiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5IiwicHJlbWlzZU5vZGUiLCJwcmVtaXNlcyIsImxvY2FsQ29udGV4dCIsInByZW1pc2VWZXJpZmllZCIsInByZW1pc2VTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUiLCJkZXJpdmVkIiwiYXNzaWdubWVudHMiLCJ1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkIiwidmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQiLCJhc3NpZ25tZW50QXNzaWduZWQiLCJhc3NpZ25Bc3NpZ25tZW50IiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlVbnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQiLCJwcmVtaXNlIiwibWV0YXByb29mU3RlcCIsInN0YXRlbWVudE5vZGUiLCJNZXRhcHJvb2ZTdGVwIiwiZnJvbU1ldGFzdGF0ZW1lbnROb2RlIiwiUHJlbWlzZSIsImZyb21TdGF0ZW1lbnROb2RlIiwibWV0YXN0YXRlbWVudE5vZGUiLCJwdXNoIiwiYWRkTWV0YXByb29mU3RlcCIsImRlYnVnIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFlQTs7O2VBQXdCQTs7OzhEQWJKO2dFQUNNO2tFQUNhO21FQUNJO3FCQUVqQjsyQkFDTzs7Ozs7O0FBRWpDLElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQyxxQ0FDL0JDLHlCQUF5QkQsSUFBQUEsZ0JBQVMsRUFBQyw2Q0FDbkNFLGdDQUFnQ0YsSUFBQUEsZ0JBQVMsRUFBQyxtQ0FDMUNHLG9DQUFvQ0gsSUFBQUEsZ0JBQVMsRUFBQztBQUVyQyxTQUFTRixjQUFjTSxXQUFXLEVBQUVDLFFBQVEsRUFBRUMsWUFBWTtJQUN2RSxJQUFJQztJQUVKLElBQU1DLGdCQUFnQkYsYUFBYUcsWUFBWSxDQUFDTDtJQUVoREUsYUFBYUksS0FBSyxDQUFDLEFBQUMsa0JBQStCLE9BQWRGLGVBQWMsaUJBQWVKO0lBRWxFLElBQU1PLDJCQUEyQlQsOEJBQThCRSxjQUN6RFEsK0JBQStCVCxrQ0FBa0NDO0lBRXZFLElBQUlPLDZCQUE2QixNQUFNO1FBQ3JDLElBQU1FLFVBQVUsT0FDVkMsY0FBYyxFQUFFLEVBQ2hCQywrQkFBK0JDLElBQUFBLG9CQUEwQixFQUFDTCwwQkFBMEJHLGFBQWFELFNBQVNQO1FBRWhILElBQUlTLDhCQUE4QjtZQUNoQyxJQUFNRSxxQkFBcUJDLElBQUFBLDZCQUFnQixFQUFDSixhQUFhUjtZQUV6REMsa0JBQWtCVSxvQkFBb0IsR0FBRztRQUMzQztJQUNGO0lBRUEsSUFBSUwsaUNBQWlDLE1BQU07UUFDekMsSUFBTUMsV0FBVSxPQUNWQyxlQUFjLEVBQUUsRUFDaEJLLG1DQUFtQ0MsSUFBQUEscUJBQThCLEVBQUNSLDhCQUE4QkUsY0FBYUQsVUFBU1A7UUFFNUgsSUFBSWEsa0NBQWtDO1lBQ3BDLElBQU1GLHNCQUFxQkMsSUFBQUEsNkJBQWdCLEVBQUNKLGNBQWFSO1lBRXpEQyxrQkFBa0JVLHFCQUFvQixHQUFHO1FBQzNDO0lBQ0Y7SUFFQSxJQUFJVixpQkFBaUI7UUFDbkIsSUFBSWMsU0FDQUM7UUFFSixJQUFJWCw2QkFBNkIsTUFBTTtZQUNyQyxJQUFNWSxnQkFBZ0J4QixtQkFBbUJZO1lBRXpDVyxnQkFBZ0JFLGtCQUFhLENBQUNDLHFCQUFxQixDQUFDRjtZQUVwREYsVUFBVUssZ0JBQU8sQ0FBQ0MsaUJBQWlCLENBQUNKO1FBQ3RDO1FBRUEsSUFBSVgsaUNBQWlDLE1BQU07WUFDekMsSUFBTWdCLG9CQUFvQjNCLHVCQUF1Qlc7WUFFakRVLGdCQUFnQkUsa0JBQWEsQ0FBQ0MscUJBQXFCLENBQUNHO1lBRXBEUCxVQUFVSyxnQkFBTyxDQUFDRCxxQkFBcUIsQ0FBQ0c7UUFDMUM7UUFFQXZCLFNBQVN3QixJQUFJLENBQUNSO1FBRWRmLGFBQWF3QixnQkFBZ0IsQ0FBQ1I7UUFFOUJoQixhQUFheUIsS0FBSyxDQUFDLEFBQUMsb0JBQWlDLE9BQWR2QixlQUFjLGVBQWFKO0lBQ3BFO0lBRUEsT0FBT0c7QUFDVCJ9
|
package/lib/verify/rule.js
CHANGED
|
@@ -11,7 +11,7 @@ Object.defineProperty(exports, "default", {
|
|
|
11
11
|
var _rule = /*#__PURE__*/ _interop_require_default(require("../rule"));
|
|
12
12
|
var _labels = /*#__PURE__*/ _interop_require_default(require("../verify/labels"));
|
|
13
13
|
var _premises = /*#__PURE__*/ _interop_require_default(require("../verify/premises"));
|
|
14
|
-
var
|
|
14
|
+
var _metaproof = /*#__PURE__*/ _interop_require_default(require("../verify/metaproof"));
|
|
15
15
|
var _conclusion = /*#__PURE__*/ _interop_require_default(require("../verify/conclusion"));
|
|
16
16
|
var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../context/local/metaLevel"));
|
|
17
17
|
var _array = require("../utilities/array");
|
|
@@ -21,7 +21,7 @@ function _interop_require_default(obj) {
|
|
|
21
21
|
default: obj
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
|
-
var labelNodesQuery = (0, _query.nodesQuery)("/rule/label"), premisesNodeQuery = (0, _query.nodesQuery)("/rule/premise"),
|
|
24
|
+
var labelNodesQuery = (0, _query.nodesQuery)("/rule/label"), premisesNodeQuery = (0, _query.nodesQuery)("/rule/premise"), metaproofNodeQuery = (0, _query.nodeQuery)("/rule/metaproof!"), conclusionNodeQuery = (0, _query.nodeQuery)("/rule/conclusion!");
|
|
25
25
|
function verifyRule(ruleNode, fileContext) {
|
|
26
26
|
var ruleVerified = false;
|
|
27
27
|
var labelNodes = labelNodesQuery(ruleNode), labelsString = fileContext.nodesAsString(labelNodes);
|
|
@@ -32,12 +32,13 @@ function verifyRule(ruleNode, fileContext) {
|
|
|
32
32
|
if (premisesVerified) {
|
|
33
33
|
var conclusions = [], conclusionNode = conclusionNodeQuery(ruleNode), conclusionVerified = (0, _conclusion.default)(conclusionNode, conclusions, localContext);
|
|
34
34
|
if (conclusionVerified) {
|
|
35
|
-
var
|
|
36
|
-
var
|
|
37
|
-
if (
|
|
38
|
-
|
|
35
|
+
var metaproofVerified = true; ///
|
|
36
|
+
var firstConclusion = (0, _array.first)(conclusions), metaproofNode = metaproofNodeQuery(ruleNode), conclusion = firstConclusion; ///
|
|
37
|
+
if (metaproofNode !== null) {
|
|
38
|
+
var substitutions = [], metastatementNode = conclusion.getMetastatementNode();
|
|
39
|
+
metaproofVerified = (0, _metaproof.default)(metaproofNode, metastatementNode, substitutions, localContext);
|
|
39
40
|
}
|
|
40
|
-
if (
|
|
41
|
+
if (metaproofVerified) {
|
|
41
42
|
var rule = _rule.default.fromLabelsPremisesConclusionAndFileContext(labels, premises, conclusion, fileContext);
|
|
42
43
|
fileContext.addRule(rule);
|
|
43
44
|
ruleVerified = true;
|
|
@@ -51,4 +52,4 @@ function verifyRule(ruleNode, fileContext) {
|
|
|
51
52
|
return ruleVerified;
|
|
52
53
|
}
|
|
53
54
|
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcnVsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFJ1bGUgZnJvbSBcIi4uL3J1bGVcIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCB2ZXJpZnlQcmVtaXNlcyBmcm9tIFwiLi4vdmVyaWZ5L3ByZW1pc2VzXCI7XG5pbXBvcnQgdmVyaWZ5TWV0YXByb29mIGZyb20gXCIuLi92ZXJpZnkvbWV0YXByb29mXCI7XG5pbXBvcnQgdmVyaWZ5Q29uY2x1c2lvbiBmcm9tIFwiLi4vdmVyaWZ5L2NvbmNsdXNpb25cIjtcbmltcG9ydCBNZXRhTGV2ZWxMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWwvbWV0YUxldmVsXCI7XG5cbmltcG9ydCB7IGZpcnN0IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBsYWJlbE5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL3J1bGUvbGFiZWxcIiksXG4gICAgICBwcmVtaXNlc05vZGVRdWVyeSA9IG5vZGVzUXVlcnkoXCIvcnVsZS9wcmVtaXNlXCIpLFxuICAgICAgbWV0YXByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3J1bGUvbWV0YXByb29mIVwiKSxcbiAgICAgIGNvbmNsdXNpb25Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcnVsZS9jb25jbHVzaW9uIVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5UnVsZShydWxlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHJ1bGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IGxhYmVsTm9kZXMgPSBsYWJlbE5vZGVzUXVlcnkocnVsZU5vZGUpLFxuICAgICAgICBsYWJlbHNTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2Rlc0FzU3RyaW5nKGxhYmVsTm9kZXMpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke2xhYmVsc1N0cmluZ30nIHJ1bGUuLi5gLCBydWxlTm9kZSk7XG5cbiAgY29uc3QgbGFiZWxzID0gW10sXG4gICAgICAgIGxhYmVsc1ZlcmlmaWVkID0gdmVyaWZ5TGFiZWxzKGxhYmVsTm9kZXMsIGxhYmVscywgZmlsZUNvbnRleHQpO1xuXG4gIGlmIChsYWJlbHNWZXJpZmllZCkge1xuICAgIGNvbnN0IG1ldGFMZXZlbExvY2FsQ29udGV4dCA9IE1ldGFMZXZlbExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHByZW1pc2VzID0gW10sXG4gICAgICAgICAgbG9jYWxDb250ZXh0ID0gbWV0YUxldmVsTG9jYWxDb250ZXh0LCAvLy9cbiAgICAgICAgICBwcmVtaXNlTm9kZXMgPSBwcmVtaXNlc05vZGVRdWVyeShydWxlTm9kZSksXG4gICAgICAgICAgcHJlbWlzZXNWZXJpZmllZCA9IHZlcmlmeVByZW1pc2VzKHByZW1pc2VOb2RlcywgcHJlbWlzZXMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICBpZiAocHJlbWlzZXNWZXJpZmllZCkge1xuICAgICAgY29uc3QgY29uY2x1c2lvbnMgPSBbXSxcbiAgICAgICAgICAgIGNvbmNsdXNpb25Ob2RlID0gY29uY2x1c2lvbk5vZGVRdWVyeShydWxlTm9kZSksXG4gICAgICAgICAgICBjb25jbHVzaW9uVmVyaWZpZWQgPSB2ZXJpZnlDb25jbHVzaW9uKGNvbmNsdXNpb25Ob2RlLCBjb25jbHVzaW9ucywgbG9jYWxDb250ZXh0KTtcblxuICAgICAgaWYgKGNvbmNsdXNpb25WZXJpZmllZCkge1xuICAgICAgICBsZXQgbWV0YXByb29mVmVyaWZpZWQgPSB0cnVlOyAvLy9cblxuICAgICAgICBjb25zdCBmaXJzdENvbmNsdXNpb24gPSBmaXJzdChjb25jbHVzaW9ucyksXG4gICAgICAgICAgICAgIG1ldGFwcm9vZk5vZGUgPSBtZXRhcHJvb2ZOb2RlUXVlcnkocnVsZU5vZGUpLFxuICAgICAgICAgICAgICBjb25jbHVzaW9uID0gZmlyc3RDb25jbHVzaW9uOyAvLy9cblxuICAgICAgICBpZiAobWV0YXByb29mTm9kZSAhPT0gbnVsbCkge1xuICAgICAgICAgIGNvbnN0IHN1YnN0aXR1dGlvbnMgPSBbXSxcbiAgICAgICAgICAgICAgICBtZXRhc3RhdGVtZW50Tm9kZSA9IGNvbmNsdXNpb24uZ2V0TWV0YXN0YXRlbWVudE5vZGUoKTtcblxuICAgICAgICAgIG1ldGFwcm9vZlZlcmlmaWVkID0gdmVyaWZ5TWV0YXByb29mKG1ldGFwcm9vZk5vZGUsIG1ldGFzdGF0ZW1lbnROb2RlLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHQpO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKG1ldGFwcm9vZlZlcmlmaWVkKSB7XG4gICAgICAgICAgY29uc3QgcnVsZSA9IFJ1bGUuZnJvbUxhYmVsc1ByZW1pc2VzQ29uY2x1c2lvbkFuZEZpbGVDb250ZXh0KGxhYmVscywgcHJlbWlzZXMsIGNvbmNsdXNpb24sIGZpbGVDb250ZXh0KTtcblxuICAgICAgICAgIGZpbGVDb250ZXh0LmFkZFJ1bGUocnVsZSk7XG5cbiAgICAgICAgICBydWxlVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHJ1bGVWZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7bGFiZWxzU3RyaW5nfScgcnVsZS5gLCBydWxlTm9kZSk7XG4gIH1cblxuICByZXR1cm4gcnVsZVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVJ1bGUiLCJsYWJlbE5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5IiwicHJlbWlzZXNOb2RlUXVlcnkiLCJtZXRhcHJvb2ZOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJjb25jbHVzaW9uTm9kZVF1ZXJ5IiwicnVsZU5vZGUiLCJmaWxlQ29udGV4dCIsInJ1bGVWZXJpZmllZCIsImxhYmVsTm9kZXMiLCJsYWJlbHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwidHJhY2UiLCJsYWJlbHMiLCJsYWJlbHNWZXJpZmllZCIsInZlcmlmeUxhYmVscyIsIm1ldGFMZXZlbExvY2FsQ29udGV4dCIsIk1ldGFMZXZlbExvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInByZW1pc2VzIiwibG9jYWxDb250ZXh0IiwicHJlbWlzZU5vZGVzIiwicHJlbWlzZXNWZXJpZmllZCIsInZlcmlmeVByZW1pc2VzIiwiY29uY2x1c2lvbnMiLCJjb25jbHVzaW9uTm9kZSIsImNvbmNsdXNpb25WZXJpZmllZCIsInZlcmlmeUNvbmNsdXNpb24iLCJtZXRhcHJvb2ZWZXJpZmllZCIsImZpcnN0Q29uY2x1c2lvbiIsImZpcnN0IiwibWV0YXByb29mTm9kZSIsImNvbmNsdXNpb24iLCJzdWJzdGl0dXRpb25zIiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsInZlcmlmeU1ldGFwcm9vZiIsInJ1bGUiLCJSdWxlIiwiZnJvbUxhYmVsc1ByZW1pc2VzQ29uY2x1c2lvbkFuZEZpbGVDb250ZXh0IiwiYWRkUnVsZSIsImRlYnVnIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFpQkE7OztlQUF3QkE7OzsyREFmUDs2REFDUTsrREFDRTtnRUFDQztpRUFDQztnRUFDSztxQkFFWjtxQkFDZ0I7Ozs7OztBQUV0QyxJQUFNQyxrQkFBa0JDLElBQUFBLGlCQUFVLEVBQUMsZ0JBQzdCQyxvQkFBb0JELElBQUFBLGlCQUFVLEVBQUMsa0JBQy9CRSxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUMscUJBQy9CQyxzQkFBc0JELElBQUFBLGdCQUFTLEVBQUM7QUFFdkIsU0FBU0wsV0FBV08sUUFBUSxFQUFFQyxXQUFXO0lBQ3RELElBQUlDLGVBQWU7SUFFbkIsSUFBTUMsYUFBYVQsZ0JBQWdCTSxXQUM3QkksZUFBZUgsWUFBWUksYUFBYSxDQUFDRjtJQUUvQ0YsWUFBWUssS0FBSyxDQUFDLEFBQUMsa0JBQThCLE9BQWJGLGNBQWEsY0FBWUo7SUFFN0QsSUFBTU8sU0FBUyxFQUFFLEVBQ1hDLGlCQUFpQkMsSUFBQUEsZUFBWSxFQUFDTixZQUFZSSxRQUFRTjtJQUV4RCxJQUFJTyxnQkFBZ0I7UUFDbEIsSUFBTUUsd0JBQXdCQyxrQkFBcUIsQ0FBQ0MsZUFBZSxDQUFDWCxjQUM5RFksV0FBVyxFQUFFLEVBQ2JDLGVBQWVKLHVCQUNmSyxlQUFlbkIsa0JBQWtCSSxXQUNqQ2dCLG1CQUFtQkMsSUFBQUEsaUJBQWMsRUFBQ0YsY0FBY0YsVUFBVUM7UUFFaEUsSUFBSUUsa0JBQWtCO1lBQ3BCLElBQU1FLGNBQWMsRUFBRSxFQUNoQkMsaUJBQWlCcEIsb0JBQW9CQyxXQUNyQ29CLHFCQUFxQkMsSUFBQUEsbUJBQWdCLEVBQUNGLGdCQUFnQkQsYUFBYUo7WUFFekUsSUFBSU0sb0JBQW9CO2dCQUN0QixJQUFJRSxvQkFBb0IsTUFBTSxHQUFHO2dCQUVqQyxJQUFNQyxrQkFBa0JDLElBQUFBLFlBQUssRUFBQ04sY0FDeEJPLGdCQUFnQjVCLG1CQUFtQkcsV0FDbkMwQixhQUFhSCxpQkFBaUIsR0FBRztnQkFFdkMsSUFBSUUsa0JBQWtCLE1BQU07b0JBQzFCLElBQU1FLGdCQUFnQixFQUFFLEVBQ2xCQyxvQkFBb0JGLFdBQVdHLG9CQUFvQjtvQkFFekRQLG9CQUFvQlEsSUFBQUEsa0JBQWUsRUFBQ0wsZUFBZUcsbUJBQW1CRCxlQUFlYjtnQkFDdkY7Z0JBRUEsSUFBSVEsbUJBQW1CO29CQUNyQixJQUFNUyxPQUFPQyxhQUFJLENBQUNDLDBDQUEwQyxDQUFDMUIsUUFBUU0sVUFBVWEsWUFBWXpCO29CQUUzRkEsWUFBWWlDLE9BQU8sQ0FBQ0g7b0JBRXBCN0IsZUFBZTtnQkFDakI7WUFDRjtRQUNGO0lBQ0Y7SUFFQSxJQUFJQSxjQUFjO1FBQ2hCRCxZQUFZa0MsS0FBSyxDQUFDLEFBQUMsb0JBQWdDLE9BQWIvQixjQUFhLFlBQVVKO0lBQy9EO0lBRUEsT0FBT0U7QUFDVCJ9
|
|
@@ -25,7 +25,7 @@ function _interop_require_default(obj) {
|
|
|
25
25
|
default: obj
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
-
var
|
|
28
|
+
var termNodeQuery = (0, _query.nodeQuery)("/statement/term!"), statementTermNodesQuery = (0, _query.nodesQuery)("/statement/metaArgument/statement//term"), operatorTerminalNodesQuery = (0, _query.nodesQuery)("/statement/@operator");
|
|
29
29
|
function verifyStatementAsContainedAssertion(statementNode, assignments, derived, localContext) {
|
|
30
30
|
var statementVerifiedAsContainedAssertion;
|
|
31
31
|
var statementContainedAssertion = isStatementContainedAssertion(statementNode);
|
|
@@ -53,25 +53,20 @@ function verifyStatementAsDerivedContainedAssertion(statementNode, assignments,
|
|
|
53
53
|
if (derived) {
|
|
54
54
|
var statementString = localContext.nodeAsString(statementNode);
|
|
55
55
|
localContext.trace("Verifying the derived '".concat(statementString, "' statement as a contained assertion..."), statementNode);
|
|
56
|
-
var statementNegated = (0, _verify.isStatementNegated)(statementNode),
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
var statementVariableNodes = statementVariableNodesQuery(statementNode), variableNodeMatchesMetaArgumentVariableNode = statementVariableNodes.some(function(statementVariableNode) {
|
|
61
|
-
var variableNodeMatchesMetaArgumentVariableNode = variableNode.match(statementVariableNode);
|
|
62
|
-
if (variableNodeMatchesMetaArgumentVariableNode) {
|
|
63
|
-
return true;
|
|
64
|
-
}
|
|
65
|
-
});
|
|
66
|
-
if (!negated) {
|
|
67
|
-
if (variableNodeMatchesMetaArgumentVariableNode) {
|
|
68
|
-
statementVerifiedAsDefinedContainedAssertion = true;
|
|
69
|
-
}
|
|
56
|
+
var statementNegated = (0, _verify.isStatementNegated)(statementNode), termNode = termNodeQuery(statementNode), negated = statementNegated, statementTermNodes = statementTermNodesQuery(statementNode), termNodeMatchesMetaArgumentVariableNode = statementTermNodes.some(function(statementTermNode) {
|
|
57
|
+
var termNodeMatchesMetaArgumentVariableNode = termNode.match(statementTermNode);
|
|
58
|
+
if (termNodeMatchesMetaArgumentVariableNode) {
|
|
59
|
+
return true;
|
|
70
60
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
61
|
+
});
|
|
62
|
+
if (!negated) {
|
|
63
|
+
if (termNodeMatchesMetaArgumentVariableNode) {
|
|
64
|
+
statementVerifiedAsDefinedContainedAssertion = true;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
if (negated) {
|
|
68
|
+
if (!termNodeMatchesMetaArgumentVariableNode) {
|
|
69
|
+
statementVerifiedAsDefinedContainedAssertion = true;
|
|
75
70
|
}
|
|
76
71
|
}
|
|
77
72
|
if (statementVerifiedAsDefinedContainedAssertion) {
|
|
@@ -111,4 +106,4 @@ function isStatementContainedAssertion(statementNode) {
|
|
|
111
106
|
return statementContainedAssertion;
|
|
112
107
|
}
|
|
113
108
|
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementAsContainedAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport metaLevelNodeVerifier from \"../verifier/node/metaLevel\";\n\nimport { CONTAINED } from \"../constants\";\nimport { isStatementNegated } from \"../utilities/verify\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\n\nconst variableNodeQuery = nodeQuery(\"/statement/term/variable!\"),\n      operatorTerminalNodesQuery = nodesQuery(\"/statement/@operator\"),\n      statementVariableNodesQuery = nodesQuery(\"/statement/metaArgument/statement//variable\");\n\nexport default function verifyStatementAsContainedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsContainedAssertion;\n\n  const statementContainedAssertion = isStatementContainedAssertion(statementNode);\n\n  if (statementContainedAssertion) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a contained assertion...`, statementNode);\n\n    const statementFunctions = [\n      verifyStatementAsDerivedContainedAssertion,\n      verifyStatementAsStatedContainedAssertion\n    ];\n\n    statementVerifiedAsContainedAssertion = statementFunctions.some((statementFunction) => {\n      const statementVerifiedAsContainedAssertion = statementFunction(statementNode, assignments, derived, localContext);\n\n      if (statementVerifiedAsContainedAssertion) {\n        return true;\n      }\n    });\n\n    if (statementVerifiedAsContainedAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a contained assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsContainedAssertion;\n}\n\nfunction verifyStatementAsDerivedContainedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsDefinedContainedAssertion = false;\n\n  if (derived) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the derived '${statementString}' statement as a contained assertion...`, statementNode);\n\n    const statementNegated = isStatementNegated(statementNode),\n          variableNode = variableNodeQuery(statementNode),\n          negated = statementNegated;  ///\n\n    if (false) {\n      ///\n    } else if (variableNode !== null) {\n      const statementVariableNodes = statementVariableNodesQuery(statementNode),\n            variableNodeMatchesMetaArgumentVariableNode = statementVariableNodes.some((statementVariableNode) => {\n              const variableNodeMatchesMetaArgumentVariableNode = variableNode.match(statementVariableNode);\n\n              if (variableNodeMatchesMetaArgumentVariableNode) {\n                return true;\n              }\n            });\n\n      if (!negated) {\n        if (variableNodeMatchesMetaArgumentVariableNode) {\n          statementVerifiedAsDefinedContainedAssertion = true;\n        }\n      }\n\n      if (negated) {\n        if (!variableNodeMatchesMetaArgumentVariableNode) {\n          statementVerifiedAsDefinedContainedAssertion = true;\n        }\n      }\n    }\n\n    if (statementVerifiedAsDefinedContainedAssertion) {\n      localContext.debug(`...verified the derived '${statementString}' statement as a contained assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsDefinedContainedAssertion;\n}\n\nfunction verifyStatementAsStatedContainedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsStatedContainedAssertion = false;\n\n  if (!derived) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the stated '${statementString}' statement as a contained assertion...`, statementNode);\n\n    const intrinsicLevel = localContext.isIntrinsicLevel();\n\n    if (intrinsicLevel) {\n      localContext.debug(`The stated '${statementString}' statement as a contained assertion cannot be verified at intrinsic level.`, statementNode);\n    } else {\n      const nonTerminalNode = statementNode, ///\n            nonTerminalNodeVerified = metaLevelNodeVerifier.verifyNonTerminalNode(nonTerminalNode, localContext, () => {\n              const verifiedAhead = true;\n\n              return verifiedAhead;\n            });\n\n      statementVerifiedAsStatedContainedAssertion = nonTerminalNodeVerified; ///\n    }\n\n    if (statementVerifiedAsStatedContainedAssertion) {\n      localContext.debug(`...verified the stated '${statementString}' statement as a contained assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsStatedContainedAssertion;\n}\n\nexport function isStatementContainedAssertion(statementNode) {\n  const operatorTerminalNodes = operatorTerminalNodesQuery(statementNode),\n        statementContainedAssertion = operatorTerminalNodes.some((operatorTerminalNode) => {\n          const content = operatorTerminalNode.getContent(),\n                contentContained = (content === CONTAINED);\n\n          if (contentContained) {\n            return true;\n          }\n        });\n\n  return statementContainedAssertion;\n}\n"],"names":["verifyStatementAsContainedAssertion","isStatementContainedAssertion","variableNodeQuery","nodeQuery","operatorTerminalNodesQuery","nodesQuery","statementVariableNodesQuery","statementNode","assignments","derived","localContext","statementVerifiedAsContainedAssertion","statementContainedAssertion","statementString","nodeAsString","trace","statementFunctions","verifyStatementAsDerivedContainedAssertion","verifyStatementAsStatedContainedAssertion","some","statementFunction","debug","statementVerifiedAsDefinedContainedAssertion","statementNegated","isStatementNegated","variableNode","negated","statementVariableNodes","variableNodeMatchesMetaArgumentVariableNode","statementVariableNode","match","statementVerifiedAsStatedContainedAssertion","intrinsicLevel","isIntrinsicLevel","nonTerminalNode","nonTerminalNodeVerified","metaLevelNodeVerifier","verifyNonTerminalNode","verifiedAhead","operatorTerminalNodes","operatorTerminalNode","content","getContent","contentContained","CONTAINED"],"mappings":"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"}
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementAsContainedAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport metaLevelNodeVerifier from \"../verifier/node/metaLevel\";\n\nimport { CONTAINED } from \"../constants\";\nimport { isStatementNegated } from \"../utilities/verify\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/statement/term!\"),\n      statementTermNodesQuery = nodesQuery(\"/statement/metaArgument/statement//term\"),\n      operatorTerminalNodesQuery = nodesQuery(\"/statement/@operator\");\n\nexport default function verifyStatementAsContainedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsContainedAssertion;\n\n  const statementContainedAssertion = isStatementContainedAssertion(statementNode);\n\n  if (statementContainedAssertion) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a contained assertion...`, statementNode);\n\n    const statementFunctions = [\n      verifyStatementAsDerivedContainedAssertion,\n      verifyStatementAsStatedContainedAssertion\n    ];\n\n    statementVerifiedAsContainedAssertion = statementFunctions.some((statementFunction) => {\n      const statementVerifiedAsContainedAssertion = statementFunction(statementNode, assignments, derived, localContext);\n\n      if (statementVerifiedAsContainedAssertion) {\n        return true;\n      }\n    });\n\n    if (statementVerifiedAsContainedAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a contained assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsContainedAssertion;\n}\n\nfunction verifyStatementAsDerivedContainedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsDefinedContainedAssertion = false;\n\n  if (derived) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the derived '${statementString}' statement as a contained assertion...`, statementNode);\n\n    const statementNegated = isStatementNegated(statementNode),\n          termNode = termNodeQuery(statementNode),\n          negated = statementNegated, ///\n          statementTermNodes = statementTermNodesQuery(statementNode),\n          termNodeMatchesMetaArgumentVariableNode = statementTermNodes.some((statementTermNode) => {\n            const termNodeMatchesMetaArgumentVariableNode = termNode.match(statementTermNode);\n\n            if (termNodeMatchesMetaArgumentVariableNode) {\n              return true;\n            }\n          });\n\n    if (!negated) {\n      if (termNodeMatchesMetaArgumentVariableNode) {\n        statementVerifiedAsDefinedContainedAssertion = true;\n      }\n    }\n\n    if (negated) {\n      if (!termNodeMatchesMetaArgumentVariableNode) {\n        statementVerifiedAsDefinedContainedAssertion = true;\n      }\n    }\n\n    if (statementVerifiedAsDefinedContainedAssertion) {\n      localContext.debug(`...verified the derived '${statementString}' statement as a contained assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsDefinedContainedAssertion;\n}\n\nfunction verifyStatementAsStatedContainedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsStatedContainedAssertion = false;\n\n  if (!derived) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the stated '${statementString}' statement as a contained assertion...`, statementNode);\n\n    const intrinsicLevel = localContext.isIntrinsicLevel();\n\n    if (intrinsicLevel) {\n      localContext.debug(`The stated '${statementString}' statement as a contained assertion cannot be verified at intrinsic level.`, statementNode);\n    } else {\n      const nonTerminalNode = statementNode, ///\n            nonTerminalNodeVerified = metaLevelNodeVerifier.verifyNonTerminalNode(nonTerminalNode, localContext, () => {\n              const verifiedAhead = true;\n\n              return verifiedAhead;\n            });\n\n      statementVerifiedAsStatedContainedAssertion = nonTerminalNodeVerified; ///\n    }\n\n    if (statementVerifiedAsStatedContainedAssertion) {\n      localContext.debug(`...verified the stated '${statementString}' statement as a contained assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsStatedContainedAssertion;\n}\n\nexport function isStatementContainedAssertion(statementNode) {\n  const operatorTerminalNodes = operatorTerminalNodesQuery(statementNode),\n        statementContainedAssertion = operatorTerminalNodes.some((operatorTerminalNode) => {\n          const content = operatorTerminalNode.getContent(),\n                contentContained = (content === CONTAINED);\n\n          if (contentContained) {\n            return true;\n          }\n        });\n\n  return statementContainedAssertion;\n}\n"],"names":["verifyStatementAsContainedAssertion","isStatementContainedAssertion","termNodeQuery","nodeQuery","statementTermNodesQuery","nodesQuery","operatorTerminalNodesQuery","statementNode","assignments","derived","localContext","statementVerifiedAsContainedAssertion","statementContainedAssertion","statementString","nodeAsString","trace","statementFunctions","verifyStatementAsDerivedContainedAssertion","verifyStatementAsStatedContainedAssertion","some","statementFunction","debug","statementVerifiedAsDefinedContainedAssertion","statementNegated","isStatementNegated","termNode","negated","statementTermNodes","termNodeMatchesMetaArgumentVariableNode","statementTermNode","match","statementVerifiedAsStatedContainedAssertion","intrinsicLevel","isIntrinsicLevel","nonTerminalNode","nonTerminalNodeVerified","metaLevelNodeVerifier","verifyNonTerminalNode","verifiedAhead","operatorTerminalNodes","operatorTerminalNode","content","getContent","contentContained","CONTAINED"],"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.921",
|
|
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.823",
|
|
16
|
+
"occam-entities": "^1.0.148",
|
|
17
|
+
"occam-file-system": "^6.0.189",
|
|
18
18
|
"occam-grammar-utilities": "^8.0.207",
|
|
19
19
|
"occam-query": "^3.1.174"
|
|
20
20
|
},
|
package/src/utilities/verify.js
CHANGED
|
@@ -3,12 +3,28 @@
|
|
|
3
3
|
import { NOT } from "../constants";
|
|
4
4
|
import { nodeQuery } from "../utilities/query";
|
|
5
5
|
|
|
6
|
-
const secondOperatorTerminalNodeQuery = nodeQuery("
|
|
6
|
+
const secondOperatorTerminalNodeQuery = nodeQuery("/*/@operator[1]");
|
|
7
7
|
|
|
8
8
|
export function isStatementNegated(statementNode) {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
statementNegated =
|
|
9
|
+
const node = statementNode, ///
|
|
10
|
+
negated = isNegated(node),
|
|
11
|
+
statementNegated = negated; ///
|
|
12
|
+
|
|
13
|
+
return statementNegated;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export function isMetastatementNegated(metastatementNode) {
|
|
17
|
+
const node = metastatementNode, ///
|
|
18
|
+
negated = isNegated(node),
|
|
19
|
+
statementNegated = negated; ///
|
|
12
20
|
|
|
13
21
|
return statementNegated;
|
|
14
22
|
}
|
|
23
|
+
|
|
24
|
+
function isNegated(node) {
|
|
25
|
+
const secondOperatorTerminalNode = secondOperatorTerminalNodeQuery(node),
|
|
26
|
+
content = secondOperatorTerminalNode.getContent(),
|
|
27
|
+
negated = (content === NOT);
|
|
28
|
+
|
|
29
|
+
return negated;
|
|
30
|
+
}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import NodesVerifier from "../../verifier/nodes";
|
|
4
|
+
import verifyVariableAgainstTerm from "../../verify/variableAgainstTerm";
|
|
4
5
|
import verifyMetavariableAgainstMetastatement from "../../verify/metavariableAgainstMetastatement";
|
|
5
6
|
|
|
6
7
|
import { nodeQuery } from "../../utilities/query";
|
|
7
8
|
import { verifyNodes } from "../../utilities/verifier";
|
|
8
9
|
|
|
9
|
-
const
|
|
10
|
+
const termNodeQuery = nodeQuery("/term!"),
|
|
11
|
+
nonTerminalNodeQuery = nodeQuery("/*"),
|
|
12
|
+
termVariableNodeQuery = nodeQuery("/term/variable!"),
|
|
10
13
|
metastatementNodeQuery = nodeQuery("/metastatement!"),
|
|
11
14
|
metastatementMetavariableNodeQuery = nodeQuery("/metastatement/metavariable!");
|
|
12
15
|
|
|
@@ -32,6 +35,23 @@ class MetaLevelNodesVerifier extends NodesVerifier {
|
|
|
32
35
|
return nonTerminalNodeVerified;
|
|
33
36
|
}
|
|
34
37
|
},
|
|
38
|
+
{
|
|
39
|
+
nodeQueryA: termVariableNodeQuery,
|
|
40
|
+
nodeQueryB: termNodeQuery,
|
|
41
|
+
verifyNodes: (nodeA, nodeB, substitutions, localContextA, localContextB, verifyAhead) => {
|
|
42
|
+
let nonTerminalNodeVerified;
|
|
43
|
+
|
|
44
|
+
const termNodeB = nodeB, ///
|
|
45
|
+
termVariableNodeA = nodeA, ///
|
|
46
|
+
termVariableNodeVerifiedAgainstTermNode =
|
|
47
|
+
|
|
48
|
+
this.verifyTermVariableNodeAgainstTermNode(termVariableNodeA, termNodeB, substitutions, localContextA, localContextB, verifyAhead);
|
|
49
|
+
|
|
50
|
+
nonTerminalNodeVerified = termVariableNodeVerifiedAgainstTermNode; ///
|
|
51
|
+
|
|
52
|
+
return nonTerminalNodeVerified;
|
|
53
|
+
}
|
|
54
|
+
},
|
|
35
55
|
{
|
|
36
56
|
nodeQueryA: nonTerminalNodeQuery,
|
|
37
57
|
nodeQueryB: nonTerminalNodeQuery,
|
|
@@ -68,6 +88,17 @@ class MetaLevelNodesVerifier extends NodesVerifier {
|
|
|
68
88
|
|
|
69
89
|
return metastatementMetavariableNodeVerifiedAgainstMetastatementNode;
|
|
70
90
|
}
|
|
91
|
+
|
|
92
|
+
verifyTermVariableNodeAgainstTermNode(termVariableNodeA, termNodeB, substitutions, localContextA, localContextB, verifyAhead) {
|
|
93
|
+
let termVariableNodeVerifiedAgainstTermNode;
|
|
94
|
+
|
|
95
|
+
const variableNodeA = termVariableNodeA, ///
|
|
96
|
+
termVerifiedAgainstVariable = verifyVariableAgainstTerm(variableNodeA, termNodeB, substitutions, localContextA, localContextB, verifyAhead);
|
|
97
|
+
|
|
98
|
+
termVariableNodeVerifiedAgainstTermNode = termVerifiedAgainstVariable; ///
|
|
99
|
+
|
|
100
|
+
return termVariableNodeVerifiedAgainstTermNode;
|
|
101
|
+
}
|
|
71
102
|
}
|
|
72
103
|
|
|
73
104
|
const metaLevelNodesVerifier = new MetaLevelNodesVerifier();
|
package/src/verify/metaLemma.js
CHANGED
|
@@ -46,7 +46,8 @@ export default function verifyMetaLemma(metaLemmaNode, fileContext) {
|
|
|
46
46
|
const metaproofNode = metaproofNodeQuery(metaLemmaNode),
|
|
47
47
|
firstMetaConsequent = first(metaConsequents),
|
|
48
48
|
metaConsequent = firstMetaConsequent, ///
|
|
49
|
-
|
|
49
|
+
metastatementNode = metaConsequent.getMetastatementNode(),
|
|
50
|
+
metaproofVerified = verifyMetaproof(metaproofNode, metastatementNode, substitutions, localContext);
|
|
50
51
|
|
|
51
52
|
if (metaproofVerified) {
|
|
52
53
|
const metaLemma = MetaLemma.fromLabelsMetaSuppositionsMetaConsequentSubstitutionsAndFileContext(labels, metaSuppositions, metaConsequent, substitutions, fileContext);
|
|
@@ -6,7 +6,7 @@ import verifyMetaSubDerivation from "../verify/metaSubDerivation";
|
|
|
6
6
|
|
|
7
7
|
import { nodeQuery, nodesQuery } from "../utilities/query";
|
|
8
8
|
|
|
9
|
-
const
|
|
9
|
+
const metaSuppositionNodesQuery = nodesQuery("/metaSubproof/metaSupposition"),
|
|
10
10
|
metaSubDerivationNodeQuery = nodeQuery("/metaSubproof/metaSubDerivation");
|
|
11
11
|
|
|
12
12
|
export default function verifyMetaSubproof(metaSubproofNode, substitutions, localContext) {
|
|
@@ -17,8 +17,8 @@ export default function verifyMetaSubproof(metaSubproofNode, substitutions, loca
|
|
|
17
17
|
localContext = metaLevelLocalContext; ///
|
|
18
18
|
|
|
19
19
|
const metaSuppositions = [],
|
|
20
|
-
|
|
21
|
-
metaSuppositionsVerified = verifyMetaSuppositions(
|
|
20
|
+
metaSuppositionNodes = metaSuppositionNodesQuery(metaSubproofNode),
|
|
21
|
+
metaSuppositionsVerified = verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions, substitutions, localContext);
|
|
22
22
|
|
|
23
23
|
if (metaSuppositionsVerified) {
|
|
24
24
|
const metaSubDerivationNode = metaSubDerivationNodeQuery(metaSubproofNode),
|
|
@@ -41,8 +41,7 @@ export default function verifyMetaSupposition(metaSuppositionNode, metaSuppositi
|
|
|
41
41
|
unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localContext);
|
|
42
42
|
|
|
43
43
|
if (unqualifiedMetastatementVerified) {
|
|
44
|
-
const
|
|
45
|
-
assignmentAssigned = assignAssignment(assignments, localContext);
|
|
44
|
+
const assignmentAssigned = assignAssignment(assignments, localContext);
|
|
46
45
|
|
|
47
46
|
metaSuppositionVerified = assignmentAssigned; ///
|
|
48
47
|
}
|
package/src/verify/metaproof.js
CHANGED
|
@@ -7,7 +7,7 @@ import { nodeQuery } from "../utilities/query";
|
|
|
7
7
|
|
|
8
8
|
const metaDerivationNodeQuery = nodeQuery("/metaproof/metaDerivation!");
|
|
9
9
|
|
|
10
|
-
export default function verifyMetaproof(metaproofNode,
|
|
10
|
+
export default function verifyMetaproof(metaproofNode, metastatementNode, substitutions, localContext) {
|
|
11
11
|
let metaproofVerified = false;
|
|
12
12
|
|
|
13
13
|
const metaLevelLocalContext = MetaLevelLocalContext.fromLocalContext(localContext);
|
|
@@ -19,12 +19,11 @@ export default function verifyMetaproof(metaproofNode, conclusion, substitutions
|
|
|
19
19
|
|
|
20
20
|
if (metaDerivationVerified) {
|
|
21
21
|
const lastMetaproofStep = localContext.getLastMetaproofStep(),
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
metastatementNodeMatchesConclusionMetastatementNode = metastatementNode.match(conclusionMetastatementNode);
|
|
22
|
+
lastMetaproofStepMetastatementNode = lastMetaproofStep.getMetastatementNode(),
|
|
23
|
+
lastMetastatementNode = lastMetaproofStepMetastatementNode, ///
|
|
24
|
+
lastMetastatementNodeMatchesMetastatementNode = lastMetastatementNode.match(metastatementNode);
|
|
26
25
|
|
|
27
|
-
metaproofVerified =
|
|
26
|
+
metaproofVerified = lastMetastatementNodeMatchesMetastatementNode; ///
|
|
28
27
|
}
|
|
29
28
|
|
|
30
29
|
return metaproofVerified;
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import verifyJudgement from "../verify/judgement";
|
|
4
4
|
import metaLevelNodeVerifier from "../verifier/node/metaLevel";
|
|
5
|
+
import verifyMetastatementAsDefinedAssertion from "./metastatementAsDefinedAssertion";
|
|
6
|
+
import verifyMetastatementAsContainedAssertion from "./metastatementAsContainedAssertion";
|
|
5
7
|
|
|
6
8
|
import { nodeQuery } from "../utilities/query";
|
|
7
9
|
|
|
@@ -16,6 +18,8 @@ function verifyMetastatement(metastatementNode, assignments, derived, localConte
|
|
|
16
18
|
|
|
17
19
|
const verifyMetaStatementFunctions = [
|
|
18
20
|
verifyMetastatementAsJudgement,
|
|
21
|
+
verifyMetastatementAsDefinedAssertion,
|
|
22
|
+
verifyMetastatementAsContainedAssertion,
|
|
19
23
|
verifyMetastatementAsIs
|
|
20
24
|
];
|
|
21
25
|
|