occam-verify-cli 1.0.438 → 1.0.444

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.
Files changed (216) hide show
  1. package/lib/context/file.js +38 -35
  2. package/lib/context/local.js +10 -10
  3. package/lib/context/release.js +6 -6
  4. package/lib/context/temporary.js +14 -14
  5. package/lib/element/assertion/contained.js +45 -45
  6. package/lib/element/assertion/defined.js +13 -13
  7. package/lib/element/assertion/property.js +23 -22
  8. package/lib/element/assertion/satisfies.js +7 -6
  9. package/lib/element/assertion/subproof.js +20 -17
  10. package/lib/element/assertion/type.js +3 -2
  11. package/lib/element/assertion.js +1 -23
  12. package/lib/element/assumption.js +24 -22
  13. package/lib/element/axiom.js +9 -12
  14. package/lib/element/axiomLemmaTheoremConjecture.js +32 -32
  15. package/lib/element/{statement/combinator → combinator}/bracketed.js +16 -16
  16. package/lib/element/combinator.js +229 -0
  17. package/lib/element/conclusion.js +11 -9
  18. package/lib/element/{term/constructor → constructor}/bracketed.js +5 -5
  19. package/lib/element/constructor.js +232 -0
  20. package/lib/element/declaration/combinator.js +2 -16
  21. package/lib/element/declaration/complexType.js +12 -12
  22. package/lib/element/declaration/constructor.js +13 -11
  23. package/lib/element/declaration/simpleType.js +4 -4
  24. package/lib/element/declaration/typePrefix.js +2 -2
  25. package/lib/element/declaration/variable.js +3 -3
  26. package/lib/element/deduction.js +11 -9
  27. package/lib/element/derivation.js +7 -10
  28. package/lib/element/equivalence.js +10 -10
  29. package/lib/element/equivalences.js +5 -5
  30. package/lib/element/frame.js +32 -38
  31. package/lib/element/hypothesis.js +3 -3
  32. package/lib/element/judgement.js +6 -4
  33. package/lib/element/label.js +8 -8
  34. package/lib/element/metaLemmaMetatheorem.js +5 -5
  35. package/lib/element/metaType.js +17 -80
  36. package/lib/element/metavariable.js +34 -34
  37. package/lib/element/parameter.js +3 -3
  38. package/lib/element/premise.js +49 -58
  39. package/lib/element/property.js +9 -9
  40. package/lib/element/propertyRelation.js +13 -13
  41. package/lib/element/reference.js +14 -17
  42. package/lib/element/rule.js +21 -21
  43. package/lib/element/signature.js +11 -11
  44. package/lib/element/statement.js +18 -18
  45. package/lib/element/step.js +83 -55
  46. package/lib/element/subDerivation.js +7 -10
  47. package/lib/element/subproof.js +6 -14
  48. package/lib/element/substitution/frame.js +1 -7
  49. package/lib/element/substitution/reference.js +2 -3
  50. package/lib/element/substitution/statement.js +44 -15
  51. package/lib/element/substitution/term.js +10 -57
  52. package/lib/element/substitution.js +5 -11
  53. package/lib/element/substitutions.js +29 -29
  54. package/lib/element/supposition.js +63 -55
  55. package/lib/element/term.js +21 -34
  56. package/lib/element/type.js +47 -60
  57. package/lib/element/typePrefix.js +5 -5
  58. package/lib/element/variable.js +9 -9
  59. package/lib/element.js +9 -3
  60. package/lib/metaTypes.js +52 -0
  61. package/lib/node/axiomLemmaTheoremConjecture.js +9 -9
  62. package/lib/node/body/axiom.js +2 -25
  63. package/lib/node/body/conjecture.js +2 -25
  64. package/lib/node/body/lemma.js +2 -25
  65. package/lib/node/body/metaLemma.js +2 -25
  66. package/lib/node/body/metatheorem.js +2 -25
  67. package/lib/node/body/rule.js +15 -1
  68. package/lib/node/body/theorem.js +2 -25
  69. package/lib/node/body.js +25 -2
  70. package/lib/node/combinator.js +11 -2
  71. package/lib/node/constructor.js +11 -2
  72. package/lib/node/declaration/combinator.js +5 -5
  73. package/lib/node/declaration/constructor.js +8 -8
  74. package/lib/node/declaration/property.js +15 -15
  75. package/lib/node/declaration/simpleType.js +31 -31
  76. package/lib/node/declaration/variable.js +8 -8
  77. package/lib/node/equality.js +8 -8
  78. package/lib/node/frame.js +20 -20
  79. package/lib/node/header.js +22 -22
  80. package/lib/node/metaLemmaMetaTheorem.js +16 -16
  81. package/lib/node/metavariable.js +15 -15
  82. package/lib/node/property.js +8 -8
  83. package/lib/node/propertyRelation.js +8 -8
  84. package/lib/node/rule.js +16 -16
  85. package/lib/node/statement.js +12 -12
  86. package/lib/node/step.js +22 -22
  87. package/lib/node/subproof.js +8 -8
  88. package/lib/node/substitution/frame.js +19 -19
  89. package/lib/node/substitution/statement.js +19 -19
  90. package/lib/node/substitution/term.js +19 -19
  91. package/lib/node/term.js +35 -35
  92. package/lib/preamble.js +5 -5
  93. package/lib/process/instantiate.js +20 -2
  94. package/lib/process/unify.js +39 -42
  95. package/lib/process/validate.js +431 -0
  96. package/lib/process/verify.js +44 -135
  97. package/lib/types.js +27 -0
  98. package/lib/utilities/brackets.js +4 -4
  99. package/lib/utilities/element.js +91 -55
  100. package/lib/utilities/instance.js +18 -18
  101. package/lib/utilities/statement.js +2 -2
  102. package/lib/utilities/string.js +21 -10
  103. package/lib/utilities/unification.js +237 -0
  104. package/lib/utilities/validation.js +251 -0
  105. package/package.json +6 -6
  106. package/src/context/file.js +37 -31
  107. package/src/context/local.js +8 -8
  108. package/src/context/release.js +9 -6
  109. package/src/context/temporary.js +11 -11
  110. package/src/element/assertion/contained.js +19 -20
  111. package/src/element/assertion/defined.js +11 -12
  112. package/src/element/assertion/property.js +20 -20
  113. package/src/element/assertion/satisfies.js +6 -6
  114. package/src/element/assertion/subproof.js +17 -15
  115. package/src/element/assertion/type.js +2 -2
  116. package/src/element/assertion.js +0 -2
  117. package/src/element/assumption.js +22 -19
  118. package/src/element/axiom.js +7 -11
  119. package/src/element/axiomLemmaTheoremConjecture.js +36 -36
  120. package/src/element/{statement/combinator → combinator}/bracketed.js +7 -7
  121. package/src/element/combinator.js +90 -0
  122. package/src/element/conclusion.js +12 -10
  123. package/src/element/{term/constructor → constructor}/bracketed.js +5 -5
  124. package/src/element/{term/constructor.js → constructor.js} +17 -25
  125. package/src/element/declaration/combinator.js +1 -22
  126. package/src/element/declaration/complexType.js +11 -11
  127. package/src/element/declaration/constructor.js +13 -10
  128. package/src/element/declaration/simpleType.js +3 -3
  129. package/src/element/declaration/typePrefix.js +1 -1
  130. package/src/element/declaration/variable.js +2 -2
  131. package/src/element/deduction.js +12 -9
  132. package/src/element/derivation.js +6 -10
  133. package/src/element/equivalence.js +8 -8
  134. package/src/element/equivalences.js +4 -4
  135. package/src/element/frame.js +28 -30
  136. package/src/element/hypothesis.js +2 -2
  137. package/src/element/judgement.js +6 -3
  138. package/src/element/label.js +4 -4
  139. package/src/element/metaLemmaMetatheorem.js +4 -3
  140. package/src/element/metaType.js +9 -45
  141. package/src/element/metavariable.js +29 -31
  142. package/src/element/parameter.js +2 -2
  143. package/src/element/premise.js +55 -62
  144. package/src/element/property.js +6 -6
  145. package/src/element/propertyRelation.js +11 -11
  146. package/src/element/reference.js +12 -21
  147. package/src/element/rule.js +17 -16
  148. package/src/element/signature.js +10 -9
  149. package/src/element/statement.js +16 -18
  150. package/src/element/step.js +93 -55
  151. package/src/element/subDerivation.js +6 -10
  152. package/src/element/subproof.js +4 -12
  153. package/src/element/substitution/frame.js +0 -2
  154. package/src/element/substitution/reference.js +1 -5
  155. package/src/element/substitution/statement.js +44 -14
  156. package/src/element/substitution/term.js +10 -13
  157. package/src/element/substitution.js +3 -5
  158. package/src/element/substitutions.js +48 -30
  159. package/src/element/supposition.js +88 -70
  160. package/src/element/term.js +18 -28
  161. package/src/element/type.js +42 -36
  162. package/src/element/typePrefix.js +3 -3
  163. package/src/element/variable.js +7 -7
  164. package/src/element.js +3 -1
  165. package/src/metaTypes.js +42 -0
  166. package/src/node/axiomLemmaTheoremConjecture.js +6 -6
  167. package/src/node/body/axiom.js +0 -21
  168. package/src/node/body/conjecture.js +0 -23
  169. package/src/node/body/lemma.js +0 -23
  170. package/src/node/body/metaLemma.js +0 -23
  171. package/src/node/body/metatheorem.js +0 -23
  172. package/src/node/body/rule.js +12 -0
  173. package/src/node/body/theorem.js +0 -23
  174. package/src/node/body.js +23 -0
  175. package/src/node/combinator.js +9 -0
  176. package/src/node/constructor.js +9 -0
  177. package/src/node/declaration/combinator.js +5 -5
  178. package/src/node/declaration/constructor.js +8 -8
  179. package/src/node/declaration/property.js +14 -14
  180. package/src/node/declaration/simpleType.js +31 -31
  181. package/src/node/declaration/variable.js +7 -7
  182. package/src/node/equality.js +7 -7
  183. package/src/node/frame.js +21 -21
  184. package/src/node/header.js +22 -22
  185. package/src/node/metaLemmaMetaTheorem.js +14 -14
  186. package/src/node/metavariable.js +14 -14
  187. package/src/node/property.js +7 -7
  188. package/src/node/propertyRelation.js +7 -7
  189. package/src/node/rule.js +15 -15
  190. package/src/node/statement.js +12 -12
  191. package/src/node/step.js +21 -21
  192. package/src/node/subproof.js +7 -7
  193. package/src/node/substitution/frame.js +18 -18
  194. package/src/node/substitution/statement.js +18 -18
  195. package/src/node/substitution/term.js +18 -18
  196. package/src/node/term.js +34 -34
  197. package/src/preamble.js +4 -4
  198. package/src/process/instantiate.js +12 -0
  199. package/src/process/unify.js +53 -57
  200. package/src/process/validate.js +316 -0
  201. package/src/process/verify.js +50 -138
  202. package/src/types.js +18 -0
  203. package/src/utilities/brackets.js +10 -6
  204. package/src/utilities/element.js +125 -82
  205. package/src/utilities/instance.js +18 -18
  206. package/src/utilities/statement.js +2 -2
  207. package/src/utilities/string.js +34 -20
  208. package/src/{mixins/step/unify.js → utilities/unification.js} +82 -68
  209. package/src/{mixins/statement/validate.js → utilities/validation.js} +143 -69
  210. package/lib/element/statement/combinator.js +0 -105
  211. package/lib/element/term/constructor.js +0 -172
  212. package/lib/mixins/statement/validate.js +0 -198
  213. package/lib/mixins/step/unify.js +0 -228
  214. package/lib/mixins/term/verify.js +0 -65
  215. package/src/element/statement/combinator.js +0 -59
  216. package/src/mixins/term/verify.js +0 -81
@@ -0,0 +1,251 @@
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: Object.getOwnPropertyDescriptor(all, name).get
9
+ });
10
+ }
11
+ _export(exports, {
12
+ get validateStatements () {
13
+ return validateStatements;
14
+ },
15
+ get validateTerms () {
16
+ return validateTerms;
17
+ }
18
+ });
19
+ var _elements = /*#__PURE__*/ _interop_require_default(require("../elements"));
20
+ var _statement = require("../utilities/statement");
21
+ function _interop_require_default(obj) {
22
+ return obj && obj.__esModule ? obj : {
23
+ default: obj
24
+ };
25
+ }
26
+ function unifyTermWithBracketedConstructor(term, context, validateAhead) {
27
+ var termUnifiesWithBracketedConstructor;
28
+ var BracketedConstructor = _elements.default.BracketedConstructor, bracketedConstructor = BracketedConstructor.fromNothing();
29
+ termUnifiesWithBracketedConstructor = bracketedConstructor.unifyTerm(term, context, validateAhead);
30
+ return termUnifiesWithBracketedConstructor;
31
+ }
32
+ function unifyTermWithConstructors(term, context, validateAhead) {
33
+ var termUnifiesWithConstructors;
34
+ var constructors = context.getConstructors();
35
+ termUnifiesWithConstructors = constructors.some(function(constructor) {
36
+ var unifiesWithConstructor = constructor.unifyTerm(term, context, validateAhead);
37
+ if (unifiesWithConstructor) {
38
+ return true;
39
+ }
40
+ });
41
+ return termUnifiesWithConstructors;
42
+ }
43
+ function validateTermAsVariable(term, context, validateAhead) {
44
+ var termValidatesAsVariable = false;
45
+ var Variable = _elements.default.Variable, termNode = term.getNode(), singularVariableNode = termNode.getSingularVariableNode();
46
+ if (singularVariableNode !== null) {
47
+ var variable;
48
+ var termString = term.getString(), variableNode = singularVariableNode; ///
49
+ variable = Variable.fromVariableNode(variableNode, context);
50
+ context.trace("Verifying the '".concat(termString, "' term as a variable..."));
51
+ var variableValidates = variable.validate(context);
52
+ if (variableValidates) {
53
+ var verifiesAhead;
54
+ var variableIdentifier = variable.getIdentifier();
55
+ variable = context.findVariableByVariableIdentifier(variableIdentifier);
56
+ var type = variable.getType();
57
+ term.setType(type);
58
+ verifiesAhead = validateAhead();
59
+ termValidatesAsVariable = verifiesAhead; ///
60
+ }
61
+ if (termValidatesAsVariable) {
62
+ context.debug("...verified the '".concat(termString, "' term as a variable."));
63
+ }
64
+ }
65
+ return termValidatesAsVariable;
66
+ }
67
+ function validateStatementAsMetavariableAndSubstitution(statement, assignments, stated, context) {
68
+ var statementValidatesAsMetavariableAndSubstitution = false;
69
+ var metavariable = (0, _statement.metavariableFromStatement)(statement, context);
70
+ if (metavariable !== null) {
71
+ var statementString = statement.getString();
72
+ context.trace("Validating the '".concat(statementString, "' statement as a metavariable and substitution..."));
73
+ var metavariableValidates = metavariable.validate(context);
74
+ if (metavariableValidates) {
75
+ var TermSubstitution = _elements.default.TermSubstitution, FrameSubstitution = _elements.default.FrameSubstitution, frameSubstitution = FrameSubstitution.fromStatement(statement, context), termSubstitution = TermSubstitution.fromStatement(statement, context), substitution = termSubstitution || frameSubstitution;
76
+ if (substitution !== null) {
77
+ var substitutionValidates = substitution.validate(context);
78
+ if (substitutionValidates) {
79
+ statementValidatesAsMetavariableAndSubstitution = true;
80
+ }
81
+ } else {
82
+ statementValidatesAsMetavariableAndSubstitution = true;
83
+ }
84
+ }
85
+ if (statementValidatesAsMetavariableAndSubstitution) {
86
+ context.debug("...validated the '".concat(statementString, "' statement as a metavariable and substitution."));
87
+ }
88
+ }
89
+ return statementValidatesAsMetavariableAndSubstitution;
90
+ }
91
+ function unifyStatementWithBracketedCombinator(statement, assignments, stated, context) {
92
+ stated = true; ///
93
+ assignments = null; ///
94
+ var BracketedCombinator = _elements.default.BracketedCombinator, bracketedCombinator = BracketedCombinator.fromNothing(), statementUnifiesWithBracketedCombinator = bracketedCombinator.unifyStatement(statement, assignments, stated, context);
95
+ return statementUnifiesWithBracketedCombinator;
96
+ }
97
+ function unifyStatementWithCombinators(statement, assignments, stated, context) {
98
+ stated = true; ///
99
+ assignments = null; ///
100
+ var combinators = context.getCombinators(), statementUnifiesWithCombinators = combinators.some(function(combinator) {
101
+ var unifiesWithCombinator = combinator.unifyStatement(statement, assignments, stated, context);
102
+ if (unifiesWithCombinator) {
103
+ return true;
104
+ }
105
+ });
106
+ return statementUnifiesWithCombinators;
107
+ }
108
+ function validateStatementAsEquality(statement, assignments, stated, context) {
109
+ var statementValidatesAsEquality = false;
110
+ var equality = (0, _statement.equalityFromStatement)(statement, context);
111
+ if (equality !== null) {
112
+ var statementString = statement.getString();
113
+ context.trace("Validating the '".concat(statementString, "' statement as an equality..."));
114
+ var equalityValidates = equality.validate(assignments, stated, context);
115
+ statementValidatesAsEquality = equalityValidates; ///
116
+ if (statementValidatesAsEquality) {
117
+ context.debug("...validated the '".concat(statementString, "' statement as an equality."));
118
+ }
119
+ }
120
+ return statementValidatesAsEquality;
121
+ }
122
+ function validateStatementAsJudgement(statement, assignments, stated, context) {
123
+ var validatesStatementAsJudgement = false;
124
+ var judgement = (0, _statement.judgementFromStatement)(statement, context);
125
+ if (judgement !== null) {
126
+ var statementString = statement.getString();
127
+ context.trace("Validating the '".concat(statementString, "' statement as a judgement..."));
128
+ var judgementValidates = judgement.validate(assignments, stated, context);
129
+ validatesStatementAsJudgement = judgementValidates; ///
130
+ if (validatesStatementAsJudgement) {
131
+ context.debug("...validated the '".concat(statementString, "' statement as a judgement."));
132
+ }
133
+ }
134
+ return validatesStatementAsJudgement;
135
+ }
136
+ function validateStatementAsTypeAssertion(statement, assignments, stated, context) {
137
+ var validatesStatementAsTypeAssertion = false;
138
+ var typeAssertion = (0, _statement.typeAssertionFromStatement)(statement, context);
139
+ if (typeAssertion !== null) {
140
+ var statementString = statement.getString();
141
+ context.trace("Validating the '".concat(statementString, "' statement as a type assertion..."));
142
+ var typeAssertionValidates = typeAssertion.validate(assignments, stated, context);
143
+ validatesStatementAsTypeAssertion = typeAssertionValidates; ///
144
+ if (validatesStatementAsTypeAssertion) {
145
+ var assertion = typeAssertion; ///
146
+ context.addAssertion(assertion);
147
+ context.debug("...validated the '".concat(statementString, "' statement as a type assertion."));
148
+ }
149
+ }
150
+ return validatesStatementAsTypeAssertion;
151
+ }
152
+ function validateStatementAsDefinedAssertion(statement, assignments, stated, context) {
153
+ var validatesStatementAsDefinedAssertion = false;
154
+ var definedAssertion = (0, _statement.definedAssertionFromStatement)(statement, context);
155
+ if (definedAssertion !== null) {
156
+ var statementString = statement.getString();
157
+ context.trace("Validating the '".concat(statementString, "' statement as a defined assertion..."));
158
+ var definedAssertionValidates = definedAssertion.validate(assignments, stated, context);
159
+ validatesStatementAsDefinedAssertion = definedAssertionValidates; ///
160
+ if (validatesStatementAsDefinedAssertion) {
161
+ var assertion = definedAssertion; ///
162
+ context.addAssertion(assertion);
163
+ context.debug("...validated the '".concat(statementString, "' statement as a defined assertion."));
164
+ }
165
+ }
166
+ return validatesStatementAsDefinedAssertion;
167
+ }
168
+ function validateStatementAsPropertyAssertion(statement, assignments, stated, context) {
169
+ var statementValidatesAsPropertyAssertion = false;
170
+ var propertyAssertion = (0, _statement.propertyAssertionFromStatement)(statement, context);
171
+ if (propertyAssertion !== null) {
172
+ var statementString = statement.getString();
173
+ context.trace("Validating the '".concat(statementString, "' statement as a property assertion..."));
174
+ var propertyAssertionValidates = propertyAssertion.validate(assignments, stated, context);
175
+ statementValidatesAsPropertyAssertion = propertyAssertionValidates; ///
176
+ if (statementValidatesAsPropertyAssertion) {
177
+ var assertion = propertyAssertion; ///
178
+ context.addAssertion(assertion);
179
+ context.debug("...validated the '".concat(statementString, "' statement as a property assertion."));
180
+ }
181
+ }
182
+ return statementValidatesAsPropertyAssertion;
183
+ }
184
+ function validateStatementAsSubproofAssertion(statement, assignments, stated, context) {
185
+ var statementValidatesAsSubproofAssertion = false;
186
+ var subproofAssertion = (0, _statement.subproofAssertionFromStatement)(statement, context);
187
+ if (subproofAssertion !== null) {
188
+ var statementString = statement.getString();
189
+ context.trace("Validating the '".concat(statementString, "' statement as a subproof assertion..."));
190
+ var subproofAssertionValidates = subproofAssertion.validate(assignments, stated, context);
191
+ statementValidatesAsSubproofAssertion = subproofAssertionValidates; ///
192
+ if (statementValidatesAsSubproofAssertion) {
193
+ var assertion = subproofAssertion; ///
194
+ context.addAssertion(assertion);
195
+ context.debug("...validated the '".concat(statementString, "' statement as a subproof assertion."));
196
+ }
197
+ }
198
+ return statementValidatesAsSubproofAssertion;
199
+ }
200
+ function validateStatementAsContainedAssertion(statement, assignments, stated, context) {
201
+ var validatesStatementAsContainedAssertion = false;
202
+ var containedAssertion = (0, _statement.containedAssertionFromStatement)(statement, context);
203
+ if (containedAssertion !== null) {
204
+ var statementString = statement.getString();
205
+ context.trace("Validating the '".concat(statementString, "' statement as a contained assertion..."));
206
+ var containedAssertionValidates = containedAssertion.validate(assignments, stated, context);
207
+ validatesStatementAsContainedAssertion = containedAssertionValidates; ///
208
+ if (validatesStatementAsContainedAssertion) {
209
+ var assertion = containedAssertion; ///
210
+ context.addAssertion(assertion);
211
+ context.debug("...validated the '".concat(statementString, "' statement as a contained assertion."));
212
+ }
213
+ }
214
+ return validatesStatementAsContainedAssertion;
215
+ }
216
+ function validateStatementAsSatisfiesAssertion(statement, assignments, stated, context) {
217
+ var validatesAStatementsSatisfiesAssertion = false;
218
+ var satisfiesAssertion = (0, _statement.satisfiesAssertionFromStatement)(statement, context);
219
+ if (satisfiesAssertion !== null) {
220
+ var statementString = statement.getString();
221
+ context.trace("Validating the '".concat(statementString, "' statement as a satisfies assertion..."));
222
+ var satisfiesAssertionValidates = satisfiesAssertion.validate(assignments, stated, context);
223
+ validatesAStatementsSatisfiesAssertion = satisfiesAssertionValidates; ///
224
+ if (validatesAStatementsSatisfiesAssertion) {
225
+ var assertion = satisfiesAssertion; ///
226
+ context.addAssertion(assertion);
227
+ context.debug("...validated the '".concat(statementString, "' statement as a satisfies assertion."));
228
+ }
229
+ }
230
+ return validatesAStatementsSatisfiesAssertion;
231
+ }
232
+ var validateTerms = [
233
+ unifyTermWithBracketedConstructor,
234
+ unifyTermWithConstructors,
235
+ validateTermAsVariable
236
+ ];
237
+ var validateStatements = [
238
+ validateStatementAsMetavariableAndSubstitution,
239
+ unifyStatementWithBracketedCombinator,
240
+ unifyStatementWithCombinators,
241
+ validateStatementAsEquality,
242
+ validateStatementAsJudgement,
243
+ validateStatementAsTypeAssertion,
244
+ validateStatementAsDefinedAssertion,
245
+ validateStatementAsPropertyAssertion,
246
+ validateStatementAsSubproofAssertion,
247
+ validateStatementAsContainedAssertion,
248
+ validateStatementAsSatisfiesAssertion
249
+ ];
250
+
251
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/validation.js"],"sourcesContent":["\"use strict\";\n\nimport elements from \"../elements\";\n\nimport { equalityFromStatement,\n         judgementFromStatement,\n         metavariableFromStatement,\n         typeAssertionFromStatement,\n         definedAssertionFromStatement,\n         propertyAssertionFromStatement,\n         subproofAssertionFromStatement,\n         containedAssertionFromStatement,\n         satisfiesAssertionFromStatement } from \"../utilities/statement\";\n\nfunction unifyTermWithBracketedConstructor(term, context, validateAhead) {\n  let termUnifiesWithBracketedConstructor;\n\n  const { BracketedConstructor } = elements,\n    bracketedConstructor = BracketedConstructor.fromNothing();\n\n  termUnifiesWithBracketedConstructor = bracketedConstructor.unifyTerm(term, context, validateAhead);\n\n  return termUnifiesWithBracketedConstructor;\n}\n\nfunction unifyTermWithConstructors(term, context, validateAhead) {\n  let termUnifiesWithConstructors;\n\n  const constructors = context.getConstructors();\n\n  termUnifiesWithConstructors = constructors.some((constructor) => {\n    const unifiesWithConstructor = constructor.unifyTerm(term, context, validateAhead);\n\n    if (unifiesWithConstructor) {\n      return true;\n    }\n  });\n\n  return termUnifiesWithConstructors;\n}\n\nfunction validateTermAsVariable(term, context, validateAhead) {\n  let termValidatesAsVariable = false;\n\n  const { Variable } = elements,\n    termNode = term.getNode(),\n    singularVariableNode = termNode.getSingularVariableNode();\n\n  if (singularVariableNode !== null) {\n    let variable;\n\n    const termString = term.getString(),\n      variableNode = singularVariableNode;  ///\n\n    variable = Variable.fromVariableNode(variableNode, context);\n\n    context.trace(`Verifying the '${termString}' term as a variable...`);\n\n    const variableValidates = variable.validate(context);\n\n    if (variableValidates) {\n      let verifiesAhead;\n\n      const variableIdentifier = variable.getIdentifier();\n\n      variable = context.findVariableByVariableIdentifier(variableIdentifier);\n\n      const type = variable.getType();\n\n      term.setType(type);\n\n      verifiesAhead = validateAhead();\n\n      termValidatesAsVariable = verifiesAhead; ///\n    }\n\n    if (termValidatesAsVariable) {\n      context.debug(`...verified the '${termString}' term as a variable.`);\n    }\n  }\n\n  return termValidatesAsVariable;\n}\n\nfunction validateStatementAsMetavariableAndSubstitution(statement, assignments, stated, context) {\n  let statementValidatesAsMetavariableAndSubstitution = false;\n\n  const metavariable = metavariableFromStatement(statement, context);\n\n  if (metavariable !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a metavariable and substitution...`);\n\n    const metavariableValidates = metavariable.validate(context);\n\n    if (metavariableValidates) {\n      const { TermSubstitution, FrameSubstitution } = elements,\n            frameSubstitution = FrameSubstitution.fromStatement(statement, context),\n            termSubstitution = TermSubstitution.fromStatement(statement, context),\n            substitution = (termSubstitution || frameSubstitution);\n\n      if (substitution !== null) {\n        const substitutionValidates = substitution.validate(context);\n\n        if (substitutionValidates) {\n          statementValidatesAsMetavariableAndSubstitution = true;\n        }\n      } else {\n        statementValidatesAsMetavariableAndSubstitution = true;\n      }\n    }\n\n    if (statementValidatesAsMetavariableAndSubstitution) {\n      context.debug(`...validated the '${statementString}' statement as a metavariable and substitution.`);\n    }\n  }\n\n  return statementValidatesAsMetavariableAndSubstitution;\n}\n\nfunction unifyStatementWithBracketedCombinator(statement, assignments, stated, context) {\n  stated = true;  ///\n\n  assignments = null; ///\n\n  const { BracketedCombinator } = elements,\n        bracketedCombinator = BracketedCombinator.fromNothing(),\n        statementUnifiesWithBracketedCombinator = bracketedCombinator.unifyStatement(statement, assignments, stated, context);\n\n  return statementUnifiesWithBracketedCombinator;\n}\n\nfunction unifyStatementWithCombinators(statement, assignments, stated, context) {\n  stated = true;  ///\n\n  assignments = null; ///\n\n  const combinators = context.getCombinators(),\n        statementUnifiesWithCombinators = combinators.some((combinator) => {\n          const unifiesWithCombinator = combinator.unifyStatement(statement, assignments, stated, context);\n\n          if (unifiesWithCombinator) {\n            return true;\n          }\n        });\n\n  return statementUnifiesWithCombinators;\n}\n\nfunction validateStatementAsEquality(statement, assignments, stated, context) {\n  let statementValidatesAsEquality = false;\n\n  const equality = equalityFromStatement(statement, context);\n\n  if (equality !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as an equality...`);\n\n    const equalityValidates = equality.validate(assignments, stated, context);\n\n    statementValidatesAsEquality = equalityValidates; ///\n\n    if (statementValidatesAsEquality) {\n      context.debug(`...validated the '${statementString}' statement as an equality.`);\n    }\n  }\n\n  return statementValidatesAsEquality;\n}\n\nfunction validateStatementAsJudgement(statement, assignments, stated, context) {\n  let validatesStatementAsJudgement = false;\n\n  const judgement = judgementFromStatement(statement, context);\n\n  if (judgement !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a judgement...`);\n\n    const judgementValidates = judgement.validate(assignments, stated, context);\n\n    validatesStatementAsJudgement = judgementValidates;  ///\n\n    if (validatesStatementAsJudgement) {\n      context.debug(`...validated the '${statementString}' statement as a judgement.`);\n    }\n  }\n\n  return validatesStatementAsJudgement;\n}\n\nfunction validateStatementAsTypeAssertion(statement, assignments, stated, context) {\n  let validatesStatementAsTypeAssertion = false;\n\n  const typeAssertion = typeAssertionFromStatement(statement, context);\n\n  if (typeAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a type assertion...`);\n\n    const typeAssertionValidates = typeAssertion.validate(assignments, stated, context);\n\n    validatesStatementAsTypeAssertion = typeAssertionValidates; ///\n\n    if (validatesStatementAsTypeAssertion) {\n      const assertion = typeAssertion;  ///\n\n      context.addAssertion(assertion);\n\n      context.debug(`...validated the '${statementString}' statement as a type assertion.`);\n    }\n  }\n\n  return validatesStatementAsTypeAssertion;\n}\n\nfunction validateStatementAsDefinedAssertion(statement, assignments, stated, context) {\n  let validatesStatementAsDefinedAssertion = false;\n\n  const definedAssertion = definedAssertionFromStatement(statement, context);\n\n  if (definedAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a defined assertion...`);\n\n    const definedAssertionValidates = definedAssertion.validate(assignments, stated, context);\n\n    validatesStatementAsDefinedAssertion = definedAssertionValidates; ///\n\n    if (validatesStatementAsDefinedAssertion) {\n      const assertion = definedAssertion;  ///\n\n      context.addAssertion(assertion);\n\n      context.debug(`...validated the '${statementString}' statement as a defined assertion.`);\n    }\n  }\n\n  return validatesStatementAsDefinedAssertion;\n}\n\nfunction validateStatementAsPropertyAssertion(statement, assignments, stated, context) {\n  let statementValidatesAsPropertyAssertion = false;\n\n  const propertyAssertion = propertyAssertionFromStatement(statement, context);\n\n  if (propertyAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a property assertion...`);\n\n    const propertyAssertionValidates = propertyAssertion.validate(assignments, stated, context);\n\n    statementValidatesAsPropertyAssertion = propertyAssertionValidates; ///\n\n    if (statementValidatesAsPropertyAssertion) {\n      const assertion = propertyAssertion; ///\n\n      context.addAssertion(assertion);\n\n      context.debug(`...validated the '${statementString}' statement as a property assertion.`);\n    }\n  }\n\n  return statementValidatesAsPropertyAssertion;\n}\n\nfunction validateStatementAsSubproofAssertion(statement, assignments, stated, context) {\n  let statementValidatesAsSubproofAssertion = false;\n\n  const subproofAssertion = subproofAssertionFromStatement(statement, context);\n\n  if (subproofAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a subproof assertion...`);\n\n    const subproofAssertionValidates = subproofAssertion.validate(assignments, stated, context);\n\n    statementValidatesAsSubproofAssertion = subproofAssertionValidates; ///\n\n    if (statementValidatesAsSubproofAssertion) {\n      const assertion = subproofAssertion; ///\n\n      context.addAssertion(assertion);\n\n      context.debug(`...validated the '${statementString}' statement as a subproof assertion.`);\n    }\n  }\n\n  return statementValidatesAsSubproofAssertion;\n}\n\nfunction validateStatementAsContainedAssertion(statement, assignments, stated, context) {\n  let validatesStatementAsContainedAssertion = false;\n\n  const containedAssertion = containedAssertionFromStatement(statement, context);\n\n  if (containedAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a contained assertion...`);\n\n    const containedAssertionValidates = containedAssertion.validate(assignments, stated, context);\n\n    validatesStatementAsContainedAssertion = containedAssertionValidates; ///\n\n    if (validatesStatementAsContainedAssertion) {\n      const assertion = containedAssertion; ///\n\n      context.addAssertion(assertion);\n\n      context.debug(`...validated the '${statementString}' statement as a contained assertion.`);\n    }\n  }\n\n  return validatesStatementAsContainedAssertion;\n}\n\nfunction validateStatementAsSatisfiesAssertion(statement, assignments, stated, context) {\n  let validatesAStatementsSatisfiesAssertion = false;\n\n  const satisfiesAssertion = satisfiesAssertionFromStatement(statement, context);\n\n  if (satisfiesAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Validating the '${statementString}' statement as a satisfies assertion...`);\n\n    const satisfiesAssertionValidates = satisfiesAssertion.validate(assignments, stated, context);\n\n    validatesAStatementsSatisfiesAssertion = satisfiesAssertionValidates; ///\n\n    if (validatesAStatementsSatisfiesAssertion) {\n      const assertion = satisfiesAssertion; ///\n\n      context.addAssertion(assertion);\n\n      context.debug(`...validated the '${statementString}' statement as a satisfies assertion.`);\n    }\n  }\n\n  return validatesAStatementsSatisfiesAssertion;\n}\n\nexport const validateTerms = [\n  unifyTermWithBracketedConstructor,\n  unifyTermWithConstructors,\n  validateTermAsVariable\n];\n\nexport const validateStatements = [\n  validateStatementAsMetavariableAndSubstitution,\n  unifyStatementWithBracketedCombinator,\n  unifyStatementWithCombinators,\n  validateStatementAsEquality,\n  validateStatementAsJudgement,\n  validateStatementAsTypeAssertion,\n  validateStatementAsDefinedAssertion,\n  validateStatementAsPropertyAssertion,\n  validateStatementAsSubproofAssertion,\n  validateStatementAsContainedAssertion,\n  validateStatementAsSatisfiesAssertion\n];\n"],"names":["validateStatements","validateTerms","unifyTermWithBracketedConstructor","term","context","validateAhead","termUnifiesWithBracketedConstructor","BracketedConstructor","elements","bracketedConstructor","fromNothing","unifyTerm","unifyTermWithConstructors","termUnifiesWithConstructors","constructors","getConstructors","some","constructor","unifiesWithConstructor","validateTermAsVariable","termValidatesAsVariable","Variable","termNode","getNode","singularVariableNode","getSingularVariableNode","variable","termString","getString","variableNode","fromVariableNode","trace","variableValidates","validate","verifiesAhead","variableIdentifier","getIdentifier","findVariableByVariableIdentifier","type","getType","setType","debug","validateStatementAsMetavariableAndSubstitution","statement","assignments","stated","statementValidatesAsMetavariableAndSubstitution","metavariable","metavariableFromStatement","statementString","metavariableValidates","TermSubstitution","FrameSubstitution","frameSubstitution","fromStatement","termSubstitution","substitution","substitutionValidates","unifyStatementWithBracketedCombinator","BracketedCombinator","bracketedCombinator","statementUnifiesWithBracketedCombinator","unifyStatement","unifyStatementWithCombinators","combinators","getCombinators","statementUnifiesWithCombinators","combinator","unifiesWithCombinator","validateStatementAsEquality","statementValidatesAsEquality","equality","equalityFromStatement","equalityValidates","validateStatementAsJudgement","validatesStatementAsJudgement","judgement","judgementFromStatement","judgementValidates","validateStatementAsTypeAssertion","validatesStatementAsTypeAssertion","typeAssertion","typeAssertionFromStatement","typeAssertionValidates","assertion","addAssertion","validateStatementAsDefinedAssertion","validatesStatementAsDefinedAssertion","definedAssertion","definedAssertionFromStatement","definedAssertionValidates","validateStatementAsPropertyAssertion","statementValidatesAsPropertyAssertion","propertyAssertion","propertyAssertionFromStatement","propertyAssertionValidates","validateStatementAsSubproofAssertion","statementValidatesAsSubproofAssertion","subproofAssertion","subproofAssertionFromStatement","subproofAssertionValidates","validateStatementAsContainedAssertion","validatesStatementAsContainedAssertion","containedAssertion","containedAssertionFromStatement","containedAssertionValidates","validateStatementAsSatisfiesAssertion","validatesAStatementsSatisfiesAssertion","satisfiesAssertion","satisfiesAssertionFromStatement","satisfiesAssertionValidates"],"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": "1.0.438",
4
+ "version": "1.0.444",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -12,11 +12,11 @@
12
12
  "dependencies": {
13
13
  "argumentative": "^2.0.36",
14
14
  "necessary": "^17.0.9",
15
- "occam-custom-grammars": "^5.0.1338",
16
- "occam-entities": "^1.0.442",
17
- "occam-file-system": "^6.0.457",
18
- "occam-furtle": "^2.0.276",
19
- "occam-grammars": "^1.3.433",
15
+ "occam-custom-grammars": "^5.0.1339",
16
+ "occam-entities": "^1.0.443",
17
+ "occam-file-system": "^6.0.458",
18
+ "occam-furtle": "^2.0.277",
19
+ "occam-grammars": "^1.3.435",
20
20
  "occam-lexers": "^23.1.34",
21
21
  "occam-parsers": "^23.1.37",
22
22
  "occam-query": "^4.1.142"
@@ -4,8 +4,8 @@ import { arrayUtilities } from "necessary";
4
4
 
5
5
  import elements from "../elements";
6
6
 
7
- import { baseType } from "../element/type";
8
7
  import { verifyFile } from "../process/verify";
8
+ import { baseTypeFromNothing } from "../types";
9
9
  import { nodeAsString, nodesAsString } from "../utilities/node";
10
10
  import { typesFromJSON,
11
11
  rulesFromJSON,
@@ -329,9 +329,9 @@ export default class FileContext {
329
329
  findMetaLemmaByReference(reference) {
330
330
  const metaLemmas = this.getMetaLemmas(),
331
331
  metaLemma = metaLemmas.find((metaLemma) => {
332
- const referenceMatches = metaLemma.matchReference(reference);
332
+ const metaLemmaComparesToReference = metaLemma.compareReference(reference);
333
333
 
334
- if (referenceMatches) {
334
+ if (metaLemmaComparesToReference) {
335
335
  return true;
336
336
  }
337
337
  }) || null;
@@ -342,9 +342,9 @@ export default class FileContext {
342
342
  findMetatheoremByReference(reference) {
343
343
  const metatheorems = this.getMetatheorems(),
344
344
  metatheorem = metatheorems.find((metatheorem) => {
345
- const referenceMatches = metatheorem.matchReference(reference);
345
+ const metatheoremComparesToReference = metatheorem.compareReference(reference);
346
346
 
347
- if (referenceMatches) {
347
+ if (metatheoremComparesToReference) {
348
348
  return true;
349
349
  }
350
350
  }) || null;
@@ -356,9 +356,9 @@ export default class FileContext {
356
356
  const rules = this.getRules(),
357
357
  metavariableName = reference.getMetavariableName(),
358
358
  rule = rules.find((rule) => {
359
- const metavariableNameMatches = rule.matchMetavariableName(metavariableName);
359
+ const ruleComparesToMetavariableName = rule.compareMetavariableName(metavariableName);
360
360
 
361
- if (metavariableNameMatches) {
361
+ if (ruleComparesToMetavariableName) {
362
362
  return true;
363
363
  }
364
364
  }) || null;
@@ -370,9 +370,9 @@ export default class FileContext {
370
370
  const axioms = this.getAxioms(),
371
371
  metavariableName = reference.getMetavariableName(),
372
372
  axiom = axioms.find((axiom) => {
373
- const metavariableNameMatches = axiom.matchMetavariableName(metavariableName);
373
+ const axiomComparesToMetavariableName = axiom.compareMetavariableName(metavariableName);
374
374
 
375
- if (metavariableNameMatches) {
375
+ if (axiomComparesToMetavariableName) {
376
376
  return true;
377
377
  }
378
378
  }) || null;
@@ -384,9 +384,9 @@ export default class FileContext {
384
384
  const lemmas = this.getLemmas(),
385
385
  metavariableName = reference.getMetavariableName(),
386
386
  lemma = lemmas.find((lemma) => {
387
- const metavariableNameMatches = lemma.matchMetavariableName(metavariableName);
387
+ const lemmaComparesToMetavariableName = lemma.compareMetavariableName(metavariableName);
388
388
 
389
- if (metavariableNameMatches) {
389
+ if (lemmaComparesToMetavariableName) {
390
390
  return true;
391
391
  }
392
392
  }) || null;
@@ -398,9 +398,9 @@ export default class FileContext {
398
398
  const theorems = this.getTheorems(),
399
399
  metavariableName = reference.getMetavariableName(),
400
400
  theorem = theorems.find((theorem) => {
401
- const metavariableNameMatches = theorem.matchMetavariableName(metavariableName);
401
+ const theoremComparesToMetavariableName = theorem.compareMetavariableName(metavariableName);
402
402
 
403
- if (metavariableNameMatches) {
403
+ if (theoremComparesToMetavariableName) {
404
404
  return true;
405
405
  }
406
406
  }) || null;
@@ -425,9 +425,9 @@ export default class FileContext {
425
425
  const conjectures = this.getConjectures(),
426
426
  metavariableName = reference.getMetavariableName(),
427
427
  conjecture = conjectures.find((conjecture) => {
428
- const metavariableNameMatches = conjecture.matchMetavariableName(metavariableName);
428
+ const conjectureComparesToMetavariableName = conjecture.compareMetavariableName(metavariableName);
429
429
 
430
- if (metavariableNameMatches) {
430
+ if (conjectureComparesToMetavariableName) {
431
431
  return true;
432
432
  }
433
433
  }) || null;
@@ -519,15 +519,17 @@ export default class FileContext {
519
519
  findTypeByTypeName(typeName, includeRelease = true, includeDependencies = true) {
520
520
  let types = this.getTypes(includeRelease, includeDependencies);
521
521
 
522
+ const baseType = baseTypeFromNothing();
523
+
522
524
  types = [
523
525
  ...types,
524
526
  baseType
525
527
  ];
526
528
 
527
529
  const type = types.find((type) => {
528
- const typeNameMatches = type.matchTypeName(typeName);
530
+ const typeComparesToTypeName = type.compareTypeName(typeName);
529
531
 
530
- if (typeNameMatches) {
532
+ if (typeComparesToTypeName) {
531
533
  return true;
532
534
  }
533
535
  }) || null;
@@ -538,15 +540,17 @@ export default class FileContext {
538
540
  findTypeByNominalTypeName(nominalTypeName) {
539
541
  let types = this.getTypes();
540
542
 
543
+ const baseType = baseTypeFromNothing();
544
+
541
545
  types = [
542
546
  ...types,
543
547
  baseType
544
548
  ];
545
549
 
546
550
  const type = types.find((type) => {
547
- const typeNameMatches = type.matchNominalTypeName(nominalTypeName);
551
+ const typeComparesToNominalTypeName = type.compareNominalTypeName(nominalTypeName);
548
552
 
549
- if (typeNameMatches) {
553
+ if (typeComparesToNominalTypeName) {
550
554
  return true;
551
555
  }
552
556
  }) || null;
@@ -557,15 +561,17 @@ export default class FileContext {
557
561
  findTypeByPrefixedTypeName(prefixedTypeName) {
558
562
  let types = this.getTypes();
559
563
 
564
+ const baseType = baseTypeFromNothing();
565
+
560
566
  types = [
561
567
  ...types,
562
568
  baseType
563
569
  ];
564
570
 
565
571
  const type = types.find((type) => {
566
- const typeNameMatches = type.matchPrefixedTypeName(prefixedTypeName);
572
+ const typeComparesToPrefixedTypeName = type.comparePrefixedTypeName(prefixedTypeName);
567
573
 
568
- if (typeNameMatches) {
574
+ if (typeComparesToPrefixedTypeName) {
569
575
  return true;
570
576
  }
571
577
  }) || null;
@@ -576,9 +582,9 @@ export default class FileContext {
576
582
  findMetaTypeByMetaTypeName(metaTypeName) {
577
583
  const metaTypes = this.getMetaTypes(),
578
584
  metaType = metaTypes.find((metaType) => {
579
- const metaTypeNameMatches = metaType.matchMetaTypeName(metaTypeName);
585
+ const metaTypeComparesToMetaTypeName = metaType.compareMetaTypeName(metaTypeName);
580
586
 
581
- if (metaTypeNameMatches) {
587
+ if (metaTypeComparesToMetaTypeName) {
582
588
  return true;
583
589
  }
584
590
  }) || null;
@@ -589,9 +595,9 @@ export default class FileContext {
589
595
  findTypePrefixByTypePrefixName(typePrefixName) {
590
596
  const typePrefixes = this.getTypePrefixes(),
591
597
  typePrefix = typePrefixes.find((typePrefix) => {
592
- const typePrefixNameMatches = typePrefix.matchTypePrefixName(typePrefixName);
598
+ const typePrefixComparesToTypePrefixName = typePrefix.compareTypePrefixName(typePrefixName);
593
599
 
594
- if (typePrefixNameMatches) {
600
+ if (typePrefixComparesToTypePrefixName) {
595
601
  return true;
596
602
  }
597
603
  }) || null;
@@ -602,9 +608,9 @@ export default class FileContext {
602
608
  findVariableByVariableIdentifier(variableIdentifier) {
603
609
  const variables = this.getVariables(),
604
610
  variable = variables.find((variable) => {
605
- const variableIdentifierMatches = variable.matchVariableIdentifier(variableIdentifier);
611
+ const variableComparesToVariableIdentifier = variable.compareVariableIdentifier(variableIdentifier);
606
612
 
607
- if (variableIdentifierMatches) {
613
+ if (variableComparesToVariableIdentifier) {
608
614
  return true;
609
615
  }
610
616
  }) || null;
@@ -615,9 +621,9 @@ export default class FileContext {
615
621
  findLabelByMetavariableName(metavariableName) {
616
622
  const labels = this.getLabels(),
617
623
  label = labels.find((label) => {
618
- const metavariableNameMatches = label.matchMetavariableName(metavariableName);
624
+ const labelComparesToMetavariableName = label.compareMetavariableName(metavariableName);
619
625
 
620
- if (metavariableNameMatches) {
626
+ if (labelComparesToMetavariableName) {
621
627
  return true;
622
628
  }
623
629
  }) || null;
@@ -659,9 +665,9 @@ export default class FileContext {
659
665
  findMetavariableByMetavariableName(metavariableName) {
660
666
  const metavariables = this.getMetavariables(),
661
667
  metavariable = metavariables.find((metavariable) => {
662
- const metavariableNameMatches = metavariable.matchMetavariableName(metavariableName);
668
+ const metavariableComparesToMetavariableName = metavariable.compareMetavariableName(metavariableName);
663
669
 
664
- if (metavariableNameMatches) {
670
+ if (metavariableComparesToMetavariableName) {
665
671
  return true;
666
672
  }
667
673
  }) || null;
@@ -216,9 +216,9 @@ class LocalContext {
216
216
  findVariableByVariableIdentifier(variableIdentifier, nested = true) {
217
217
  const variables = this.getVariables(nested),
218
218
  variable = variables.find((variable) => {
219
- const variableIdentifierMatches = variable.matchVariableIdentifier(variableIdentifier);
219
+ const variableComparesToVariableIdentifier = variable.compareVariableIdentifier(variableIdentifier);
220
220
 
221
- if (variableIdentifierMatches) {
221
+ if (variableComparesToVariableIdentifier) {
222
222
  return true;
223
223
  }
224
224
  }) || null;
@@ -306,7 +306,7 @@ class LocalContext {
306
306
 
307
307
  const termMatchesGroundedTerm = groundedTerms.some((groundedTerm) => {
308
308
  const groundedTermNode = groundedTerm.getNode(),
309
- groundedTermNodeMatches = term.matchTermNode(groundedTermNode);
309
+ groundedTermNodeMatches = term.matchNode(groundedTermNode);
310
310
 
311
311
  if (groundedTermNodeMatches) {
312
312
  return true;
@@ -344,18 +344,18 @@ class LocalContext {
344
344
  return metavariableDefined
345
345
  }
346
346
 
347
- matchTermAndPropertyRelation(term, propertyRelation) {
347
+ compareTermAndPropertyRelation(term, propertyRelation) {
348
348
  const context = this, ///
349
349
  steps = this.getSteps(),
350
- termAndPropertyRelationMatches = steps.some((step) => {
351
- const termAndPropertyRelationMatches = step.matchTermAndPropertyRelation(term, propertyRelation, context);
350
+ comparesToTermAndPropertyRelation = steps.some((step) => {
351
+ const comparesToTermAndPropertyRelation = step.compareTermAndPropertyRelation(term, propertyRelation, context);
352
352
 
353
- if (termAndPropertyRelationMatches) {
353
+ if (comparesToTermAndPropertyRelation) {
354
354
  return true;
355
355
  }
356
356
  });
357
357
 
358
- return termAndPropertyRelationMatches;
358
+ return comparesToTermAndPropertyRelation;
359
359
  }
360
360
 
361
361
  nodeAsString(node) { return this.context.nodeAsString(node); }
@@ -10,8 +10,8 @@ import FileContext from "../context/file";
10
10
  import NominalLexer from "../nominal/lexer";
11
11
  import NominalParser from "../nominal/parser";
12
12
 
13
- import { frameMetaType, referenceMetaType, statementMetaType } from "../element/metaType";
14
13
  import { customGrammarFromNameAndEntries, combinedCustomGrammarFromReleaseContexts } from "../utilities/customGrammar";
14
+ import { frameMetaTypeFromNothing, referenceMetaTypeFromNothing, statementMetaTypeFromNothing } from "../metaTypes";
15
15
 
16
16
  const { nominalLexerFromCombinedCustomGrammar } = lexersUtilities,
17
17
  { nominalParserFromCombinedCustomGrammar } = parsersUtilities,
@@ -58,11 +58,14 @@ export default class ReleaseContext {
58
58
  }
59
59
 
60
60
  getMetaTypes() {
61
- const metaTypes = [
62
- frameMetaType,
63
- referenceMetaType,
64
- statementMetaType
65
- ];
61
+ const frameMetaType = frameMetaTypeFromNothing(),
62
+ referenceMetaType = referenceMetaTypeFromNothing(),
63
+ statementMetaType = statementMetaTypeFromNothing(),
64
+ metaTypes = [
65
+ frameMetaType,
66
+ referenceMetaType,
67
+ statementMetaType
68
+ ];
66
69
 
67
70
  return metaTypes;
68
71
  }