occam-verify-cli 0.0.906 → 0.0.907
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/conclusion.js +7 -7
- package/lib/context/local.js +8 -26
- package/lib/context/localMeta.js +91 -72
- package/lib/metaConsequent.js +7 -7
- package/lib/metaSupposition.js +7 -7
- package/lib/metavariable.js +2 -3
- package/lib/premise.js +7 -7
- package/lib/utilities/assignments.js +3 -3
- package/lib/verifier/node/metastatement.js +3 -4
- package/lib/verify/metaProofStep.js +3 -3
- package/lib/verify/metaSupposition.js +2 -2
- package/lib/verify/metavariableAgainstStatement.js +3 -3
- package/lib/verify/premise.js +26 -8
- package/lib/verify/ruleProofStep.js +6 -8
- package/package.json +1 -1
- package/src/conclusion.js +4 -4
- package/src/context/local.js +8 -14
- package/src/context/localMeta.js +23 -55
- package/src/metaConsequent.js +4 -4
- package/src/metaSupposition.js +4 -4
- package/src/metavariable.js +1 -2
- package/src/premise.js +10 -10
- package/src/utilities/assignments.js +2 -2
- package/src/verifier/node/metastatement.js +2 -3
- package/src/verify/metaProofStep.js +4 -2
- package/src/verify/metaSupposition.js +2 -1
- package/src/verify/metavariableAgainstStatement.js +4 -4
- package/src/verify/premise.js +39 -6
- package/src/verify/ruleProofStep.js +5 -5
package/src/verify/premise.js
CHANGED
|
@@ -2,12 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
import Premise from "../premise";
|
|
4
4
|
import MetaproofStep from "../step/metaproof";
|
|
5
|
+
import verifyUnqualifiedStatement from "../verify/statement/unqualified";
|
|
5
6
|
import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified";
|
|
6
7
|
|
|
7
8
|
import { nodeQuery } from "../utilities/query";
|
|
8
9
|
import { assignAssignment } from "../utilities/assignments";
|
|
9
10
|
|
|
10
|
-
const
|
|
11
|
+
const statementNodeQuery = nodeQuery("/unqualifiedMetastatement/statement!"),
|
|
12
|
+
metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement!"),
|
|
13
|
+
unqualifiedStatementNodeQuery = nodeQuery("/premise/unqualifiedStatement!"),
|
|
11
14
|
unqualifiedMetastatementNodeQuery = nodeQuery("/premise/unqualifiedMetastatement!");
|
|
12
15
|
|
|
13
16
|
export default function verifyPremise(premiseNode, premises, localMetaContext) {
|
|
@@ -17,7 +20,21 @@ export default function verifyPremise(premiseNode, premises, localMetaContext) {
|
|
|
17
20
|
|
|
18
21
|
localMetaContext.trace(`Verifying the '${premiseString}' premise...`, premiseNode);
|
|
19
22
|
|
|
20
|
-
const
|
|
23
|
+
const unqualifiedStatementNode = unqualifiedStatementNodeQuery(premiseNode),
|
|
24
|
+
unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(premiseNode);
|
|
25
|
+
|
|
26
|
+
if (unqualifiedStatementNode !== null) {
|
|
27
|
+
const derived = false,
|
|
28
|
+
assignments = [],
|
|
29
|
+
localContext = localMetaContext, ///
|
|
30
|
+
unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, assignments, derived, localContext);
|
|
31
|
+
|
|
32
|
+
if (unqualifiedStatementVerified) {
|
|
33
|
+
const assignmentAssigned = assignAssignment(assignments, localContext);
|
|
34
|
+
|
|
35
|
+
premiseVerified = assignmentAssigned; ///
|
|
36
|
+
}
|
|
37
|
+
}
|
|
21
38
|
|
|
22
39
|
if (unqualifiedMetastatementNode !== null) {
|
|
23
40
|
const derived = false,
|
|
@@ -25,16 +42,32 @@ export default function verifyPremise(premiseNode, premises, localMetaContext) {
|
|
|
25
42
|
unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localMetaContext);
|
|
26
43
|
|
|
27
44
|
if (unqualifiedMetastatementVerified) {
|
|
28
|
-
const
|
|
45
|
+
const localContext = localMetaContext, ///
|
|
46
|
+
assignmentAssigned = assignAssignment(assignments, localContext);
|
|
29
47
|
|
|
30
48
|
premiseVerified = assignmentAssigned; ///
|
|
31
49
|
}
|
|
32
50
|
}
|
|
33
51
|
|
|
34
52
|
if (premiseVerified) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
53
|
+
let premise,
|
|
54
|
+
metaproofStep;
|
|
55
|
+
|
|
56
|
+
if (unqualifiedStatementNode !== null) {
|
|
57
|
+
const statementNode = statementNodeQuery(unqualifiedStatementNode);
|
|
58
|
+
|
|
59
|
+
metaproofStep = MetaproofStep.fromMetastatementNode(statementNode);
|
|
60
|
+
|
|
61
|
+
premise = Premise.fromStatementNode(statementNode);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
if (unqualifiedMetastatementNode !== null) {
|
|
65
|
+
const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
|
|
66
|
+
|
|
67
|
+
metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
|
|
68
|
+
|
|
69
|
+
premise = Premise.fromMetastatementNode(metastatementNode);
|
|
70
|
+
}
|
|
38
71
|
|
|
39
72
|
premises.push(premise);
|
|
40
73
|
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import LocalContext from "../context/local";
|
|
4
3
|
import MetaproofStep from "../step/metaproof";
|
|
5
4
|
import verifyRuleSubproof from "../verify/ruleSubproof";
|
|
6
5
|
import verifyRuleSubDerivation from "../verify/ruleSubDerivation";
|
|
7
6
|
import verifyQualifiedStatement from "../verify/statement/qualified";
|
|
8
|
-
import verifyUnqualifiedStatement from "../verify/statement/unqualified";
|
|
9
7
|
import verifyQualifiedMetastatement from "../verify/metastatement/qualified";
|
|
10
8
|
import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified";
|
|
11
9
|
|
|
@@ -47,7 +45,7 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
|
|
|
47
45
|
let qualifiedStatementVerified;
|
|
48
46
|
|
|
49
47
|
const assignments = [],
|
|
50
|
-
localContext =
|
|
48
|
+
localContext = localMetaContext; ///
|
|
51
49
|
|
|
52
50
|
qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, assignments, localContext);
|
|
53
51
|
|
|
@@ -76,7 +74,8 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
|
|
|
76
74
|
qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, substitutions, assignments, localMetaContext);
|
|
77
75
|
|
|
78
76
|
if (qualifiedMetastatementVerified) {
|
|
79
|
-
const
|
|
77
|
+
const localContext = localMetaContext, ///
|
|
78
|
+
assignmentAssigned = assignAssignment(assignments, localContext);
|
|
80
79
|
|
|
81
80
|
qualifiedMetastatementVerified = assignmentAssigned; ///
|
|
82
81
|
}
|
|
@@ -98,7 +97,8 @@ export default function verifyRuleProofStep(ruleProofStepNode, localMetaContext)
|
|
|
98
97
|
unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localMetaContext);
|
|
99
98
|
|
|
100
99
|
if (unqualifiedMetastatementVerified) {
|
|
101
|
-
const
|
|
100
|
+
const localContext = localMetaContext, ///
|
|
101
|
+
assignmentAssigned = assignAssignment(assignments, localContext);
|
|
102
102
|
|
|
103
103
|
unqualifiedMetastatementVerified = assignmentAssigned; ///
|
|
104
104
|
}
|