occam-verify-cli 1.0.935 → 1.0.936
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/action/verify.js +2 -2
- package/lib/element/assertion/contained.js +5 -5
- package/lib/element/assertion/defined.js +5 -5
- package/lib/element/assertion/property.js +5 -5
- package/lib/element/assertion/signature.js +5 -5
- package/lib/element/assertion/subproof.js +5 -5
- package/lib/element/assertion/type.js +7 -7
- package/lib/element/assertion.js +3 -3
- package/lib/element/assumption/metaLevel.js +7 -7
- package/lib/element/assumption.js +6 -6
- package/lib/element/combinator.js +7 -7
- package/lib/element/conclusion.js +7 -7
- package/lib/element/constructor.js +7 -7
- package/lib/element/declaration/combinator.js +3 -3
- package/lib/element/declaration/complexType.js +3 -3
- package/lib/element/declaration/constructor.js +3 -3
- package/lib/element/declaration/metavariable.js +3 -3
- package/lib/element/declaration/property.js +3 -3
- package/lib/element/declaration/simpleType.js +3 -3
- package/lib/element/declaration/typePrefix.js +3 -3
- package/lib/element/declaration/variable.js +3 -3
- package/lib/element/deduction.js +7 -7
- package/lib/element/derivation.js +3 -3
- package/lib/element/equality.js +7 -7
- package/lib/element/equivalence.js +3 -3
- package/lib/element/frame.js +7 -7
- package/lib/element/hypothesis.js +7 -7
- package/lib/element/judgement.js +7 -7
- package/lib/element/label.js +7 -7
- package/lib/element/metaType.js +6 -6
- package/lib/element/metavariable.js +6 -6
- package/lib/element/parameter.js +7 -7
- package/lib/element/procedureCall.js +7 -7
- package/lib/element/procedureReference.js +7 -7
- package/lib/element/proof.js +3 -3
- package/lib/element/proofAssertion/premise.js +7 -7
- package/lib/element/proofAssertion/step.js +3 -3
- package/lib/element/proofAssertion/supposition.js +7 -7
- package/lib/element/proofAssertion.js +3 -3
- package/lib/element/property.js +7 -7
- package/lib/element/propertyRelation.js +7 -7
- package/lib/element/reference.js +7 -7
- package/lib/element/rule.js +6 -6
- package/lib/element/section.js +3 -3
- package/lib/element/signature.js +7 -7
- package/lib/element/statement.js +5 -5
- package/lib/element/subDerivation.js +3 -3
- package/lib/element/subproof.js +3 -3
- package/lib/element/substitution/frame.js +5 -5
- package/lib/element/substitution/reference.js +5 -5
- package/lib/element/substitution/statement.js +5 -5
- package/lib/element/substitution/term.js +5 -5
- package/lib/element/substitution.js +10 -10
- package/lib/element/term.js +7 -7
- package/lib/element/topLevelAssertion.js +6 -6
- package/lib/element/topLevelMetaAssertion.js +6 -6
- package/lib/element/type.js +9 -9
- package/lib/element/typePrefix.js +7 -7
- package/lib/element/variable.js +7 -7
- package/lib/utilities/element.js +109 -109
- package/package.json +2 -2
- package/src/action/verify.js +1 -1
- package/src/element/assertion/contained.js +4 -4
- package/src/element/assertion/defined.js +4 -4
- package/src/element/assertion/property.js +4 -4
- package/src/element/assertion/signature.js +4 -4
- package/src/element/assertion/subproof.js +4 -4
- package/src/element/assertion/type.js +6 -6
- package/src/element/assertion.js +2 -2
- package/src/element/assumption/metaLevel.js +6 -6
- package/src/element/assumption.js +6 -6
- package/src/element/combinator.js +6 -6
- package/src/element/conclusion.js +6 -6
- package/src/element/constructor.js +6 -6
- package/src/element/declaration/combinator.js +2 -2
- package/src/element/declaration/complexType.js +2 -2
- package/src/element/declaration/constructor.js +2 -2
- package/src/element/declaration/metavariable.js +2 -2
- package/src/element/declaration/property.js +2 -2
- package/src/element/declaration/simpleType.js +2 -2
- package/src/element/declaration/typePrefix.js +2 -2
- package/src/element/declaration/variable.js +2 -2
- package/src/element/deduction.js +6 -6
- package/src/element/derivation.js +2 -2
- package/src/element/equality.js +6 -6
- package/src/element/equivalence.js +2 -2
- package/src/element/frame.js +6 -6
- package/src/element/hypothesis.js +6 -6
- package/src/element/judgement.js +6 -6
- package/src/element/label.js +6 -6
- package/src/element/metaType.js +6 -6
- package/src/element/metavariable.js +6 -6
- package/src/element/parameter.js +6 -6
- package/src/element/procedureCall.js +6 -6
- package/src/element/procedureReference.js +6 -6
- package/src/element/proof.js +2 -2
- package/src/element/proofAssertion/premise.js +6 -6
- package/src/element/proofAssertion/step.js +2 -2
- package/src/element/proofAssertion/supposition.js +6 -6
- package/src/element/proofAssertion.js +2 -2
- package/src/element/property.js +6 -6
- package/src/element/propertyRelation.js +6 -6
- package/src/element/reference.js +6 -6
- package/src/element/rule.js +6 -6
- package/src/element/section.js +2 -2
- package/src/element/signature.js +6 -6
- package/src/element/statement.js +4 -4
- package/src/element/subDerivation.js +2 -2
- package/src/element/subproof.js +2 -2
- package/src/element/substitution/frame.js +4 -4
- package/src/element/substitution/reference.js +4 -4
- package/src/element/substitution/statement.js +4 -4
- package/src/element/substitution/term.js +4 -4
- package/src/element/substitution.js +9 -9
- package/src/element/term.js +6 -6
- package/src/element/topLevelAssertion.js +6 -6
- package/src/element/topLevelMetaAssertion.js +6 -6
- package/src/element/type.js +8 -8
- package/src/element/typePrefix.js +6 -6
- package/src/element/variable.js +6 -6
- package/src/utilities/element.js +122 -122
package/src/utilities/element.js
CHANGED
|
@@ -31,11 +31,11 @@ export function typeFromTypeNode(typeNode, context) {
|
|
|
31
31
|
nominalTypeName = nominalTypeNameFromTypeNode(typeNode, context),
|
|
32
32
|
typeString = typeStringFromNominalTypeName(nominalTypeName),
|
|
33
33
|
string = typeString, ///
|
|
34
|
-
|
|
34
|
+
breakPoint = null;
|
|
35
35
|
|
|
36
36
|
context = null;
|
|
37
37
|
|
|
38
|
-
type = new Type(context, string, node,
|
|
38
|
+
type = new Type(context, string, node, breakPoint, name, prefixName, superTypes, properties, provisional);
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
return type;
|
|
@@ -45,13 +45,13 @@ export function termFromTermNode(termNode, context) {
|
|
|
45
45
|
const { Term } = elements,
|
|
46
46
|
node = termNode, ///
|
|
47
47
|
string = context.nodeAsString(node),
|
|
48
|
-
|
|
48
|
+
breakPoint = null,
|
|
49
49
|
type = typeFromTermNode(termNode, context),
|
|
50
50
|
provisional = provisionalFromTermNode(termNode, context);
|
|
51
51
|
|
|
52
52
|
context = null;
|
|
53
53
|
|
|
54
|
-
const term = new Term(context, string, node,
|
|
54
|
+
const term = new Term(context, string, node, breakPoint, type, provisional);
|
|
55
55
|
|
|
56
56
|
return term;
|
|
57
57
|
}
|
|
@@ -60,14 +60,14 @@ export function stepFromStepNode(stepNode, context) {
|
|
|
60
60
|
const { Step } = elements,
|
|
61
61
|
node = stepNode, ///
|
|
62
62
|
string = context.nodeAsString(node),
|
|
63
|
-
|
|
63
|
+
breakPoint = null,
|
|
64
64
|
statement = statementFromStepNode(stepNode, context),
|
|
65
65
|
reference = referenceFromStepNode(stepNode, context),
|
|
66
66
|
signatureAssertion = signatureAssertionFromStepNode(stepNode, context);
|
|
67
67
|
|
|
68
68
|
context = null;
|
|
69
69
|
|
|
70
|
-
const step = new Step(context, string, node,
|
|
70
|
+
const step = new Step(context, string, node, breakPoint, statement, reference, signatureAssertion);
|
|
71
71
|
|
|
72
72
|
return step;
|
|
73
73
|
}
|
|
@@ -81,11 +81,11 @@ export function ruleFromRuleNode(ruleNode, context) {
|
|
|
81
81
|
ruleString = rulsStringFromLabelsPremisesAndConclusion(labels, premises, conclusion),
|
|
82
82
|
node = ruleNode, ///
|
|
83
83
|
string = ruleString, ///
|
|
84
|
-
|
|
84
|
+
breakPoint = null;
|
|
85
85
|
|
|
86
86
|
context = null;
|
|
87
87
|
|
|
88
|
-
const rule = new Rule(context, string, node,
|
|
88
|
+
const rule = new Rule(context, string, node, breakPoint, proof, labels, premises, conclusion);
|
|
89
89
|
|
|
90
90
|
return rule;
|
|
91
91
|
}
|
|
@@ -94,9 +94,9 @@ export function labelFromLabelNode(labelNode, context) {
|
|
|
94
94
|
const { Label } = elements,
|
|
95
95
|
node = labelNode, ///
|
|
96
96
|
string = context.nodeAsString(node),
|
|
97
|
-
|
|
97
|
+
breakPoint = null,
|
|
98
98
|
metavariable = metavariableFromLabelNode(labelNode, context),
|
|
99
|
-
label = new Label(context, string, node,
|
|
99
|
+
label = new Label(context, string, node, breakPoint, metavariable);
|
|
100
100
|
|
|
101
101
|
return label;
|
|
102
102
|
}
|
|
@@ -105,11 +105,11 @@ export function errorFromErrorNode(errorNode, context) {
|
|
|
105
105
|
const { Error } = elements,
|
|
106
106
|
node = errorNode, ///
|
|
107
107
|
string = context.nodeAsString(node),
|
|
108
|
-
|
|
108
|
+
breakPoint = null;
|
|
109
109
|
|
|
110
110
|
context = null;
|
|
111
111
|
|
|
112
|
-
const error = new Error(context, string, node,
|
|
112
|
+
const error = new Error(context, string, node, breakPoint);
|
|
113
113
|
|
|
114
114
|
return error;
|
|
115
115
|
}
|
|
@@ -126,11 +126,11 @@ export function lemmaFromLemmaNode(lemmaNode, context) {
|
|
|
126
126
|
topLevelAsssertionString = topLevelAssertionStringFromLabelsSignatureSuppositionsAndDeduction(labels, signature, suppositions, deduction),
|
|
127
127
|
node = lemmaNode, ///
|
|
128
128
|
string = topLevelAsssertionString, ///
|
|
129
|
-
|
|
129
|
+
breakPoint = null;
|
|
130
130
|
|
|
131
131
|
context = null;
|
|
132
132
|
|
|
133
|
-
const lemma = new Lemma(context, string, node,
|
|
133
|
+
const lemma = new Lemma(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses);
|
|
134
134
|
|
|
135
135
|
return lemma;
|
|
136
136
|
}
|
|
@@ -139,13 +139,13 @@ export function frameFromFrameNode(frameNode, context) {
|
|
|
139
139
|
const { Frame } = elements,
|
|
140
140
|
node = frameNode, ///
|
|
141
141
|
string = context.nodeAsString(node),
|
|
142
|
-
|
|
142
|
+
breakPoint = null,
|
|
143
143
|
assumptions = assumptionsFromFrameNode(frameNode, context),
|
|
144
144
|
metavariable = metavariableFromFrameNode(frameNode, context);
|
|
145
145
|
|
|
146
146
|
context = null;
|
|
147
147
|
|
|
148
|
-
const frame = new Frame(context, string, node,
|
|
148
|
+
const frame = new Frame(context, string, node, breakPoint, assumptions, metavariable);
|
|
149
149
|
|
|
150
150
|
return frame;
|
|
151
151
|
}
|
|
@@ -154,12 +154,12 @@ export function proofFromProofNode(proofNode, context) {
|
|
|
154
154
|
const { Proof } = elements,
|
|
155
155
|
node = proofNode, ///
|
|
156
156
|
string = null,
|
|
157
|
-
|
|
157
|
+
breakPoint = null,
|
|
158
158
|
derivation = derivationFromProofNode(proofNode, context);
|
|
159
159
|
|
|
160
160
|
context = null;
|
|
161
161
|
|
|
162
|
-
const proof = new Proof(context, string, node,
|
|
162
|
+
const proof = new Proof(context, string, node, breakPoint, derivation);
|
|
163
163
|
|
|
164
164
|
return proof;
|
|
165
165
|
}
|
|
@@ -176,11 +176,11 @@ export function axiomFromAxiomNode(axiomNode, context) {
|
|
|
176
176
|
topLevelAsssertionString = topLevelAssertionStringFromLabelsSignatureSuppositionsAndDeduction(labels, signature, suppositions, deduction),
|
|
177
177
|
node = axiomNode, ///
|
|
178
178
|
string = topLevelAsssertionString, ///
|
|
179
|
-
|
|
179
|
+
breakPoint = null;
|
|
180
180
|
|
|
181
181
|
context = null;
|
|
182
182
|
|
|
183
|
-
const axiom = new Axiom(context, string, node,
|
|
183
|
+
const axiom = new Axiom(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses);
|
|
184
184
|
|
|
185
185
|
return axiom;
|
|
186
186
|
}
|
|
@@ -193,11 +193,11 @@ export function sectionFromSectionNode(sectionNode, context) {
|
|
|
193
193
|
sectionString = sectionStringFromHypothesesAndTopLevelAssertion(hypotheses, topLevelAssertion),
|
|
194
194
|
node = sectionNode, ///
|
|
195
195
|
string = sectionString, ///
|
|
196
|
-
|
|
196
|
+
breakPoint = null;
|
|
197
197
|
|
|
198
198
|
context = null;
|
|
199
199
|
|
|
200
|
-
const section = new Section(context, string, node,
|
|
200
|
+
const section = new Section(context, string, node, breakPoint, hypotheses, topLevelAssertion);
|
|
201
201
|
|
|
202
202
|
return section;
|
|
203
203
|
}
|
|
@@ -206,10 +206,10 @@ export function premiseFromPremiseNode(premiseNode, context) {
|
|
|
206
206
|
const { Premise } = elements,
|
|
207
207
|
node = premiseNode, ///
|
|
208
208
|
string = context.nodeAsString(node),
|
|
209
|
-
|
|
209
|
+
breakPoint = null,
|
|
210
210
|
statement = statementFromPremiseNode(premiseNode, context),
|
|
211
211
|
procedureCall = procedureCallFromPremiseNode(premiseNode, context),
|
|
212
|
-
premise = new Premise(context, string, node,
|
|
212
|
+
premise = new Premise(context, string, node, breakPoint, statement, procedureCall);
|
|
213
213
|
|
|
214
214
|
return premise
|
|
215
215
|
}
|
|
@@ -226,11 +226,11 @@ export function theoremFromTheoremNode(theoremNode, context) {
|
|
|
226
226
|
topLevelAsssertionString = topLevelAssertionStringFromLabelsSignatureSuppositionsAndDeduction(labels, signature, suppositions, deduction),
|
|
227
227
|
node = theoremNode, ///
|
|
228
228
|
string = topLevelAsssertionString, ///
|
|
229
|
-
|
|
229
|
+
breakPoint = null;
|
|
230
230
|
|
|
231
231
|
context = null;
|
|
232
232
|
|
|
233
|
-
const theorem = new Theorem(context, string, node,
|
|
233
|
+
const theorem = new Theorem(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses);
|
|
234
234
|
|
|
235
235
|
return theorem;
|
|
236
236
|
}
|
|
@@ -242,13 +242,13 @@ export function propertyFromPropertyNode(propertyNode, context) {
|
|
|
242
242
|
const { Property } = elements,
|
|
243
243
|
node = propertyNode, ///
|
|
244
244
|
string = context.nodeAsString(node),
|
|
245
|
-
|
|
245
|
+
breakPoint = null,
|
|
246
246
|
name = nameFromPropertyNode(propertyNode, context),
|
|
247
247
|
type = typeFromPropertyNode(propertyNode, context);
|
|
248
248
|
|
|
249
249
|
context = null;
|
|
250
250
|
|
|
251
|
-
property = new Property(context, string, node,
|
|
251
|
+
property = new Property(context, string, node, breakPoint, name, type);
|
|
252
252
|
}
|
|
253
253
|
|
|
254
254
|
return property;
|
|
@@ -258,14 +258,14 @@ export function variableFromVariableNode(variableNode, context) {
|
|
|
258
258
|
const { Variable } = elements,
|
|
259
259
|
node = variableNode, ///
|
|
260
260
|
string = context.nodeAsString(node),
|
|
261
|
-
|
|
261
|
+
breakPoint = null,
|
|
262
262
|
type = typeFromVariableNode(variableNode, context),
|
|
263
263
|
identifier = identifierFromVariableNode(variableNode, context),
|
|
264
264
|
provisional = provisionalFromVariableNode(variableNode, context);
|
|
265
265
|
|
|
266
266
|
context = null;
|
|
267
267
|
|
|
268
|
-
const variable = new Variable(context, string, node,
|
|
268
|
+
const variable = new Variable(context, string, node, breakPoint, type, identifier, provisional);
|
|
269
269
|
|
|
270
270
|
return variable;
|
|
271
271
|
}
|
|
@@ -273,7 +273,7 @@ export function variableFromVariableNode(variableNode, context) {
|
|
|
273
273
|
export function subproofFromSubproofNode(subproofNode, context) {
|
|
274
274
|
const { Subproof } = elements,
|
|
275
275
|
node = subproofNode, ///
|
|
276
|
-
|
|
276
|
+
breakPoint = null,
|
|
277
277
|
suppositions = suppositionsFromSubproofNode(subproofNode, context),
|
|
278
278
|
subDerivation = subDerivationFromSubproofNode(subproofNode, context),
|
|
279
279
|
subproofString = subproofStringFromSuppositionsAndSubDerivation(suppositions, subDerivation, context),
|
|
@@ -281,7 +281,7 @@ export function subproofFromSubproofNode(subproofNode, context) {
|
|
|
281
281
|
|
|
282
282
|
context = null;
|
|
283
283
|
|
|
284
|
-
const subproof = new Subproof(context, string, node,
|
|
284
|
+
const subproof = new Subproof(context, string, node, breakPoint, suppositions, subDerivation);
|
|
285
285
|
|
|
286
286
|
return subproof;
|
|
287
287
|
}
|
|
@@ -290,13 +290,13 @@ export function equalityFromEqualityNode(equalityNode, context) {
|
|
|
290
290
|
const { Equality } = elements,
|
|
291
291
|
node = equalityNode, ///
|
|
292
292
|
string = context.nodeAsString(node),
|
|
293
|
-
|
|
293
|
+
breakPoint = null,
|
|
294
294
|
leftTerm = leftTermFromEqualityNode(equalityNode, context),
|
|
295
295
|
rightTerm = rightTermFromEqualityNode(equalityNode, context);
|
|
296
296
|
|
|
297
297
|
context = null;
|
|
298
298
|
|
|
299
|
-
const equality = new Equality(context, string, node,
|
|
299
|
+
const equality = new Equality(context, string, node, breakPoint, leftTerm, rightTerm);
|
|
300
300
|
|
|
301
301
|
return equality;
|
|
302
302
|
}
|
|
@@ -305,9 +305,9 @@ export function deductionFromDeductionNode(deductionNode, context) {
|
|
|
305
305
|
const { Deduction } = elements,
|
|
306
306
|
node = deductionNode, ///
|
|
307
307
|
string = context.nodeAsString(node),
|
|
308
|
-
|
|
308
|
+
breakPoint = null,
|
|
309
309
|
statement = statementFromDeductionNode(deductionNode, context),
|
|
310
|
-
deduction = new Deduction(context, string, node,
|
|
310
|
+
deduction = new Deduction(context, string, node, breakPoint, statement);
|
|
311
311
|
|
|
312
312
|
return deduction;
|
|
313
313
|
}
|
|
@@ -316,11 +316,11 @@ export function statementFromStatementNode(statementNode, context) {
|
|
|
316
316
|
const { Statement } = elements,
|
|
317
317
|
node = statementNode, ///
|
|
318
318
|
string = context.nodeAsString(node),
|
|
319
|
-
|
|
319
|
+
breakPoint = null;
|
|
320
320
|
|
|
321
321
|
context = null;
|
|
322
322
|
|
|
323
|
-
const statement = new Statement(context, string, node,
|
|
323
|
+
const statement = new Statement(context, string, node, breakPoint);
|
|
324
324
|
|
|
325
325
|
return statement;
|
|
326
326
|
}
|
|
@@ -329,9 +329,9 @@ export function signatureFromSignatureNode(signatureNode, context) {
|
|
|
329
329
|
const { Signature } = elements,
|
|
330
330
|
node = signatureNode, ///
|
|
331
331
|
string = context.nodeAsString(node),
|
|
332
|
-
|
|
332
|
+
breakPoint = null,
|
|
333
333
|
terms = termsFromSignatureNode(signatureNode, context),
|
|
334
|
-
signature = new Signature(context, string, node,
|
|
334
|
+
signature = new Signature(context, string, node, breakPoint, terms);
|
|
335
335
|
|
|
336
336
|
return signature;
|
|
337
337
|
}
|
|
@@ -340,10 +340,10 @@ export function referenceFromReferenceNode(referenceNode, context) {
|
|
|
340
340
|
const { Reference } = elements,
|
|
341
341
|
node = referenceNode, ///
|
|
342
342
|
string = context.nodeAsString(node),
|
|
343
|
-
|
|
343
|
+
breakPoint = null,
|
|
344
344
|
metavariable = metavariableFromReferenceNode(referenceNode, context),
|
|
345
345
|
topLevelMetaAssertion = topLevelMetaAssertionFromReferenceNode(referenceNode, context),
|
|
346
|
-
reference = new Reference(context, string, node,
|
|
346
|
+
reference = new Reference(context, string, node, breakPoint, metavariable, topLevelMetaAssertion);
|
|
347
347
|
|
|
348
348
|
return reference;
|
|
349
349
|
}
|
|
@@ -352,13 +352,13 @@ export function judgementFromJudgementNode(judgementNode, context) {
|
|
|
352
352
|
const { Judgement } = elements,
|
|
353
353
|
node = judgementNode, ///
|
|
354
354
|
string = context.nodeAsString(node),
|
|
355
|
-
|
|
355
|
+
breakPoint = null,
|
|
356
356
|
frame = frameFromJudgementNode(judgementNode, context),
|
|
357
357
|
assumption = assumptionFromJudgementNode(judgementNode, context);
|
|
358
358
|
|
|
359
359
|
context = null;
|
|
360
360
|
|
|
361
|
-
const judgement = new Judgement(context, string, node,
|
|
361
|
+
const judgement = new Judgement(context, string, node, breakPoint, frame, assumption);
|
|
362
362
|
|
|
363
363
|
return judgement;
|
|
364
364
|
}
|
|
@@ -374,11 +374,11 @@ export function metaLemmaFromMetaLemmaNode(metaLemmaNode, context) {
|
|
|
374
374
|
topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
|
|
375
375
|
node = metaLemmaMetathoremNode, ///
|
|
376
376
|
string = topLevelMetaAssertionString, ///
|
|
377
|
-
|
|
377
|
+
breakPoint = null;
|
|
378
378
|
|
|
379
379
|
context = null;
|
|
380
380
|
|
|
381
|
-
const metaLemma = new MetaLemma(context, string, node,
|
|
381
|
+
const metaLemma = new MetaLemma(context, string, node, breakPoint, label, suppositions, deduction, proof, metaLevelAssumptions);
|
|
382
382
|
|
|
383
383
|
return metaLemma;
|
|
384
384
|
}
|
|
@@ -387,13 +387,13 @@ export function parameterFromParameterNode(parameterNode, context) {
|
|
|
387
387
|
const { Parameter } = elements,
|
|
388
388
|
node = parameterNode, ///
|
|
389
389
|
string = context.nodeAsString(node),
|
|
390
|
-
|
|
390
|
+
breakPoint = null,
|
|
391
391
|
name = nameFromParamterNode(parameterNode, context),
|
|
392
392
|
identifier = identifierFromParamterNode(parameterNode, context);
|
|
393
393
|
|
|
394
394
|
context = null;
|
|
395
395
|
|
|
396
|
-
const parameter = new Parameter(context, string, node,
|
|
396
|
+
const parameter = new Parameter(context, string, node, breakPoint, name, identifier);
|
|
397
397
|
|
|
398
398
|
return parameter;
|
|
399
399
|
}
|
|
@@ -402,12 +402,12 @@ export function hypothesisFromHypothesisNode(hypotheseNode, context) {
|
|
|
402
402
|
const { Hypothesis } = elements,
|
|
403
403
|
node = hypotheseNode, ///
|
|
404
404
|
string = context.nodeAsString(node),
|
|
405
|
-
|
|
405
|
+
breakPoint = null,
|
|
406
406
|
statement = statementFromHypothesisNode(hypotheseNode, context);
|
|
407
407
|
|
|
408
408
|
context = null;
|
|
409
409
|
|
|
410
|
-
const hypohtesis = new Hypothesis(context, string, node,
|
|
410
|
+
const hypohtesis = new Hypothesis(context, string, node, breakPoint, statement);
|
|
411
411
|
|
|
412
412
|
return hypohtesis;
|
|
413
413
|
}
|
|
@@ -424,11 +424,11 @@ export function conjectureFromConjectureNode(conjectureNode, context) {
|
|
|
424
424
|
topLevelAsssertionString = topLevelAssertionStringFromLabelsSignatureSuppositionsAndDeduction(labels, signature, suppositions, deduction),
|
|
425
425
|
node = conjectureNode, ///
|
|
426
426
|
string = topLevelAsssertionString, ///
|
|
427
|
-
|
|
427
|
+
breakPoint = null;
|
|
428
428
|
|
|
429
429
|
context = null;
|
|
430
430
|
|
|
431
|
-
const conjecture = new Conjecture(context, string, node,
|
|
431
|
+
const conjecture = new Conjecture(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses);
|
|
432
432
|
|
|
433
433
|
return conjecture;
|
|
434
434
|
}
|
|
@@ -437,12 +437,12 @@ export function combinatorFromCombinatorNode(combinatorNode, context) {
|
|
|
437
437
|
const { Combinator } = elements,
|
|
438
438
|
node = combinatorNode, ///
|
|
439
439
|
string = context.nodeAsString(node),
|
|
440
|
-
|
|
440
|
+
breakPoint = null,
|
|
441
441
|
statement = statementFromCombinatorNode(combinatorNode, context);
|
|
442
442
|
|
|
443
443
|
context = null;
|
|
444
444
|
|
|
445
|
-
const combinator = new Combinator(context, string, node,
|
|
445
|
+
const combinator = new Combinator(context, string, node, breakPoint, statement);
|
|
446
446
|
|
|
447
447
|
return combinator;
|
|
448
448
|
}
|
|
@@ -451,9 +451,9 @@ export function conclusionFromConclusionNode(conclusionNode, context) {
|
|
|
451
451
|
const { Conclusion } = elements,
|
|
452
452
|
node = conclusionNode, ///
|
|
453
453
|
string = context.nodeAsString(node),
|
|
454
|
-
|
|
454
|
+
breakPoint = null,
|
|
455
455
|
statement = statementFromConclusionNode(conclusionNode, context),
|
|
456
|
-
conclusion = new Conclusion(context, string, node,
|
|
456
|
+
conclusion = new Conclusion(context, string, node, breakPoint, statement);
|
|
457
457
|
|
|
458
458
|
return conclusion;
|
|
459
459
|
}
|
|
@@ -462,12 +462,12 @@ export function derivationFromDerivationNode(derivationNode, context) {
|
|
|
462
462
|
const { Derivation } = elements,
|
|
463
463
|
node = derivationNode, ///
|
|
464
464
|
string = null,
|
|
465
|
-
|
|
465
|
+
breakPoint = null,
|
|
466
466
|
stepsOrSubproofs = stepsOrSubproofsFromDerivationNode(derivationNode, context);
|
|
467
467
|
|
|
468
468
|
context = null;
|
|
469
469
|
|
|
470
|
-
const derivation = new Derivation(context, string, node,
|
|
470
|
+
const derivation = new Derivation(context, string, node, breakPoint, stepsOrSubproofs);
|
|
471
471
|
|
|
472
472
|
return derivation;
|
|
473
473
|
}
|
|
@@ -476,12 +476,12 @@ export function typePrefixFromTypePrefixNode(typePrefixNode, context) {
|
|
|
476
476
|
const { TypePrefix } = elements,
|
|
477
477
|
node = typePrefixNode, ///
|
|
478
478
|
string = context.nodeAsString(node),
|
|
479
|
-
|
|
479
|
+
breakPoint = null,
|
|
480
480
|
name = nameFromTypePrefixNode(typePrefixNode, context);
|
|
481
481
|
|
|
482
482
|
context = null;
|
|
483
483
|
|
|
484
|
-
const typePrefix = new TypePrefix(context, string, node,
|
|
484
|
+
const typePrefix = new TypePrefix(context, string, node, breakPoint, name);
|
|
485
485
|
|
|
486
486
|
return typePrefix;
|
|
487
487
|
}
|
|
@@ -490,10 +490,10 @@ export function assumptionFromAssumptionNode(assumptionNode, context) {
|
|
|
490
490
|
const { Assumption } = elements,
|
|
491
491
|
node = assumptionNode, ///
|
|
492
492
|
string = context.nodeAsString(node),
|
|
493
|
-
|
|
493
|
+
breakPoint = null,
|
|
494
494
|
reference = referenceFromAssumptionNode(assumptionNode, context),
|
|
495
495
|
statement = statementFromAssumptionNode(assumptionNode, context),
|
|
496
|
-
assumption = new Assumption(context, string, node,
|
|
496
|
+
assumption = new Assumption(context, string, node, breakPoint, reference, statement);
|
|
497
497
|
|
|
498
498
|
return assumption;
|
|
499
499
|
}
|
|
@@ -502,13 +502,13 @@ export function constructorFromConstructorNode(constructorNode, context) {
|
|
|
502
502
|
const { Constructor } = elements,
|
|
503
503
|
node = constructorNode, ///
|
|
504
504
|
string = context.nodeAsString(node),
|
|
505
|
-
|
|
505
|
+
breakPoint = null,
|
|
506
506
|
term = termFromConstructorNode(constructorNode, context),
|
|
507
507
|
type = typeFromConstructorNode(constructorNode, context);
|
|
508
508
|
|
|
509
509
|
context = null;
|
|
510
510
|
|
|
511
|
-
const constructor = new Constructor(context, string, node,
|
|
511
|
+
const constructor = new Constructor(context, string, node, breakPoint, term, type);
|
|
512
512
|
|
|
513
513
|
return constructor;
|
|
514
514
|
}
|
|
@@ -517,10 +517,10 @@ export function suppositionFromSuppositionNode(suppositionNode, context) {
|
|
|
517
517
|
const { Supposition } = elements,
|
|
518
518
|
node = suppositionNode, ///
|
|
519
519
|
string = context.nodeAsString(node),
|
|
520
|
-
|
|
520
|
+
breakPoint = null,
|
|
521
521
|
statement = statementFromSuppositionNode(suppositionNode, context),
|
|
522
522
|
procedureCall = procedureCallFromSuppositionNode(suppositionNode, context),
|
|
523
|
-
supposition = new Supposition(context, string, node,
|
|
523
|
+
supposition = new Supposition(context, string, node, breakPoint, statement, procedureCall);
|
|
524
524
|
|
|
525
525
|
return supposition
|
|
526
526
|
}
|
|
@@ -528,7 +528,7 @@ export function suppositionFromSuppositionNode(suppositionNode, context) {
|
|
|
528
528
|
export function equivalenceFromEquivalenceNode(equivalenceNode, context) {
|
|
529
529
|
const { Equivalence } = elements,
|
|
530
530
|
node = equivalenceNode, ///
|
|
531
|
-
|
|
531
|
+
breakPoint = null,
|
|
532
532
|
type = typeFromEquivalenceNode(equivalenceNode, context),
|
|
533
533
|
terms = termsFromEquivalenceNode(equivalenceNode, context),
|
|
534
534
|
equivalenceString = equivalenceStringFromTerms(terms),
|
|
@@ -536,7 +536,7 @@ export function equivalenceFromEquivalenceNode(equivalenceNode, context) {
|
|
|
536
536
|
|
|
537
537
|
context = null;
|
|
538
538
|
|
|
539
|
-
const equivalence = new Equivalence(context, string, node,
|
|
539
|
+
const equivalence = new Equivalence(context, string, node, breakPoint, type, terms);
|
|
540
540
|
|
|
541
541
|
return equivalence;
|
|
542
542
|
}
|
|
@@ -552,11 +552,11 @@ export function metatheoremFromMetatheoremNode(metatheoremNode, context) {
|
|
|
552
552
|
topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
|
|
553
553
|
node = metaLemmaMetathoremNode, ///
|
|
554
554
|
string = topLevelMetaAssertionString, ///
|
|
555
|
-
|
|
555
|
+
breakPoint = null;
|
|
556
556
|
|
|
557
557
|
context = null;
|
|
558
558
|
|
|
559
|
-
const metatheorem = new Metatheorem(context, string, node,
|
|
559
|
+
const metatheorem = new Metatheorem(context, string, node, breakPoint, label, suppositions, deduction, proof, metaLevelAssumptions);
|
|
560
560
|
|
|
561
561
|
return metatheorem;
|
|
562
562
|
}
|
|
@@ -565,7 +565,7 @@ export function metavariableFromMetavariableNode(metavariableNode, context) {
|
|
|
565
565
|
const { Metavariable } = elements,
|
|
566
566
|
node = metavariableNode, ///
|
|
567
567
|
string = context.nodeAsString(node),
|
|
568
|
-
|
|
568
|
+
breakPoint = null,
|
|
569
569
|
name = nameFromMetavariableNode(metavariableNode, context),
|
|
570
570
|
term = termFromMetavariableNode(metavariableNode, context),
|
|
571
571
|
type = typeFromMetavariableNode(metavariableNode, context),
|
|
@@ -573,7 +573,7 @@ export function metavariableFromMetavariableNode(metavariableNode, context) {
|
|
|
573
573
|
|
|
574
574
|
context = null;
|
|
575
575
|
|
|
576
|
-
const metavariable = new Metavariable(context, string, node,
|
|
576
|
+
const metavariable = new Metavariable(context, string, node, breakPoint, name, term, type, metaType);
|
|
577
577
|
|
|
578
578
|
return metavariable;
|
|
579
579
|
}
|
|
@@ -582,12 +582,12 @@ export function subDerivationFromSubDerivationNode(subDerivationNode, context) {
|
|
|
582
582
|
const { SubDerivation } = elements,
|
|
583
583
|
node = subDerivationNode, ///
|
|
584
584
|
string = null,
|
|
585
|
-
|
|
585
|
+
breakPoint = null,
|
|
586
586
|
stepsOrSubproofs = stepsOrSubproofsFromSubDerivationNode(subDerivationNode, context);
|
|
587
587
|
|
|
588
588
|
context = null;
|
|
589
589
|
|
|
590
|
-
const subDerivation = new SubDerivation(context, string, node,
|
|
590
|
+
const subDerivation = new SubDerivation(context, string, node, breakPoint, stepsOrSubproofs);
|
|
591
591
|
|
|
592
592
|
return subDerivation;
|
|
593
593
|
}
|
|
@@ -596,13 +596,13 @@ export function typeAssertionFromTypeAssertionNode(typeAssertionNode, context) {
|
|
|
596
596
|
const { TypeAssertion } = elements,
|
|
597
597
|
node = typeAssertionNode, ///
|
|
598
598
|
string = context.nodeAsString(node),
|
|
599
|
-
|
|
599
|
+
breakPoint = null,
|
|
600
600
|
term = termFromTypeAssertionNode(typeAssertionNode, context),
|
|
601
601
|
type = typeFromTypeAssertionNode(typeAssertionNode, context);
|
|
602
602
|
|
|
603
603
|
context = null;
|
|
604
604
|
|
|
605
|
-
const typeAssertion = new TypeAssertion(context, string, node,
|
|
605
|
+
const typeAssertion = new TypeAssertion(context, string, node, breakPoint, term, type);
|
|
606
606
|
|
|
607
607
|
return typeAssertion;
|
|
608
608
|
}
|
|
@@ -614,11 +614,11 @@ export function procedureCallFromProcedureCallNode(procedureCallNode, context) {
|
|
|
614
614
|
procedureCallString = procedureCallStringFromProcedureReferenceAndParameters(procedureReference, parameters),
|
|
615
615
|
node = procedureCallNode, ///
|
|
616
616
|
string = procedureCallString, ///
|
|
617
|
-
|
|
617
|
+
breakPoint = null;
|
|
618
618
|
|
|
619
619
|
context = null;
|
|
620
620
|
|
|
621
|
-
const procedureCall = new ProcedureCall(context, string, node,
|
|
621
|
+
const procedureCall = new ProcedureCall(context, string, node, breakPoint, parameters, procedureReference);
|
|
622
622
|
|
|
623
623
|
return procedureCall;
|
|
624
624
|
}
|
|
@@ -635,14 +635,14 @@ export function definedAssertionFromDefinedAssertionNode(definedAssertionNode, c
|
|
|
635
635
|
const { DefinedAssertion } = elements,
|
|
636
636
|
node = definedAssertionNode, ///
|
|
637
637
|
string = context.nodeAsString(node),
|
|
638
|
-
|
|
638
|
+
breakPoint = null,
|
|
639
639
|
negated = definedAssertionNode.isNegated(),
|
|
640
640
|
term = termFromDefinedAssertionNode(definedAssertionNode, context),
|
|
641
641
|
frame = frameFromDefinedAssertionNode(definedAssertionNode, context);
|
|
642
642
|
|
|
643
643
|
context = null;
|
|
644
644
|
|
|
645
|
-
const definedAssertion = new DefinedAssertion(context, string, node,
|
|
645
|
+
const definedAssertion = new DefinedAssertion(context, string, node, breakPoint, term, frame, negated);
|
|
646
646
|
|
|
647
647
|
return definedAssertion;
|
|
648
648
|
}
|
|
@@ -651,13 +651,13 @@ export function propertyRelationFromPropertyRelationNode(propertyRelationNode, c
|
|
|
651
651
|
const { PropertyRelation } = elements,
|
|
652
652
|
node = propertyRelationNode, ///
|
|
653
653
|
string = context.nodeAsString(node),
|
|
654
|
-
|
|
654
|
+
breakPoint = null,
|
|
655
655
|
term = termFromPropertyRelationNode(propertyRelationNode, context),
|
|
656
656
|
property = propertyFromPropertyRelationNode(propertyRelationNode, context);
|
|
657
657
|
|
|
658
658
|
context = null;
|
|
659
659
|
|
|
660
|
-
const propertyRelation = new PropertyRelation(context, string, node,
|
|
660
|
+
const propertyRelation = new PropertyRelation(context, string, node, breakPoint, term, property);
|
|
661
661
|
|
|
662
662
|
return propertyRelation;
|
|
663
663
|
}
|
|
@@ -671,10 +671,10 @@ export function termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, g
|
|
|
671
671
|
specificContext
|
|
672
672
|
],
|
|
673
673
|
string = context.nodeAsString(node),
|
|
674
|
-
|
|
674
|
+
breakPoint = null,
|
|
675
675
|
targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
|
|
676
676
|
replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context),
|
|
677
|
-
termSubstitution = new TermSubstitution(contexts, string, node,
|
|
677
|
+
termSubstitution = new TermSubstitution(contexts, string, node, breakPoint, targetTerm, replacementTerm);
|
|
678
678
|
|
|
679
679
|
return termSubstitution;
|
|
680
680
|
}
|
|
@@ -688,10 +688,10 @@ export function frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode
|
|
|
688
688
|
specificContext
|
|
689
689
|
],
|
|
690
690
|
string = context.nodeAsString(node),
|
|
691
|
-
|
|
691
|
+
breakPoint = null,
|
|
692
692
|
targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
|
|
693
693
|
replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
|
|
694
|
-
frameSubstitution = new FrameSubstitution(contexts, string, node,
|
|
694
|
+
frameSubstitution = new FrameSubstitution(contexts, string, node, breakPoint, targetFrame, replacementFrame);
|
|
695
695
|
|
|
696
696
|
return frameSubstitution;
|
|
697
697
|
}
|
|
@@ -700,13 +700,13 @@ export function propertyAssertionFromPropertyAssertionNode(propertyAssertionNode
|
|
|
700
700
|
const { PropertyAssertion } = elements,
|
|
701
701
|
node = propertyAssertionNode, ///
|
|
702
702
|
string = context.nodeAsString(node),
|
|
703
|
-
|
|
703
|
+
breakPoint = null,
|
|
704
704
|
term = termFromPropertyAssertionNode(propertyAssertionNode, context),
|
|
705
705
|
propertyRelation = propertyRelationFromPropertyAssertionNode(propertyAssertionNode, context);
|
|
706
706
|
|
|
707
707
|
context = null;
|
|
708
708
|
|
|
709
|
-
const propertyAssertion = new PropertyAssertion(context, string, node,
|
|
709
|
+
const propertyAssertion = new PropertyAssertion(context, string, node, breakPoint, term, propertyRelation);
|
|
710
710
|
|
|
711
711
|
return propertyAssertion;
|
|
712
712
|
}
|
|
@@ -715,12 +715,12 @@ export function subproofAssertionFromSubproofAssertionNode(subproofAssertionNode
|
|
|
715
715
|
const { SubproofAssertion } = elements,
|
|
716
716
|
node = subproofAssertionNode, ///
|
|
717
717
|
string = context.nodeAsString(node),
|
|
718
|
-
|
|
718
|
+
breakPoint = null,
|
|
719
719
|
statements = statementsFromSubproofAssertionNode(subproofAssertionNode, context);
|
|
720
720
|
|
|
721
721
|
context = null;
|
|
722
722
|
|
|
723
|
-
const subproofAssertion = new SubproofAssertion(context, string, node,
|
|
723
|
+
const subproofAssertion = new SubproofAssertion(context, string, node, breakPoint, statements);
|
|
724
724
|
|
|
725
725
|
return subproofAssertion;
|
|
726
726
|
}
|
|
@@ -729,7 +729,7 @@ export function containedAssertionFromContainedAssertionNode(containedAssertionN
|
|
|
729
729
|
const { ContainedAssertion } = elements,
|
|
730
730
|
node = containedAssertionNode, ///
|
|
731
731
|
string = context.nodeAsString(node),
|
|
732
|
-
|
|
732
|
+
breakPoint = null,
|
|
733
733
|
term = termFromContainedAssertionNode(containedAssertionNode, context),
|
|
734
734
|
frame = frameFromContainedAssertionNode(containedAssertionNode, context),
|
|
735
735
|
negated = negatedFromContainedAssertionNode(containedAssertionNode, context),
|
|
@@ -737,7 +737,7 @@ export function containedAssertionFromContainedAssertionNode(containedAssertionN
|
|
|
737
737
|
|
|
738
738
|
context = null;
|
|
739
739
|
|
|
740
|
-
const containedAssertion = new ContainedAssertion(context, string, node,
|
|
740
|
+
const containedAssertion = new ContainedAssertion(context, string, node, breakPoint, term, frame, negated, statement);
|
|
741
741
|
|
|
742
742
|
return containedAssertion;
|
|
743
743
|
}
|
|
@@ -746,13 +746,13 @@ export function signatureAssertionFromSignatureAssertionNode(signatureAssertionN
|
|
|
746
746
|
const { SignatureAssertion } = elements,
|
|
747
747
|
node = signatureAssertionNode, ///
|
|
748
748
|
string = context.nodeAsString(node),
|
|
749
|
-
|
|
749
|
+
breakPoint = null,
|
|
750
750
|
signature = signatureFromSignatureAssertionNode(signatureAssertionNode, context),
|
|
751
751
|
reference = referenceFromSignatureAssertionNode(signatureAssertionNode, context);
|
|
752
752
|
|
|
753
753
|
context = null;
|
|
754
754
|
|
|
755
|
-
const signatureAssertion = new SignatureAssertion(context, string, node,
|
|
755
|
+
const signatureAssertion = new SignatureAssertion(context, string, node, breakPoint, signature, reference);
|
|
756
756
|
|
|
757
757
|
return signatureAssertion;
|
|
758
758
|
}
|
|
@@ -761,12 +761,12 @@ export function procedureReferenceFromProcedureReferenceNode(procedureReferenceN
|
|
|
761
761
|
const { ProcedureReference } = elements,
|
|
762
762
|
node = procedureReferenceNode, ///
|
|
763
763
|
string = context.nodeAsString(node),
|
|
764
|
-
|
|
764
|
+
breakPoint = null,
|
|
765
765
|
name = nameFromProcedureReferenceNode(procedureReferenceNode, context);
|
|
766
766
|
|
|
767
767
|
context = null;
|
|
768
768
|
|
|
769
|
-
const procedureRefereence = new ProcedureReference(context, string, node,
|
|
769
|
+
const procedureRefereence = new ProcedureReference(context, string, node, breakPoint, name);
|
|
770
770
|
|
|
771
771
|
return procedureRefereence;
|
|
772
772
|
}
|
|
@@ -775,13 +775,13 @@ export function propertyDeclarationFromPropertyDeclarationNode(propertyDeclarati
|
|
|
775
775
|
const { PropertyDeclaration } = elements,
|
|
776
776
|
node = propertyDeclarationNode, ///
|
|
777
777
|
string = context.nodeAsString(node),
|
|
778
|
-
|
|
778
|
+
breakPoint = null,
|
|
779
779
|
type = typeFromPropertyDeclarationNode(propertyDeclarationNode, context),
|
|
780
780
|
property = propertyFromPropertyDeclarationNode(propertyDeclarationNode, context);
|
|
781
781
|
|
|
782
782
|
context = null;
|
|
783
783
|
|
|
784
|
-
const propertyDeclaration = new PropertyDeclaration(context, string, node,
|
|
784
|
+
const propertyDeclaration = new PropertyDeclaration(context, string, node, breakPoint, property, type);
|
|
785
785
|
|
|
786
786
|
return propertyDeclaration;
|
|
787
787
|
}
|
|
@@ -790,14 +790,14 @@ export function variableDeclarationFromVariableDeclarationNode(variableDeclarati
|
|
|
790
790
|
const { VariableDeclaration } = elements,
|
|
791
791
|
node = variableDeclarationNode, ///
|
|
792
792
|
string = context.nodeAsString(node),
|
|
793
|
-
|
|
793
|
+
breakPoint = null,
|
|
794
794
|
type = typeFromVariableDeclarationNode(variableDeclarationNode, context),
|
|
795
795
|
variable = variableFromVariableDeclarationNode(variableDeclarationNode, context),
|
|
796
796
|
provisional = provisionalFromVariableDeclarationNode(variableDeclarationNode, context);
|
|
797
797
|
|
|
798
798
|
context = null;
|
|
799
799
|
|
|
800
|
-
const variableDeclaration = new VariableDeclaration(context, string, node,
|
|
800
|
+
const variableDeclaration = new VariableDeclaration(context, string, node, breakPoint, type, variable, provisional);
|
|
801
801
|
|
|
802
802
|
return variableDeclaration;
|
|
803
803
|
}
|
|
@@ -806,13 +806,13 @@ export function metaLevelAssumptionFromMetaLevelAssumptionNode(metaLevelAssumpti
|
|
|
806
806
|
const { MetaLevelAssumption } = elements,
|
|
807
807
|
node = metaLevelAssumptionNode, ///
|
|
808
808
|
string = context.nodeAsString(node),
|
|
809
|
-
|
|
809
|
+
breakPoint = null,
|
|
810
810
|
reference = referenceFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context),
|
|
811
811
|
statement = statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context);
|
|
812
812
|
|
|
813
813
|
context = null;
|
|
814
814
|
|
|
815
|
-
const metaLevelAssumption = new MetaLevelAssumption(context, string, node,
|
|
815
|
+
const metaLevelAssumption = new MetaLevelAssumption(context, string, node, breakPoint, reference, statement);
|
|
816
816
|
|
|
817
817
|
return metaLevelAssumption;
|
|
818
818
|
}
|
|
@@ -821,9 +821,9 @@ export function bracketedCombinatorFromBracketedCombinatorNode(bracketedCombinat
|
|
|
821
821
|
const { BracketedCombinator } = elements,
|
|
822
822
|
node = bracketedCombinatorNode, ///
|
|
823
823
|
string = context.nodeAsString(node),
|
|
824
|
-
|
|
824
|
+
breakPoint = null,
|
|
825
825
|
statement = statementFromBracketedCombinatorNode(bracketedCombinatorNode, context),
|
|
826
|
-
bracketedCombinator = new BracketedCombinator(context, string, node,
|
|
826
|
+
bracketedCombinator = new BracketedCombinator(context, string, node, breakPoint, statement);
|
|
827
827
|
|
|
828
828
|
return bracketedCombinator;
|
|
829
829
|
}
|
|
@@ -832,10 +832,10 @@ export function bracketedConstructorFromBracketedConstructorNode(bracketedConstr
|
|
|
832
832
|
const { BracketedConstructor } = elements,
|
|
833
833
|
node = bracketedConstructorNode, ///
|
|
834
834
|
string = context.nodeAsString(node),
|
|
835
|
-
|
|
835
|
+
breakPoint = null,
|
|
836
836
|
term = termFromBracketedConstructorNode(bracketedConstructorNode, context),
|
|
837
837
|
type = typeFromBracketedConstructorNode(bracketedConstructorNode, context),
|
|
838
|
-
bracketedConstructor = new BracketedConstructor(context, string, node,
|
|
838
|
+
bracketedConstructor = new BracketedConstructor(context, string, node, breakPoint, term, type);
|
|
839
839
|
|
|
840
840
|
return bracketedConstructor;
|
|
841
841
|
}
|
|
@@ -844,12 +844,12 @@ export function typePrefixDeclarationFromTypePrefixDeclarationNode(typePrefixDec
|
|
|
844
844
|
const { TypePrefixDeclaration } = elements,
|
|
845
845
|
node = typePrefixDeclarationNode, ///
|
|
846
846
|
string = context.nodeAsString(node), ///
|
|
847
|
-
|
|
847
|
+
breakPoint = null,
|
|
848
848
|
typePrefix = typePrefixFromTypePrefixDeclarationNode(typePrefixDeclarationNode, context);
|
|
849
849
|
|
|
850
850
|
context = null;
|
|
851
851
|
|
|
852
|
-
const typePrefixDeclaration = new TypePrefixDeclaration(context, string, node,
|
|
852
|
+
const typePrefixDeclaration = new TypePrefixDeclaration(context, string, node, breakPoint, typePrefix);
|
|
853
853
|
|
|
854
854
|
return typePrefixDeclaration;
|
|
855
855
|
}
|
|
@@ -858,12 +858,12 @@ export function combinatorDeclarationFromCombinatorDeclarationNode(combinatorDec
|
|
|
858
858
|
const { CombinatorDeclaration } = elements,
|
|
859
859
|
node = combinatorDeclarationNode, ///
|
|
860
860
|
string = context.nodeAsString(node),
|
|
861
|
-
|
|
861
|
+
breakPoint = null,
|
|
862
862
|
combinator = combinatorFromCombinatorDeclarationNode(combinatorDeclarationNode, context);
|
|
863
863
|
|
|
864
864
|
context = null;
|
|
865
865
|
|
|
866
|
-
const combinatorDeclaration = new CombinatorDeclaration(context, string, node,
|
|
866
|
+
const combinatorDeclaration = new CombinatorDeclaration(context, string, node, breakPoint, combinator);
|
|
867
867
|
|
|
868
868
|
return combinatorDeclaration;
|
|
869
869
|
}
|
|
@@ -872,14 +872,14 @@ export function simpleTypeDeclarationFromSimpleTypeDeclarationNode(simpleTypeDec
|
|
|
872
872
|
const { SimpleTypeDeclaration } = elements,
|
|
873
873
|
node = simpleTypeDeclarationNode, ///
|
|
874
874
|
string = context.nodeAsString(node),
|
|
875
|
-
|
|
875
|
+
breakPoint = null,
|
|
876
876
|
type = typeFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context),
|
|
877
877
|
superTypes = superTypesFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context),
|
|
878
878
|
provisional = provisionalFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context);
|
|
879
879
|
|
|
880
880
|
context = null;
|
|
881
881
|
|
|
882
|
-
const simpleTypeDeclaration = new SimpleTypeDeclaration(context, string, node,
|
|
882
|
+
const simpleTypeDeclaration = new SimpleTypeDeclaration(context, string, node, breakPoint, type, superTypes, provisional);
|
|
883
883
|
|
|
884
884
|
return simpleTypeDeclaration;
|
|
885
885
|
}
|
|
@@ -893,10 +893,10 @@ export function referenceSubstitutionFromReferenceSubstitutionNode(referenceSubs
|
|
|
893
893
|
specificContext
|
|
894
894
|
],
|
|
895
895
|
string = context.nodeAsString(node),
|
|
896
|
-
|
|
896
|
+
breakPoint = null,
|
|
897
897
|
targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
|
|
898
898
|
replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
|
|
899
|
-
referenceSubstitution = new ReferenceSubstitution(contexts, string, node,
|
|
899
|
+
referenceSubstitution = new ReferenceSubstitution(contexts, string, node, breakPoint, targetReference, replacementReference);
|
|
900
900
|
|
|
901
901
|
return referenceSubstitution;
|
|
902
902
|
}
|
|
@@ -910,12 +910,12 @@ export function statementSubstitutionFromStatementSubstitutionNode(statementSubs
|
|
|
910
910
|
specificContext
|
|
911
911
|
],
|
|
912
912
|
string = context.nodeAsString(node),
|
|
913
|
-
|
|
913
|
+
breakPoint = null,
|
|
914
914
|
resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
|
|
915
915
|
substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext),
|
|
916
916
|
targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
|
|
917
917
|
replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
|
|
918
|
-
statementSubstitution = new StatementSubstitution(contexts, string, node,
|
|
918
|
+
statementSubstitution = new StatementSubstitution(contexts, string, node, breakPoint, resolved, substitution, targetStatement, replacementStatement);
|
|
919
919
|
|
|
920
920
|
return statementSubstitution;
|
|
921
921
|
}
|
|
@@ -924,14 +924,14 @@ export function constructorDeclarationFromConstructorDeclarationNode(constructor
|
|
|
924
924
|
const { ConstructorDeclaration } = elements,
|
|
925
925
|
node = constructorDeclarationNode, ///
|
|
926
926
|
string = context.nodeAsString(node),
|
|
927
|
-
|
|
927
|
+
breakPoint = null,
|
|
928
928
|
type = typeFromConstructorDeclarationNode(constructorDeclarationNode, context),
|
|
929
929
|
provisional = provisionalFromConstructorDeclarationNode(constructorDeclarationNode, context),
|
|
930
930
|
constructor = constructorFromConstructorDeclarationNode(constructorDeclarationNode, context);
|
|
931
931
|
|
|
932
932
|
context = null;
|
|
933
933
|
|
|
934
|
-
const constructorDeclaration = new ConstructorDeclaration(context, string, node,
|
|
934
|
+
const constructorDeclaration = new ConstructorDeclaration(context, string, node, breakPoint, type, provisional, constructor);
|
|
935
935
|
|
|
936
936
|
return constructorDeclaration;
|
|
937
937
|
}
|
|
@@ -939,7 +939,7 @@ export function constructorDeclarationFromConstructorDeclarationNode(constructor
|
|
|
939
939
|
export function complexTypeDeclarationFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context) {
|
|
940
940
|
const { ComplexTypeDeclaration } = elements,
|
|
941
941
|
node = complexTypeDeclarationNode, ///
|
|
942
|
-
|
|
942
|
+
breakPoint = null,
|
|
943
943
|
type = typeFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
|
|
944
944
|
superTypes = superTypesFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
|
|
945
945
|
provisional = provisionalFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
|
|
@@ -949,7 +949,7 @@ export function complexTypeDeclarationFromComplexTypeDeclarationNode(complexType
|
|
|
949
949
|
|
|
950
950
|
context = null;
|
|
951
951
|
|
|
952
|
-
const complexTypeDeclaration = new ComplexTypeDeclaration(context, string, node,
|
|
952
|
+
const complexTypeDeclaration = new ComplexTypeDeclaration(context, string, node, breakPoint, type, superTypes, provisional, propertyDeclarations);
|
|
953
953
|
|
|
954
954
|
return complexTypeDeclaration;
|
|
955
955
|
}
|
|
@@ -958,13 +958,13 @@ export function metavariableDeclarationFromMetavariableDeclarationNode(metavaria
|
|
|
958
958
|
const { MetavariableDeclaration } = elements,
|
|
959
959
|
node = metavariableDeclarationNode, ///
|
|
960
960
|
string = context.nodeAsString(node),
|
|
961
|
-
|
|
961
|
+
breakPoint = null,
|
|
962
962
|
metaType = metaTypeFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
|
|
963
963
|
metavariable = metavariableFromMetavariableDeclarationNode(metavariableDeclarationNode, context);
|
|
964
964
|
|
|
965
965
|
context = null;
|
|
966
966
|
|
|
967
|
-
const metavariableDeclaration = new MetavariableDeclaration(context, string, node,
|
|
967
|
+
const metavariableDeclaration = new MetavariableDeclaration(context, string, node, breakPoint, metaType, metavariable);
|
|
968
968
|
|
|
969
969
|
return metavariableDeclaration;
|
|
970
970
|
}
|