occam-verify-cli 0.0.534 → 0.0.536
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 +3 -3
- package/lib/consequence.js +2 -2
- package/lib/constants.js +5 -1
- package/lib/context/proof.js +16 -1
- package/lib/equality.js +236 -69
- package/lib/log.js +6 -6
- package/lib/node/statement/equality.js +16 -0
- package/lib/premise.js +7 -7
- package/lib/supposition.js +4 -4
- package/lib/type.js +12 -5
- package/lib/variable.js +3 -23
- package/lib/verifier/metastatementForMetavariable.js +17 -17
- package/lib/verifier/statementForMetavariable.js +18 -18
- package/lib/verifier/termForVariable.js +17 -17
- package/lib/verifier.js +65 -20
- package/lib/verify/assertion/type.js +22 -11
- package/lib/verify/statement.js +227 -24
- package/package.json +1 -1
- package/src/conclusion.js +4 -4
- package/src/consequence.js +2 -2
- package/src/constants.js +1 -0
- package/src/context/proof.js +18 -0
- package/src/equality.js +159 -85
- package/src/log.js +7 -5
- package/src/node/statement/equality.js +9 -0
- package/src/premise.js +8 -8
- package/src/supposition.js +4 -4
- package/src/type.js +17 -8
- package/src/variable.js +2 -18
- package/src/verifier/metastatementForMetavariable.js +16 -16
- package/src/verifier/statementForMetavariable.js +17 -17
- package/src/verifier/termForVariable.js +16 -16
- package/src/verifier.js +18 -18
- package/src/verify/assertion/type.js +28 -13
- package/src/verify/statement.js +226 -42
- package/lib/verifier/statement.js +0 -199
- package/src/verifier/statement.js +0 -135
|
@@ -1,135 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
import Verifier from "../verifier";
|
|
4
|
-
import verifyTerm from "../verify/term";
|
|
5
|
-
|
|
6
|
-
import { first } from "../utilities/array";
|
|
7
|
-
import { objectType } from "../type";
|
|
8
|
-
import { OBJECT_TYPE_NAME } from "../typeNames";
|
|
9
|
-
import { STATEMENT_META_TYPE } from "../metaTypes";
|
|
10
|
-
import { nodeQuery, typeNameFromTypeNode } from "../utilities/query";
|
|
11
|
-
import { ARGUMENT_RULE_NAME, META_ARGUMENT_RULE_NAME } from "../ruleNames";
|
|
12
|
-
|
|
13
|
-
const termNodeQuery = nodeQuery("/argument/term!"),
|
|
14
|
-
typeNodeQuery = nodeQuery("/argument/type!"),
|
|
15
|
-
metaTypeNodeQuery = nodeQuery("/metaArgument/metaType!"),
|
|
16
|
-
statementNodeQuery = nodeQuery("/metaArgument/statement!"),
|
|
17
|
-
metaTypeTerminalNodeQuery = nodeQuery("/metaType/@meta-type");
|
|
18
|
-
|
|
19
|
-
class StatementVerifier extends Verifier {
|
|
20
|
-
verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, context) {
|
|
21
|
-
let nonTerminalNodeVerified = false;
|
|
22
|
-
|
|
23
|
-
const nonTerminalNode = nonTerminalNodeA, ///
|
|
24
|
-
combinatorNonTerminalNode = nonTerminalNodeB; ///
|
|
25
|
-
|
|
26
|
-
const ruleName = nonTerminalNode.getRuleName(), ///
|
|
27
|
-
combinatorRuleName = combinatorNonTerminalNode.getRuleName(); ///
|
|
28
|
-
|
|
29
|
-
if (ruleName === combinatorRuleName) {
|
|
30
|
-
switch (ruleName) {
|
|
31
|
-
case ARGUMENT_RULE_NAME: {
|
|
32
|
-
const argumentNode = nonTerminalNode, ///
|
|
33
|
-
combinatorArgumentNode = combinatorNonTerminalNode, ///
|
|
34
|
-
argumentNodeVerified = this.verifyArgumentNode(argumentNode, combinatorArgumentNode, substitutions, context);
|
|
35
|
-
|
|
36
|
-
nonTerminalNodeVerified = argumentNodeVerified; ///
|
|
37
|
-
|
|
38
|
-
break;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
case META_ARGUMENT_RULE_NAME: {
|
|
42
|
-
const metaArgumentNode = nonTerminalNode, ///
|
|
43
|
-
combinatorMetaargumentNode = combinatorNonTerminalNode, ///
|
|
44
|
-
metaArgumentNodeVerified = this.verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, substitutions, context);
|
|
45
|
-
|
|
46
|
-
nonTerminalNodeVerified = metaArgumentNodeVerified; ///
|
|
47
|
-
|
|
48
|
-
break;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
default: {
|
|
52
|
-
const childNodes = nonTerminalNode.getChildNodes(),
|
|
53
|
-
combinatorChildNodes = combinatorNonTerminalNode.getChildNodes(),
|
|
54
|
-
nodesA = childNodes, ///
|
|
55
|
-
nodesB = combinatorChildNodes, ///
|
|
56
|
-
nodesVerified = this.verifyNodes(nodesA, nodesB, substitutions, context);
|
|
57
|
-
|
|
58
|
-
nonTerminalNodeVerified = nodesVerified; ///
|
|
59
|
-
|
|
60
|
-
break;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
return nonTerminalNodeVerified;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
verifyArgumentNode(argumentNode, combinatorArgumentNode, substitutions, context) {
|
|
69
|
-
let argumentNodeVerified = false;
|
|
70
|
-
|
|
71
|
-
const termNode = termNodeQuery(argumentNode);
|
|
72
|
-
|
|
73
|
-
if (termNode === null) {
|
|
74
|
-
const argumentString = context.nodeAsString(argumentNode);
|
|
75
|
-
|
|
76
|
-
context.error(`The ${argumentString} argument should be a term, not a type`, argumentNode);
|
|
77
|
-
} else {
|
|
78
|
-
const types = [],
|
|
79
|
-
termVerified = verifyTerm(termNode, types, context);
|
|
80
|
-
|
|
81
|
-
if (termVerified) {
|
|
82
|
-
const firstType = first(types),
|
|
83
|
-
termType = firstType, ///
|
|
84
|
-
typeNode = typeNodeQuery(combinatorArgumentNode),
|
|
85
|
-
typeName = typeNameFromTypeNode(typeNode),
|
|
86
|
-
type = (typeName === OBJECT_TYPE_NAME) ?
|
|
87
|
-
objectType : ///
|
|
88
|
-
context.findTypeByTypeName(typeName),
|
|
89
|
-
statementTypeEqualToOrSubTypeOfType = termType.isEqualToOrSubTypeOf(type);
|
|
90
|
-
|
|
91
|
-
if (statementTypeEqualToOrSubTypeOfType) {
|
|
92
|
-
argumentNodeVerified = true;
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
return argumentNodeVerified;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, substitutions, context) {
|
|
101
|
-
let metaArgumentNodeVerified = false;
|
|
102
|
-
|
|
103
|
-
const statementNode = statementNodeQuery(metaArgumentNode),
|
|
104
|
-
combinatorMetaTYpeNode = metaTypeNodeQuery(combinatorMetaargumentNode);
|
|
105
|
-
|
|
106
|
-
if (statementNode === null) {
|
|
107
|
-
const metaArgumentString = context.nodeAsString(metaArgumentNode);
|
|
108
|
-
|
|
109
|
-
context.error(`Expected a statement but got a '${metaArgumentString}' meta-type.`, metaArgumentNode);
|
|
110
|
-
} else {
|
|
111
|
-
if (combinatorMetaTYpeNode === null) {
|
|
112
|
-
const combinatorMetaargumentString = context.nodeAsString(combinatorMetaargumentNode);
|
|
113
|
-
|
|
114
|
-
context.error(`Expected a meta-type but got a '${combinatorMetaargumentString}' statement.`, metaArgumentNode);
|
|
115
|
-
} else {
|
|
116
|
-
const combinatorMetaTypeTerminalNode = metaTypeTerminalNodeQuery(combinatorMetaTYpeNode),
|
|
117
|
-
content = combinatorMetaTypeTerminalNode.getContent(),
|
|
118
|
-
contentStatementMetaType = (content === STATEMENT_META_TYPE);
|
|
119
|
-
|
|
120
|
-
if (!contentStatementMetaType) {
|
|
121
|
-
context.error(`Expected the meta-type to be 'Statement' but got '${content}'.`, metaArgumentNode);
|
|
122
|
-
} else {
|
|
123
|
-
metaArgumentNodeVerified = true;
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
return metaArgumentNodeVerified;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
const statementVerifier = new StatementVerifier();
|
|
133
|
-
|
|
134
|
-
export default statementVerifier;
|
|
135
|
-
|