occam-verify-cli 0.0.525 → 0.0.527
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/assertion/type.js +10 -40
- package/lib/axiom.js +7 -7
- package/lib/axiomLemmaTheoremConjecture.js +190 -0
- package/lib/combinator.js +5 -5
- package/lib/conclusion.js +3 -3
- package/lib/conjecture.js +141 -0
- package/lib/consequence.js +5 -5
- package/lib/constants.js +4 -16
- package/lib/constructor.js +6 -6
- package/lib/context/file.js +85 -32
- package/lib/context/metaproof.js +46 -4
- package/lib/context/proof.js +38 -93
- package/lib/context/release/directory.js +20 -1
- package/lib/context/release/file.js +27 -3
- package/lib/equality.js +78 -51
- package/lib/index.js +1 -13
- package/lib/kinds.js +5 -1
- package/lib/label.js +5 -5
- package/lib/lemma.js +7 -7
- package/lib/matcher/metastatementForMetavariable.js +16 -19
- package/lib/matcher/statementForMetavariable.js +22 -20
- package/lib/matcher/{statementForVariable → termForVariable}/consequence.js +13 -13
- package/lib/matcher/{statementForVariable → termForVariable}/supposition.js +13 -13
- package/lib/matcher/termForVariable.js +198 -0
- package/lib/matcher.js +23 -64
- package/lib/mixins/file.js +62 -2
- package/lib/premise.js +6 -6
- package/lib/rule.js +5 -5
- package/lib/ruleNames.js +1 -9
- package/lib/step/proof.js +22 -1
- package/lib/substitution/statementForMetavariable.js +12 -8
- package/lib/substitution/termForVariable.js +86 -0
- package/lib/supposition.js +6 -6
- package/lib/theorem.js +7 -7
- package/lib/type.js +13 -6
- package/lib/utilities/string.js +17 -16
- package/lib/utilities/substitution.js +4 -5
- package/lib/variable.js +5 -39
- package/lib/verify/assertion/type.js +60 -37
- package/lib/verify/axiom.js +2 -3
- package/lib/verify/conclusion.js +2 -3
- package/lib/verify/conjecture.js +56 -0
- package/lib/verify/consequence.js +3 -4
- package/lib/verify/declaration/topLevel.js +7 -3
- package/lib/verify/label.js +2 -3
- package/lib/verify/lemma.js +2 -3
- package/lib/verify/metastatement/qualified.js +3 -4
- package/lib/verify/metastatement/unqualified.js +3 -4
- package/lib/verify/premise.js +3 -4
- package/lib/verify/rule.js +2 -3
- package/lib/verify/statement/qualified.js +41 -12
- package/lib/verify/statement/unqualified.js +3 -4
- package/lib/verify/statement.js +47 -51
- package/lib/verify/statementAsCombinator.js +2 -3
- package/lib/verify/supposition.js +3 -4
- package/lib/verify/term.js +3 -4
- package/lib/verify/termAsConstructor.js +4 -5
- package/lib/verify/theorem.js +2 -3
- package/lib/verify/type.js +2 -3
- package/lib/verify/variable.js +2 -3
- package/package.json +1 -1
- package/src/assertion/type.js +7 -32
- package/src/axiom.js +4 -4
- package/src/{axiomLemmaTheorem.js → axiomLemmaTheoremConjecture.js} +9 -9
- package/src/combinator.js +4 -4
- package/src/conclusion.js +2 -2
- package/src/conjecture.js +13 -0
- package/src/consequence.js +4 -4
- package/src/constants.js +1 -4
- package/src/constructor.js +6 -6
- package/src/context/file.js +89 -32
- package/src/context/metaproof.js +44 -3
- package/src/context/proof.js +42 -37
- package/src/context/release/directory.js +24 -0
- package/src/context/release/file.js +34 -3
- package/src/equality.js +110 -61
- package/src/index.js +0 -3
- package/src/kinds.js +1 -0
- package/src/label.js +4 -4
- package/src/lemma.js +4 -4
- package/src/matcher/metastatementForMetavariable.js +22 -32
- package/src/matcher/statementForMetavariable.js +40 -34
- package/src/matcher/termForVariable/consequence.js +9 -0
- package/src/matcher/termForVariable/supposition.js +9 -0
- package/src/matcher/termForVariable.js +89 -0
- package/src/matcher.js +28 -22
- package/src/mixins/file.js +46 -1
- package/src/premise.js +6 -6
- package/src/rule.js +4 -4
- package/src/ruleNames.js +0 -2
- package/src/step/proof.js +27 -0
- package/src/substitution/statementForMetavariable.js +17 -10
- package/src/substitution/termForVariable.js +64 -0
- package/src/supposition.js +5 -5
- package/src/theorem.js +4 -4
- package/src/type.js +18 -8
- package/src/utilities/string.js +27 -21
- package/src/utilities/substitution.js +6 -4
- package/src/variable.js +5 -38
- package/src/verify/assertion/type.js +71 -65
- package/src/verify/axiom.js +1 -2
- package/src/verify/conclusion.js +1 -2
- package/src/verify/conjecture.js +73 -0
- package/src/verify/consequence.js +2 -3
- package/src/verify/declaration/topLevel.js +7 -0
- package/src/verify/label.js +1 -2
- package/src/verify/lemma.js +1 -2
- package/src/verify/metastatement/qualified.js +2 -3
- package/src/verify/metastatement/unqualified.js +2 -3
- package/src/verify/premise.js +2 -3
- package/src/verify/rule.js +1 -2
- package/src/verify/statement/qualified.js +55 -15
- package/src/verify/statement/unqualified.js +2 -3
- package/src/verify/statement.js +49 -70
- package/src/verify/statementAsCombinator.js +1 -2
- package/src/verify/supposition.js +2 -3
- package/src/verify/term.js +2 -3
- package/src/verify/termAsConstructor.js +3 -4
- package/src/verify/theorem.js +1 -2
- package/src/verify/type.js +1 -2
- package/src/verify/variable.js +1 -2
- package/lib/axiomLemmaTheorem.js +0 -190
- package/lib/jsonTypes.js +0 -30
- package/lib/matcher/statementForVariable.js +0 -201
- package/lib/substitution/statementForVariable.js +0 -86
- package/lib/utilities/json.js +0 -187
- package/lib/utilities/version.js +0 -32
- package/lib/versionChanges.js +0 -34
- package/src/jsonTypes.js +0 -6
- package/src/matcher/statementForVariable/consequence.js +0 -9
- package/src/matcher/statementForVariable/supposition.js +0 -9
- package/src/matcher/statementForVariable.js +0 -99
- package/src/substitution/statementForVariable.js +0 -64
- package/src/utilities/json.js +0 -264
- package/src/utilities/version.js +0 -30
- package/src/versionChanges.js +0 -11
package/src/verify/statement.js
CHANGED
|
@@ -2,16 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
import Equality from "../equality";
|
|
4
4
|
import verifyTerm from "../verify/term";
|
|
5
|
-
import equalityCombinator from "../ocmbinator/equality";
|
|
6
5
|
import bracketedCombinator from "../ocmbinator/bracketed";
|
|
7
6
|
import verifyTypeAssertion from "../verify/assertion/type";
|
|
8
7
|
|
|
9
8
|
import { first } from "../utilities/array";
|
|
10
9
|
import { objectType } from "../type";
|
|
11
|
-
import { nodeAsString } from "../utilities/string";
|
|
12
10
|
import { OBJECT_TYPE_NAME } from "../typeNames";
|
|
13
11
|
import { STATEMENT_META_TYPE } from "../metaTypes";
|
|
14
|
-
import { MAXIMUM_INDEXES_LENGTH } from "../constants";
|
|
15
12
|
import { nodeQuery, typeNameFromTypeNode } from "../utilities/query";
|
|
16
13
|
import { ARGUMENT_RULE_NAME, META_ARGUMENT_RULE_NAME } from "../ruleNames";
|
|
17
14
|
|
|
@@ -27,21 +24,21 @@ export default function verifyStatement(statementNode, assertions, derived, cont
|
|
|
27
24
|
context.begin(statementNode);
|
|
28
25
|
|
|
29
26
|
if (!statementVerified) {
|
|
30
|
-
const
|
|
27
|
+
const statementVerifiedAgainstCombinators = verifyStatementAgainstCombinators(statementNode, context);
|
|
31
28
|
|
|
32
|
-
statementVerified =
|
|
29
|
+
statementVerified = statementVerifiedAgainstCombinators; ///
|
|
33
30
|
}
|
|
34
31
|
|
|
35
32
|
if (!statementVerified) {
|
|
36
|
-
const statementVerifiedAsTypeAssertion = verifyStatementAsTypeAssertion(statementNode, assertions, context);
|
|
33
|
+
const statementVerifiedAsTypeAssertion = verifyStatementAsTypeAssertion(statementNode, assertions, derived, context);
|
|
37
34
|
|
|
38
35
|
statementVerified = statementVerifiedAsTypeAssertion; ///
|
|
39
36
|
}
|
|
40
37
|
|
|
41
38
|
if (!statementVerified) {
|
|
42
|
-
const
|
|
39
|
+
const statementVerifiedAsEquality = verifyStatementAsEquality(statementNode, derived, context);
|
|
43
40
|
|
|
44
|
-
statementVerified =
|
|
41
|
+
statementVerified = statementVerifiedAsEquality; //
|
|
45
42
|
}
|
|
46
43
|
|
|
47
44
|
statementVerified ?
|
|
@@ -51,40 +48,14 @@ export default function verifyStatement(statementNode, assertions, derived, cont
|
|
|
51
48
|
return statementVerified;
|
|
52
49
|
}
|
|
53
50
|
|
|
54
|
-
function
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
if (statementVerifiedAgainstCombinator) {
|
|
61
|
-
statementVerifiedAsEquality = true;
|
|
62
|
-
|
|
63
|
-
if (derived) {
|
|
64
|
-
const equality = Equality.fromStatementNode(statementNode),
|
|
65
|
-
proofSteps = context.getProofSteps(),
|
|
66
|
-
equalities = equalitiesFromProofSteps(proofSteps),
|
|
67
|
-
equalityEquates = equality.equate(equalities);
|
|
68
|
-
|
|
69
|
-
statementVerifiedAsEquality = equalityEquates; ///
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
return statementVerifiedAsEquality;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
function verifyStatementAsTypeAssertion(statementNode, assertions, context) {
|
|
77
|
-
let statementVerifiedAsTypeAssertion = false;
|
|
78
|
-
|
|
79
|
-
const typeAssertionNode = typeAssertionNodeQuery(statementNode);
|
|
80
|
-
|
|
81
|
-
if (typeAssertionNode !== null) {
|
|
82
|
-
const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assertions, context);
|
|
83
|
-
|
|
84
|
-
statementVerifiedAsTypeAssertion = typeAssertionVerified; ///
|
|
85
|
-
}
|
|
51
|
+
export function verifyStatementAgainstCombinator(statementNode, combinator, context) {
|
|
52
|
+
const combinatorStatementNode = combinator.getStatementNode(),
|
|
53
|
+
node = statementNode, ///
|
|
54
|
+
combinatorNode = combinatorStatementNode, ///
|
|
55
|
+
nodeVerified = verifyNode(node, combinatorNode, context),
|
|
56
|
+
statementVerifiedAgainstCombinator = nodeVerified; ///
|
|
86
57
|
|
|
87
|
-
return
|
|
58
|
+
return statementVerifiedAgainstCombinator;
|
|
88
59
|
}
|
|
89
60
|
|
|
90
61
|
function verifyStatementAgainstCombinators(statementNode, context) {
|
|
@@ -112,14 +83,40 @@ function verifyStatementAgainstCombinators(statementNode, context) {
|
|
|
112
83
|
return statementVerifiedAgainstCombinators;
|
|
113
84
|
}
|
|
114
85
|
|
|
115
|
-
function
|
|
116
|
-
|
|
117
|
-
node = statementNode, ///
|
|
118
|
-
combinatorNode = combinatorStatementNode, ///
|
|
119
|
-
nodeVerified = verifyNode(node, combinatorNode, context),
|
|
120
|
-
statementVerifiedAgainstCombinator = nodeVerified; ///
|
|
86
|
+
function verifyStatementAsTypeAssertion(statementNode, assertions, derived, context) {
|
|
87
|
+
let statementVerifiedAsTypeAssertion = false;
|
|
121
88
|
|
|
122
|
-
|
|
89
|
+
const typeAssertionNode = typeAssertionNodeQuery(statementNode);
|
|
90
|
+
|
|
91
|
+
if (typeAssertionNode !== null) {
|
|
92
|
+
const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assertions, derived, context);
|
|
93
|
+
|
|
94
|
+
statementVerifiedAsTypeAssertion = typeAssertionVerified; ///
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
return statementVerifiedAsTypeAssertion;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function verifyStatementAsEquality(statementNode, derived, context) {
|
|
101
|
+
let statementVerifiedAsEquality = false;
|
|
102
|
+
|
|
103
|
+
const equality = Equality.fromStatementNode(statementNode, context);
|
|
104
|
+
|
|
105
|
+
if (equality !== null) {
|
|
106
|
+
statementVerifiedAsEquality = true; ///
|
|
107
|
+
|
|
108
|
+
if (derived) {
|
|
109
|
+
const equalities = context.getEqualities();
|
|
110
|
+
|
|
111
|
+
if (equalities !== null) {
|
|
112
|
+
const equalityEquates = equality.equate(equalities, context);
|
|
113
|
+
|
|
114
|
+
statementVerifiedAsEquality = equalityEquates; ///
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
return statementVerifiedAsEquality;
|
|
123
120
|
}
|
|
124
121
|
|
|
125
122
|
function verifyNode(node, combinatorNode, context) {
|
|
@@ -230,7 +227,7 @@ function verifyArgumentNode(argumentNode, combinatorArgumentNode, context) {
|
|
|
230
227
|
const termNode = termNodeQuery(argumentNode);
|
|
231
228
|
|
|
232
229
|
if (termNode === null) {
|
|
233
|
-
const argumentString = nodeAsString(argumentNode);
|
|
230
|
+
const argumentString = context.nodeAsString(argumentNode);
|
|
234
231
|
|
|
235
232
|
context.error(`The ${argumentString} argument should be a term, not a type`);
|
|
236
233
|
} else {
|
|
@@ -262,12 +259,12 @@ function verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, co
|
|
|
262
259
|
const statementNode = statementNodeQuery(metaArgumentNode);
|
|
263
260
|
|
|
264
261
|
if (statementNode === null) {
|
|
265
|
-
const metaArgumentString = nodeAsString(metaArgumentNode);
|
|
262
|
+
const metaArgumentString = context.nodeAsString(metaArgumentNode);
|
|
266
263
|
|
|
267
264
|
context.error(`The '${metaArgumentString}' meta-argument should be a statement, not a meta-type.`);
|
|
268
265
|
} else {
|
|
269
266
|
const derived = false,
|
|
270
|
-
assertions =
|
|
267
|
+
assertions = [],
|
|
271
268
|
statementVerified = verifyStatement(statementNode, assertions, derived, context);
|
|
272
269
|
|
|
273
270
|
if (statementVerified) {
|
|
@@ -282,7 +279,7 @@ function verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, co
|
|
|
282
279
|
}
|
|
283
280
|
|
|
284
281
|
if (!metaArgumentNodeVerified) {
|
|
285
|
-
const combinatorMetaargumentString = nodeAsString(combinatorMetaargumentNode);
|
|
282
|
+
const combinatorMetaargumentString = context.nodeAsString(combinatorMetaargumentNode);
|
|
286
283
|
|
|
287
284
|
context.error(`The '${combinatorMetaargumentString}' combinator meta-argument should be the 'Statement' meta-type.`);
|
|
288
285
|
}
|
|
@@ -291,21 +288,3 @@ function verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, co
|
|
|
291
288
|
|
|
292
289
|
return metaArgumentNodeVerified;
|
|
293
290
|
}
|
|
294
|
-
|
|
295
|
-
function equalitiesFromProofSteps(proofSteps) {
|
|
296
|
-
const start = -MAXIMUM_INDEXES_LENGTH; ///
|
|
297
|
-
|
|
298
|
-
proofSteps = proofSteps.slice(start); ///
|
|
299
|
-
|
|
300
|
-
const equalities = proofSteps.reduce((equalities, proofStep, index) => {
|
|
301
|
-
const equality = Equality.fromProofStep(proofStep);
|
|
302
|
-
|
|
303
|
-
if (equality !== null) {
|
|
304
|
-
equalities.push(equality);
|
|
305
|
-
}
|
|
306
|
-
|
|
307
|
-
return equalities;
|
|
308
|
-
}, []);
|
|
309
|
-
|
|
310
|
-
return equalities;
|
|
311
|
-
}
|
|
@@ -4,7 +4,6 @@ import Combinator from "../combinator";
|
|
|
4
4
|
import verifyTerm from "../verify/term";
|
|
5
5
|
import verifyStatement from "../verify/statement";
|
|
6
6
|
|
|
7
|
-
import { nodeAsString } from "../utilities/string";
|
|
8
7
|
import { typeNameFromTypeNode } from "../utilities/query";
|
|
9
8
|
import { TYPE_RULE_NAME, TERM_RULE_NAME, STATEMENT_RULE_NAME } from "../ruleNames";
|
|
10
9
|
|
|
@@ -13,7 +12,7 @@ export default function verifyStatementAsCombinator(statementNode, fileContext)
|
|
|
13
12
|
|
|
14
13
|
fileContext.begin(statementNode);
|
|
15
14
|
|
|
16
|
-
const statementString = nodeAsString(statementNode);
|
|
15
|
+
const statementString = fileContext.nodeAsString(statementNode);
|
|
17
16
|
|
|
18
17
|
fileContext.debug(`Verifying the '${statementString}' combinator....`);
|
|
19
18
|
|
|
@@ -5,7 +5,6 @@ import Supposition from "../supposition";
|
|
|
5
5
|
import verifyUnqualifiedStatement from "./statement/unqualified";
|
|
6
6
|
|
|
7
7
|
import { nodeQuery } from "../utilities/query";
|
|
8
|
-
import { nodeAsString } from "../utilities/string";
|
|
9
8
|
|
|
10
9
|
const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!"),
|
|
11
10
|
unqualifiedStatementNodeQuery = nodeQuery("/supposition/unqualifiedStatement!");
|
|
@@ -15,9 +14,9 @@ export default function verifySupposition(suppositionNode, suppositions, proofCo
|
|
|
15
14
|
|
|
16
15
|
proofContext.begin(suppositionNode);
|
|
17
16
|
|
|
18
|
-
const suppositionString = nodeAsString(suppositionNode);
|
|
17
|
+
const suppositionString = proofContext.nodeAsString(suppositionNode);
|
|
19
18
|
|
|
20
|
-
proofContext.debug(`Verifying the ${suppositionString} supposition...`);
|
|
19
|
+
proofContext.debug(`Verifying the '${suppositionString}' supposition...`);
|
|
21
20
|
|
|
22
21
|
const derived = false,
|
|
23
22
|
assertions = [],
|
package/src/verify/term.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
import { first } from "../utilities/array";
|
|
4
4
|
import { objectType } from "../type";
|
|
5
|
-
import { nodeAsString } from "../utilities/string";
|
|
6
5
|
import { OBJECT_TYPE_NAME } from "../typeNames";
|
|
7
6
|
import { ARGUMENT_RULE_NAME } from "../ruleNames";
|
|
8
7
|
import { nodeQuery, typeNameFromTypeNode, variableNameFromVariableNode } from "../utilities/query";
|
|
@@ -16,7 +15,7 @@ export default function verifyTerm(termNode, types, context) {
|
|
|
16
15
|
|
|
17
16
|
context.begin(termNode);
|
|
18
17
|
|
|
19
|
-
const termString = nodeAsString(termNode);
|
|
18
|
+
const termString = context.nodeAsString(termNode);
|
|
20
19
|
|
|
21
20
|
context.debug(`Verifying the '${termString}' term...`);
|
|
22
21
|
|
|
@@ -218,7 +217,7 @@ function verifyArgumentNode(argumentNode, constructorArgumentNode, context) {
|
|
|
218
217
|
const termNode = termNodeQuery(argumentNode);
|
|
219
218
|
|
|
220
219
|
if (termNode === null) {
|
|
221
|
-
const argumentString = nodeAsString(argumentNode);
|
|
220
|
+
const argumentString = context.nodeAsString(argumentNode);
|
|
222
221
|
|
|
223
222
|
context.error(`The ${argumentString} argument should be a term, not a type`);
|
|
224
223
|
} else {
|
|
@@ -4,7 +4,6 @@ import verifyTerm from "../verify/term";
|
|
|
4
4
|
import Constructor from "../constructor";
|
|
5
5
|
|
|
6
6
|
import { first } from "../utilities/array";
|
|
7
|
-
import { nodeAsString } from "../utilities/string";
|
|
8
7
|
import { nodeQuery, typeNameFromTypeNode } from "../utilities/query";
|
|
9
8
|
import { TERM_RULE_NAME, ARGUMENT_RULE_NAME } from "../ruleNames";
|
|
10
9
|
|
|
@@ -18,7 +17,7 @@ export default function verifyTermAsConstructor(termNode, typeNode, fileContext)
|
|
|
18
17
|
let type = null;
|
|
19
18
|
|
|
20
19
|
const nonTerminalNode = termNode, ///
|
|
21
|
-
termString = nodeAsString(termNode);
|
|
20
|
+
termString = fileContext.nodeAsString(termNode);
|
|
22
21
|
|
|
23
22
|
fileContext.debug(`Verifying the '${termString}' constructor...`);
|
|
24
23
|
|
|
@@ -123,7 +122,7 @@ function verifyNonTerminalNode(nonTerminalNode, fileContext) {
|
|
|
123
122
|
type = firstType; ///
|
|
124
123
|
|
|
125
124
|
if (type !== null) {
|
|
126
|
-
const termString = nodeAsString(termNode);
|
|
125
|
+
const termString = fileContext.nodeAsString(termNode);
|
|
127
126
|
|
|
128
127
|
fileContext.error(`The type of the constructor's compound '${termString}' term node is not null.`);
|
|
129
128
|
} else {
|
|
@@ -153,7 +152,7 @@ function verifyArgumentNode(argumentNode, fileContext) {
|
|
|
153
152
|
const typeNode = typeNodeQuery(argumentNode);
|
|
154
153
|
|
|
155
154
|
if (typeNode === null) {
|
|
156
|
-
const argumentString = nodeAsString(argumentNode);
|
|
155
|
+
const argumentString = fileContext.nodeAsString(argumentNode);
|
|
157
156
|
|
|
158
157
|
fileContext.error(`The ${argumentString} argument should be a type.`);
|
|
159
158
|
} else {
|
package/src/verify/theorem.js
CHANGED
|
@@ -8,7 +8,6 @@ import verifySupposition from "./supposition";
|
|
|
8
8
|
import verifyConsequence from "./consequence";
|
|
9
9
|
|
|
10
10
|
import { first } from "../utilities/array";
|
|
11
|
-
import { nodesAsString } from "../utilities/string";
|
|
12
11
|
import { nodeQuery, nodesQuery } from "../utilities/query";
|
|
13
12
|
|
|
14
13
|
const proofNodeQuery = nodeQuery("/theorem/proof!"),
|
|
@@ -22,7 +21,7 @@ export default function verifyTheorem(theoremNode, fileContext) {
|
|
|
22
21
|
fileContext.begin(theoremNode);
|
|
23
22
|
|
|
24
23
|
const labelNodes = labelNodesQuery(theoremNode),
|
|
25
|
-
labelsString = nodesAsString(labelNodes),
|
|
24
|
+
labelsString = fileContext.nodesAsString(labelNodes),
|
|
26
25
|
proofContext = ProofContext.fromFileContext(fileContext);
|
|
27
26
|
|
|
28
27
|
fileContext.debug(`Verifying the '${labelsString}' theorem...`);
|
package/src/verify/type.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
import Type from "../type";
|
|
4
4
|
|
|
5
|
-
import { nodeAsString } from "../utilities/string";
|
|
6
5
|
import { typeNameFromTypeNode } from "../utilities/query";
|
|
7
6
|
|
|
8
7
|
export default function verifyType(typeNode, superTypeNode, fileContext) {
|
|
@@ -10,7 +9,7 @@ export default function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
10
9
|
|
|
11
10
|
fileContext.begin(typeNode);
|
|
12
11
|
|
|
13
|
-
const typeString = nodeAsString(typeNode);
|
|
12
|
+
const typeString = fileContext.nodeAsString(typeNode);
|
|
14
13
|
|
|
15
14
|
fileContext.debug(`Verifying the '${typeString}' type...`);
|
|
16
15
|
|
package/src/verify/variable.js
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
import Variable from "../variable";
|
|
4
4
|
|
|
5
5
|
import { objectType } from "../type";
|
|
6
|
-
import { nodeAsString } from "../utilities/string";
|
|
7
6
|
import { typeNameFromTypeNode, variableNameFromVariableNode } from "../utilities/query";
|
|
8
7
|
|
|
9
8
|
export default function verifyVariable(variableNode, typeNode, fileContext) {
|
|
@@ -11,7 +10,7 @@ export default function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
11
10
|
|
|
12
11
|
fileContext.begin(variableNode);
|
|
13
12
|
|
|
14
|
-
const variableString = nodeAsString(variableNode);
|
|
13
|
+
const variableString = fileContext.nodeAsString(variableNode);
|
|
15
14
|
|
|
16
15
|
fileContext.debug(`Verifying the '${variableString}' variable...`);
|
|
17
16
|
|
package/lib/axiomLemmaTheorem.js
DELETED
|
@@ -1,190 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
Object.defineProperty(exports, "default", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
get: function() {
|
|
8
|
-
return AxiomLemmaTheorem;
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
var _label = /*#__PURE__*/ _interopRequireDefault(require("./label"));
|
|
12
|
-
var _supposition = /*#__PURE__*/ _interopRequireDefault(require("./supposition"));
|
|
13
|
-
var _consequence = /*#__PURE__*/ _interopRequireDefault(require("./consequence"));
|
|
14
|
-
var _array = require("./utilities/array");
|
|
15
|
-
function _classCallCheck(instance, Constructor) {
|
|
16
|
-
if (!(instance instanceof Constructor)) {
|
|
17
|
-
throw new TypeError("Cannot call a class as a function");
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
function _defineProperties(target, props) {
|
|
21
|
-
for(var i = 0; i < props.length; i++){
|
|
22
|
-
var descriptor = props[i];
|
|
23
|
-
descriptor.enumerable = descriptor.enumerable || false;
|
|
24
|
-
descriptor.configurable = true;
|
|
25
|
-
if ("value" in descriptor) descriptor.writable = true;
|
|
26
|
-
Object.defineProperty(target, descriptor.key, descriptor);
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
function _createClass(Constructor, protoProps, staticProps) {
|
|
30
|
-
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
|
|
31
|
-
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
32
|
-
return Constructor;
|
|
33
|
-
}
|
|
34
|
-
function _interopRequireDefault(obj) {
|
|
35
|
-
return obj && obj.__esModule ? obj : {
|
|
36
|
-
default: obj
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
var AxiomLemmaTheorem = /*#__PURE__*/ function() {
|
|
40
|
-
function AxiomLemmaTheorem(labels, suppositions, consequence) {
|
|
41
|
-
_classCallCheck(this, AxiomLemmaTheorem);
|
|
42
|
-
this.labels = labels;
|
|
43
|
-
this.suppositions = suppositions;
|
|
44
|
-
this.consequence = consequence;
|
|
45
|
-
}
|
|
46
|
-
_createClass(AxiomLemmaTheorem, [
|
|
47
|
-
{
|
|
48
|
-
key: "getLabels",
|
|
49
|
-
value: function getLabels() {
|
|
50
|
-
return this.labels;
|
|
51
|
-
}
|
|
52
|
-
},
|
|
53
|
-
{
|
|
54
|
-
key: "getSuppositions",
|
|
55
|
-
value: function getSuppositions() {
|
|
56
|
-
return this.suppositions;
|
|
57
|
-
}
|
|
58
|
-
},
|
|
59
|
-
{
|
|
60
|
-
key: "getConsequence",
|
|
61
|
-
value: function getConsequence() {
|
|
62
|
-
return this.consequence;
|
|
63
|
-
}
|
|
64
|
-
},
|
|
65
|
-
{
|
|
66
|
-
key: "matchLabelName",
|
|
67
|
-
value: function matchLabelName(labelName) {
|
|
68
|
-
var matchesLabelName = this.labels.some(function(label) {
|
|
69
|
-
var name = labelName, labelMatchesName = label.matchName(name);
|
|
70
|
-
if (labelMatchesName) {
|
|
71
|
-
return true;
|
|
72
|
-
}
|
|
73
|
-
});
|
|
74
|
-
return matchesLabelName;
|
|
75
|
-
}
|
|
76
|
-
},
|
|
77
|
-
{
|
|
78
|
-
key: "matchStatement",
|
|
79
|
-
value: function matchStatement(statementNode, proofContext) {
|
|
80
|
-
var _this = this;
|
|
81
|
-
var statementNatches;
|
|
82
|
-
var suppositionsLength = this.suppositions.length;
|
|
83
|
-
if (suppositionsLength === 0) {
|
|
84
|
-
var substitutions = [], consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions);
|
|
85
|
-
statementNatches = consequenceMatches; ///
|
|
86
|
-
} else {
|
|
87
|
-
var proofSteps = proofContext.getProofSteps();
|
|
88
|
-
statementNatches = (0, _array.someSubArray)(proofSteps, suppositionsLength, function(proofSteps) {
|
|
89
|
-
var suppositionsMatchConsequence = matchSuppositionsAndConsequence(_this.suppositions, _this.consequence, proofSteps, statementNode);
|
|
90
|
-
if (suppositionsMatchConsequence) {
|
|
91
|
-
return true;
|
|
92
|
-
}
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
return statementNatches;
|
|
96
|
-
}
|
|
97
|
-
},
|
|
98
|
-
{
|
|
99
|
-
key: "toJSON",
|
|
100
|
-
value: function toJSON() {
|
|
101
|
-
var kind = this.constructor.kind, labelsJSON = this.labels.map(function(label) {
|
|
102
|
-
var labelJSON = label.toJSON();
|
|
103
|
-
return labelJSON;
|
|
104
|
-
}), suppositionsJSON = this.suppositions.map(function(supposition) {
|
|
105
|
-
var suppositionJSON = supposition.toJSON();
|
|
106
|
-
return suppositionJSON;
|
|
107
|
-
}), consequenceJSON = this.consequence.toJSON(), labels = labelsJSON, suppositions = suppositionsJSON, consequence = consequenceJSON, json = {
|
|
108
|
-
kind: kind,
|
|
109
|
-
labels: labels,
|
|
110
|
-
suppositions: suppositions,
|
|
111
|
-
consequence: consequence
|
|
112
|
-
};
|
|
113
|
-
return json;
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
], [
|
|
117
|
-
{
|
|
118
|
-
key: "fromJSON",
|
|
119
|
-
value: function fromJSON(Class, json, releaseContext) {
|
|
120
|
-
var labels = json.labels;
|
|
121
|
-
var labelsJSON = labels; ///
|
|
122
|
-
labels = labelsJSON.map(function(labelJSON) {
|
|
123
|
-
var _$json = labelJSON, label = _label.default.fromJSON(_$json, releaseContext);
|
|
124
|
-
return label;
|
|
125
|
-
});
|
|
126
|
-
var suppositions = json.suppositions;
|
|
127
|
-
var suppositionsJSON = suppositions; ///
|
|
128
|
-
suppositions = suppositionsJSON.map(function(suppositionJSON) {
|
|
129
|
-
var _$json = suppositionJSON, supposition = _supposition.default.fromJSON(_$json, releaseContext);
|
|
130
|
-
return supposition;
|
|
131
|
-
});
|
|
132
|
-
var consequence = json.consequence;
|
|
133
|
-
var consequenceJSON = consequence; ///
|
|
134
|
-
json = consequenceJSON; ///
|
|
135
|
-
consequence = _consequence.default.fromJSON(json, releaseContext);
|
|
136
|
-
return new Class(labels, suppositions, consequence); ///
|
|
137
|
-
}
|
|
138
|
-
},
|
|
139
|
-
{
|
|
140
|
-
key: "fromLabelsSuppositionsAndConsequence",
|
|
141
|
-
value: function fromLabelsSuppositionsAndConsequence(Class, labels, suppositions, consequence) {
|
|
142
|
-
return new Class(labels, suppositions, consequence);
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
]);
|
|
146
|
-
return AxiomLemmaTheorem;
|
|
147
|
-
}();
|
|
148
|
-
function matchSupposition(supposition, proofSteps, substitutions) {
|
|
149
|
-
var proofStep = (0, _array.prune)(proofSteps, function(proofStep) {
|
|
150
|
-
var subproofNode = proofStep.getSubproofNode(), statementNode = proofStep.getStatementNode();
|
|
151
|
-
if (subproofNode !== null) {
|
|
152
|
-
var subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions);
|
|
153
|
-
if (!subProofMatches) {
|
|
154
|
-
return true;
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
if (statementNode !== null) {
|
|
158
|
-
var statementMatches = supposition.matchStatementNode(statementNode, substitutions);
|
|
159
|
-
if (!statementMatches) {
|
|
160
|
-
return true;
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
}) || null;
|
|
164
|
-
var suppositionMatches = proofStep !== null;
|
|
165
|
-
return suppositionMatches;
|
|
166
|
-
}
|
|
167
|
-
function matchSuppositions(supposition, proofSteps, substitutions) {
|
|
168
|
-
var suppositionsMatches = supposition.every(function(supposition) {
|
|
169
|
-
var suppositionMatches = matchSupposition(supposition, proofSteps, substitutions);
|
|
170
|
-
if (suppositionMatches) {
|
|
171
|
-
return true;
|
|
172
|
-
}
|
|
173
|
-
});
|
|
174
|
-
return suppositionsMatches;
|
|
175
|
-
}
|
|
176
|
-
function matchConsequence(consequence, statementNode, substitutions) {
|
|
177
|
-
var nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions), consequenceMatches = nonTerminalNodeMatches; ///
|
|
178
|
-
return consequenceMatches;
|
|
179
|
-
}
|
|
180
|
-
function matchSuppositionsAndConsequence(suppositions, consequence, proofSteps, statementNode) {
|
|
181
|
-
var suppositionsMatchConsequence = false;
|
|
182
|
-
var substitutions = [], suppositionsMatches = matchSuppositions(suppositions, proofSteps, substitutions);
|
|
183
|
-
if (suppositionsMatches) {
|
|
184
|
-
var consequenceMatches = matchConsequence(consequence, statementNode, substitutions);
|
|
185
|
-
suppositionsMatchConsequence = consequenceMatches; ///
|
|
186
|
-
}
|
|
187
|
-
return suppositionsMatchConsequence;
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/axiomLemmaTheorem.js"],"sourcesContent":["\"use strict\";\n\nimport Label from \"./label\";\nimport Supposition from \"./supposition\";\nimport Consequence from \"./consequence\";\n\nimport { prune } from \"./utilities/array\";\nimport { someSubArray } from \"./utilities/array\";\n\nexport default class AxiomLemmaTheorem {\n  constructor(labels, suppositions, consequence) {\n    this.labels = labels;\n    this.suppositions = suppositions;\n    this.consequence = consequence;\n  }\n\n  getLabels() {\n    return this.labels;\n  }\n\n  getSuppositions() {\n    return this.suppositions;\n  }\n\n  getConsequence() {\n    return this.consequence;\n  }\n\n  matchLabelName(labelName) {\n    const matchesLabelName = this.labels.some((label) => {\n      const name = labelName, ///\n            labelMatchesName = label.matchName(name);\n\n      if (labelMatchesName) {\n        return true;\n      }\n    });\n\n    return matchesLabelName;\n  }\n\n  matchStatement(statementNode, proofContext) {\n    let statementNatches;\n\n    const suppositionsLength = this.suppositions.length;\n\n    if (suppositionsLength === 0) {\n      const substitutions = [],\n            consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions);\n\n      statementNatches = consequenceMatches; ///\n    } else {\n      const proofSteps = proofContext.getProofSteps();\n\n      statementNatches = someSubArray(proofSteps, suppositionsLength, (proofSteps) => {\n        const suppositionsMatchConsequence = matchSuppositionsAndConsequence(this.suppositions, this.consequence, proofSteps, statementNode);\n\n        if (suppositionsMatchConsequence) {\n          return true;\n        }\n      });\n    }\n\n    return statementNatches;\n  }\n\n  toJSON() {\n    const { kind } = this.constructor,\n          labelsJSON = this.labels.map((label) => {\n            const labelJSON = label.toJSON();\n\n            return labelJSON;\n          }),\n          suppositionsJSON = this.suppositions.map((supposition) => {\n            const suppositionJSON = supposition.toJSON();\n\n            return suppositionJSON;\n          }),\n          consequenceJSON = this.consequence.toJSON(),\n          labels = labelsJSON,  ///\n          suppositions = suppositionsJSON,  ///\n          consequence = consequenceJSON,  ///\n          json = {\n            kind,\n            labels,\n            suppositions,\n            consequence\n          };\n\n    return json;\n  }\n\n  static fromJSON(Class, json, releaseContext) {\n    let { labels } = json;\n\n    const labelsJSON = labels;  ///\n\n    labels = labelsJSON.map((labelJSON) => {\n      const json = labelJSON, ///\n            label = Label.fromJSON(json, releaseContext);\n\n      return label;\n    });\n\n    let { suppositions } = json;\n\n    const suppositionsJSON = suppositions;  ///\n\n    suppositions = suppositionsJSON.map((suppositionJSON) => {\n      const json = suppositionJSON, ///\n            supposition = Supposition.fromJSON(json, releaseContext);\n\n      return supposition;\n    });\n\n    let { consequence } = json;\n\n    const consequenceJSON = consequence;  ///\n\n    json = consequenceJSON;  ///\n\n    consequence = Consequence.fromJSON(json, releaseContext);\n\n    return new Class(labels, suppositions, consequence);  ///\n  }\n\n  static fromLabelsSuppositionsAndConsequence(Class, labels, suppositions, consequence) { return new Class(labels, suppositions, consequence); }\n}\n\nfunction matchSupposition(supposition, proofSteps, substitutions) {\n  const proofStep = prune(proofSteps, (proofStep) => {\n    const subproofNode = proofStep.getSubproofNode(),\n          statementNode = proofStep.getStatementNode();\n\n    if (subproofNode !== null) {\n      const subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions);\n\n      if (!subProofMatches) {  ///\n        return true;\n      }\n    }\n\n    if (statementNode !== null) {\n      const statementMatches = supposition.matchStatementNode(statementNode, substitutions);\n\n      if (!statementMatches) {  ///\n        return true;\n      }\n    }\n\n  }) || null;\n\n  const suppositionMatches = (proofStep !== null);\n\n  return suppositionMatches;\n}\n\nfunction matchSuppositions(supposition, proofSteps, substitutions) {\n  const suppositionsMatches = supposition.every((supposition) => {\n    const suppositionMatches = matchSupposition(supposition, proofSteps, substitutions);\n\n    if (suppositionMatches) {\n      return true;\n    }\n  });\n\n  return suppositionsMatches;\n}\n\nfunction matchConsequence(consequence, statementNode, substitutions) {\n  const nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions),\n        consequenceMatches = nonTerminalNodeMatches; ///\n\n  return consequenceMatches;\n}\n\nfunction matchSuppositionsAndConsequence(suppositions, consequence, proofSteps, statementNode) {\n  let suppositionsMatchConsequence = false;\n\n  const substitutions = [],\n        suppositionsMatches = matchSuppositions(suppositions, proofSteps, substitutions);\n\n  if (suppositionsMatches) {\n    const consequenceMatches = matchConsequence(consequence, statementNode, substitutions);\n\n    suppositionsMatchConsequence = consequenceMatches;  ///\n  }\n\n  return suppositionsMatchConsequence;\n}\n"],"names":["AxiomLemmaTheorem","labels","suppositions","consequence","getLabels","getSuppositions","getConsequence","matchLabelName","labelName","matchesLabelName","some","label","name","labelMatchesName","matchName","matchStatement","statementNode","proofContext","statementNatches","suppositionsLength","length","substitutions","consequenceMatches","matchConsequence","proofSteps","getProofSteps","someSubArray","suppositionsMatchConsequence","matchSuppositionsAndConsequence","toJSON","kind","constructor","labelsJSON","map","labelJSON","suppositionsJSON","supposition","suppositionJSON","consequenceJSON","json","fromJSON","Class","releaseContext","Label","Supposition","Consequence","fromLabelsSuppositionsAndConsequence","matchSupposition","proofStep","prune","subproofNode","getSubproofNode","getStatementNode","subProofMatches","matchSubproofNode","statementMatches","matchStatementNode","suppositionMatches","matchSuppositions","suppositionsMatches","every","nonTerminalNodeMatches"],"mappings":"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"}
|
package/lib/jsonTypes.js
DELETED
|
@@ -1,30 +0,0 @@
|
|
|
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
|
-
NULL_JSON_TYPE: function() {
|
|
13
|
-
return NULL_JSON_TYPE;
|
|
14
|
-
},
|
|
15
|
-
ARRAY_JSON_TYPE: function() {
|
|
16
|
-
return ARRAY_JSON_TYPE;
|
|
17
|
-
},
|
|
18
|
-
OBJECT_JSON_TYPE: function() {
|
|
19
|
-
return OBJECT_JSON_TYPE;
|
|
20
|
-
},
|
|
21
|
-
PRIMITIVE_JSON_TYPE: function() {
|
|
22
|
-
return PRIMITIVE_JSON_TYPE;
|
|
23
|
-
}
|
|
24
|
-
});
|
|
25
|
-
var NULL_JSON_TYPE = "null";
|
|
26
|
-
var ARRAY_JSON_TYPE = "array";
|
|
27
|
-
var OBJECT_JSON_TYPE = "object";
|
|
28
|
-
var PRIMITIVE_JSON_TYPE = "primitive";
|
|
29
|
-
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9qc29uVHlwZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBOVUxMX0pTT05fVFlQRSA9IFwibnVsbFwiO1xuZXhwb3J0IGNvbnN0IEFSUkFZX0pTT05fVFlQRSA9IFwiYXJyYXlcIjtcbmV4cG9ydCBjb25zdCBPQkpFQ1RfSlNPTl9UWVBFID0gXCJvYmplY3RcIjtcbmV4cG9ydCBjb25zdCBQUklNSVRJVkVfSlNPTl9UWVBFID0gXCJwcmltaXRpdmVcIjtcbiJdLCJuYW1lcyI6WyJOVUxMX0pTT05fVFlQRSIsIkFSUkFZX0pTT05fVFlQRSIsIk9CSkVDVF9KU09OX1RZUEUiLCJQUklNSVRJVkVfSlNPTl9UWVBFIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFFYUEsY0FBYztlQUFkQTs7SUFDQUMsZUFBZTtlQUFmQTs7SUFDQUMsZ0JBQWdCO2VBQWhCQTs7SUFDQUMsbUJBQW1CO2VBQW5CQTs7O0FBSE4sSUFBTUgsaUJBQWlCO0FBQ3ZCLElBQU1DLGtCQUFrQjtBQUN4QixJQUFNQyxtQkFBbUI7QUFDekIsSUFBTUMsc0JBQXNCIn0=
|