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/element/section.js
CHANGED
|
@@ -8,8 +8,8 @@ import {enclose} from "../utilities/context";
|
|
|
8
8
|
const { asyncEvery } = asynchronousUtilities;
|
|
9
9
|
|
|
10
10
|
export default define(class Section extends Element {
|
|
11
|
-
constructor(context, string, node,
|
|
12
|
-
super(context, string, node,
|
|
11
|
+
constructor(context, string, node, breakPoint, hypotheses, topLevelAssertion) {
|
|
12
|
+
super(context, string, node, breakPoint);
|
|
13
13
|
|
|
14
14
|
this.hypotheses = hypotheses;
|
|
15
15
|
this.topLevelAssertion = topLevelAssertion;
|
package/src/element/signature.js
CHANGED
|
@@ -11,8 +11,8 @@ import { join, ablate, attempt, reconcile, serialise, unserialise, instantiate }
|
|
|
11
11
|
const { match } = arrayUtilities;
|
|
12
12
|
|
|
13
13
|
export default define(class Signature extends Element {
|
|
14
|
-
constructor(context, string, node,
|
|
15
|
-
super(context, string, node,
|
|
14
|
+
constructor(context, string, node, breakPoint, terms) {
|
|
15
|
+
super(context, string, node, breakPoint);
|
|
16
16
|
|
|
17
17
|
this.terms = terms;
|
|
18
18
|
}
|
|
@@ -234,11 +234,11 @@ export default define(class Signature extends Element {
|
|
|
234
234
|
|
|
235
235
|
return serialise((context) => {
|
|
236
236
|
const string = this.getString(),
|
|
237
|
-
|
|
237
|
+
breakPoint = this.getBreakPoint(),
|
|
238
238
|
json = {
|
|
239
239
|
context,
|
|
240
240
|
string,
|
|
241
|
-
|
|
241
|
+
breakPoint
|
|
242
242
|
};
|
|
243
243
|
|
|
244
244
|
return json;
|
|
@@ -250,12 +250,12 @@ export default define(class Signature extends Element {
|
|
|
250
250
|
|
|
251
251
|
unserialise((json, context) => {
|
|
252
252
|
instantiate((context) => {
|
|
253
|
-
const { string,
|
|
253
|
+
const { string, breakPoint } = json,
|
|
254
254
|
signatureNode = instantiateSignature(string, context),
|
|
255
255
|
node = signatureNode, ///
|
|
256
256
|
terms = termsFromSignatureNode(signatureNode, context);
|
|
257
257
|
|
|
258
|
-
signature = new Signature(context, string, node,
|
|
258
|
+
signature = new Signature(context, string, node, breakPoint, terms);
|
|
259
259
|
}, context);
|
|
260
260
|
}, json, context);
|
|
261
261
|
|
package/src/element/statement.js
CHANGED
|
@@ -394,10 +394,10 @@ export default define(class Statement extends Element {
|
|
|
394
394
|
|
|
395
395
|
toJSON() {
|
|
396
396
|
const string = this.getString(),
|
|
397
|
-
|
|
397
|
+
breakPoint = this.getBreakPoint(),
|
|
398
398
|
json = {
|
|
399
399
|
string,
|
|
400
|
-
|
|
400
|
+
breakPoint
|
|
401
401
|
};
|
|
402
402
|
|
|
403
403
|
return json;
|
|
@@ -405,13 +405,13 @@ export default define(class Statement extends Element {
|
|
|
405
405
|
|
|
406
406
|
static fromJSON(json, context) {
|
|
407
407
|
return instantiate((context) => {
|
|
408
|
-
const { string,
|
|
408
|
+
const { string, breakPoint } = json,
|
|
409
409
|
statementNode = instantiateStatement(string, context),
|
|
410
410
|
node = statementNode; ///
|
|
411
411
|
|
|
412
412
|
context = null;
|
|
413
413
|
|
|
414
|
-
const statement = new Statement(context, string, node,
|
|
414
|
+
const statement = new Statement(context, string, node, breakPoint);
|
|
415
415
|
|
|
416
416
|
return statement;
|
|
417
417
|
}, context);
|
|
@@ -9,8 +9,8 @@ const { last } = arrayUtilities,
|
|
|
9
9
|
{ asyncEvery } = asynchronousUtilities;
|
|
10
10
|
|
|
11
11
|
export default define(class SubDerivation extends Element {
|
|
12
|
-
constructor(context, string, node,
|
|
13
|
-
super(context, string, node,
|
|
12
|
+
constructor(context, string, node, breakPoint, subproofOrProofAssertions) {
|
|
13
|
+
super(context, string, node, breakPoint);
|
|
14
14
|
|
|
15
15
|
this.subproofOrProofAssertions = subproofOrProofAssertions;
|
|
16
16
|
}
|
package/src/element/subproof.js
CHANGED
|
@@ -8,8 +8,8 @@ import { enclose } from "../utilities/context";
|
|
|
8
8
|
const { asyncEvery } = asynchronousUtilities;
|
|
9
9
|
|
|
10
10
|
export default define(class Subproof extends Element {
|
|
11
|
-
constructor(context, string, node,
|
|
12
|
-
super(context, string, node,
|
|
11
|
+
constructor(context, string, node, breakPoint, suppositions, subDerivation) {
|
|
12
|
+
super(context, string, node, breakPoint);
|
|
13
13
|
|
|
14
14
|
this.suppositions = suppositions;
|
|
15
15
|
this.subDerivation = subDerivation;
|
|
@@ -9,8 +9,8 @@ import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities
|
|
|
9
9
|
import { ablate, ablates, manifest, attempts, descend, instantiate, unserialises } from "../../utilities/context";
|
|
10
10
|
|
|
11
11
|
export default define(class FrameSubstitution extends Substitution {
|
|
12
|
-
constructor(contexts, string, node,
|
|
13
|
-
super(contexts, string, node,
|
|
12
|
+
constructor(contexts, string, node, breakPoint, targetFrame, replacementFrame) {
|
|
13
|
+
super(contexts, string, node, breakPoint);
|
|
14
14
|
|
|
15
15
|
this.targetFrame = targetFrame;
|
|
16
16
|
this.replacementFrame = replacementFrame;
|
|
@@ -195,7 +195,7 @@ export default define(class FrameSubstitution extends Substitution {
|
|
|
195
195
|
const context = specificContext; ///
|
|
196
196
|
|
|
197
197
|
instantiate((context) => {
|
|
198
|
-
const { string,
|
|
198
|
+
const { string, breakPoint } = json,
|
|
199
199
|
specificContext = context, ///
|
|
200
200
|
contexts = [
|
|
201
201
|
generalContext,
|
|
@@ -206,7 +206,7 @@ export default define(class FrameSubstitution extends Substitution {
|
|
|
206
206
|
targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
|
|
207
207
|
replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
|
|
208
208
|
|
|
209
|
-
frameSubstitutionn = new FrameSubstitution(contexts, string, node,
|
|
209
|
+
frameSubstitutionn = new FrameSubstitution(contexts, string, node, breakPoint, targetFrame, replacementFrame);
|
|
210
210
|
}, context);
|
|
211
211
|
}, json, context);
|
|
212
212
|
}
|
|
@@ -9,8 +9,8 @@ import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../u
|
|
|
9
9
|
import { ablates, manifest, attempts, descend, instantiate, unserialises } from "../../utilities/context";
|
|
10
10
|
|
|
11
11
|
export default define(class ReferenceSubstitution extends Substitution {
|
|
12
|
-
constructor(context, string, node,
|
|
13
|
-
super(context, string, node,
|
|
12
|
+
constructor(context, string, node, breakPoint, targetReference, replacementReference) {
|
|
13
|
+
super(context, string, node, breakPoint);
|
|
14
14
|
|
|
15
15
|
this.targetReference = targetReference;
|
|
16
16
|
this.replacementReference = replacementReference;
|
|
@@ -200,7 +200,7 @@ export default define(class ReferenceSubstitution extends Substitution {
|
|
|
200
200
|
const context = specificContext; ///
|
|
201
201
|
|
|
202
202
|
instantiate((context) => {
|
|
203
|
-
const { string,
|
|
203
|
+
const { string, breakPoint } = json,
|
|
204
204
|
specificContext = context, ///
|
|
205
205
|
contexts = [
|
|
206
206
|
generalContext,
|
|
@@ -211,7 +211,7 @@ export default define(class ReferenceSubstitution extends Substitution {
|
|
|
211
211
|
targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
|
|
212
212
|
replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
|
|
213
213
|
|
|
214
|
-
referenceSubstitutionn = new ReferenceSubstitution(contexts, string, node,
|
|
214
|
+
referenceSubstitutionn = new ReferenceSubstitution(contexts, string, node, breakPoint, targetReference, replacementReference);
|
|
215
215
|
}, context);
|
|
216
216
|
}, json, context);
|
|
217
217
|
}
|
|
@@ -11,8 +11,8 @@ import { join, ablates, manifest, attempts, descend, reconcile, instantiate, uns
|
|
|
11
11
|
import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
|
|
12
12
|
|
|
13
13
|
export default define(class StatementSubstitution extends Substitution {
|
|
14
|
-
constructor(contexts, string, node,
|
|
15
|
-
super(contexts, string, node,
|
|
14
|
+
constructor(contexts, string, node, breakPoint, resolved, substitution, targetStatement, replacementStatement) {
|
|
15
|
+
super(contexts, string, node, breakPoint);
|
|
16
16
|
|
|
17
17
|
this.resolved = resolved;
|
|
18
18
|
this.substitution = substitution;
|
|
@@ -360,7 +360,7 @@ export default define(class StatementSubstitution extends Substitution {
|
|
|
360
360
|
const context = specificContext; ///
|
|
361
361
|
|
|
362
362
|
instantiate((context) => {
|
|
363
|
-
const { string,
|
|
363
|
+
const { string, breakPoint } = json,
|
|
364
364
|
specificContext = context, ///
|
|
365
365
|
contexts = [
|
|
366
366
|
generalContext,
|
|
@@ -373,7 +373,7 @@ export default define(class StatementSubstitution extends Substitution {
|
|
|
373
373
|
targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
|
|
374
374
|
replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context);
|
|
375
375
|
|
|
376
|
-
statementSubstitutionn = new StatementSubstitution(contexts, string, node,
|
|
376
|
+
statementSubstitutionn = new StatementSubstitution(contexts, string, node, breakPoint, resolved, substitution, targetStatement, replacementStatement);
|
|
377
377
|
}, context);
|
|
378
378
|
}, json, context);
|
|
379
379
|
}
|
|
@@ -10,8 +10,8 @@ import { termSubstitutionStringFromTermAndVariable } from "../../utilities/strin
|
|
|
10
10
|
import { ablate, ablates, manifest, attempts, descend, instantiate, unserialises } from "../../utilities/context";
|
|
11
11
|
|
|
12
12
|
export default define(class TermSubstitution extends Substitution {
|
|
13
|
-
constructor(context, string, node,
|
|
14
|
-
super(context, string, node,
|
|
13
|
+
constructor(context, string, node, breakPoint, targetTerm, replacementTerm) {
|
|
14
|
+
super(context, string, node, breakPoint);
|
|
15
15
|
|
|
16
16
|
this.targetTerm = targetTerm;
|
|
17
17
|
this.replacementTerm = replacementTerm;
|
|
@@ -204,7 +204,7 @@ export default define(class TermSubstitution extends Substitution {
|
|
|
204
204
|
const context = specificContext; ///
|
|
205
205
|
|
|
206
206
|
instantiate((context) => {
|
|
207
|
-
const { string,
|
|
207
|
+
const { string, breakPoint } = json,
|
|
208
208
|
specificContext = context, ///
|
|
209
209
|
contexts = [
|
|
210
210
|
generalContext,
|
|
@@ -215,7 +215,7 @@ export default define(class TermSubstitution extends Substitution {
|
|
|
215
215
|
targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
|
|
216
216
|
replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
|
|
217
217
|
|
|
218
|
-
termSubstitutionn = new TermSubstitution(contexts, string, node,
|
|
218
|
+
termSubstitutionn = new TermSubstitution(contexts, string, node, breakPoint, targetTerm, replacementTerm);
|
|
219
219
|
}, context);
|
|
220
220
|
}, json, context);
|
|
221
221
|
}
|
|
@@ -9,11 +9,11 @@ const { first, second } = arrayUtilities,
|
|
|
9
9
|
{ primitiveFromNode } =primitiveUtilities;
|
|
10
10
|
|
|
11
11
|
class Element {
|
|
12
|
-
constructor(contexts, string, node,
|
|
12
|
+
constructor(contexts, string, node, breakPoint) {
|
|
13
13
|
this.contexts = contexts;
|
|
14
14
|
this.string = string;
|
|
15
15
|
this.node = node;
|
|
16
|
-
this.
|
|
16
|
+
this.breakPoint = breakPoint;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
getContexts() {
|
|
@@ -28,8 +28,8 @@ class Element {
|
|
|
28
28
|
return this.node;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
|
|
32
|
-
return this.
|
|
31
|
+
getBreakPoint() {
|
|
32
|
+
return this.breakPoint;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
setContexts(contexts) {
|
|
@@ -44,12 +44,12 @@ class Element {
|
|
|
44
44
|
this.node = node;
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
setLineIndex(
|
|
48
|
-
this.
|
|
47
|
+
setLineIndex(breakPoint) {
|
|
48
|
+
this.breakPoint = breakPoint;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
async break(context) {
|
|
52
|
-
this.
|
|
52
|
+
this.breakPoint = await context.break(this.node, this.breakPoint);
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
matchNode(node) { return this.node.match(node); }
|
|
@@ -244,12 +244,12 @@ export default class Substitution extends Element {
|
|
|
244
244
|
return serialises((...contexts) => {
|
|
245
245
|
const name = this.getName(),
|
|
246
246
|
string = this.getString(),
|
|
247
|
-
|
|
247
|
+
breakPoint = this.getBreakPoint(),
|
|
248
248
|
json = {
|
|
249
249
|
name,
|
|
250
250
|
contexts,
|
|
251
251
|
string,
|
|
252
|
-
|
|
252
|
+
breakPoint
|
|
253
253
|
};
|
|
254
254
|
|
|
255
255
|
return json;
|
package/src/element/term.js
CHANGED
|
@@ -14,8 +14,8 @@ import { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisi
|
|
|
14
14
|
const { filter } = arrayUtilities;
|
|
15
15
|
|
|
16
16
|
export default define(class Term extends Element {
|
|
17
|
-
constructor(context, string, node,
|
|
18
|
-
super(context, string, node,
|
|
17
|
+
constructor(context, string, node, breakPoint, type, provisional) {
|
|
18
|
+
super(context, string, node, breakPoint, provisional);
|
|
19
19
|
|
|
20
20
|
this.type = type;
|
|
21
21
|
this.provisional = provisional;
|
|
@@ -289,12 +289,12 @@ export default define(class Term extends Element {
|
|
|
289
289
|
const typeJSON = typeToTypeJSON(this.type),
|
|
290
290
|
provisionalJSON = provisionalToProvisionalJSON(this.provisional),
|
|
291
291
|
string = this.getString(), ///
|
|
292
|
-
|
|
292
|
+
breakPoint = this.getBreakPoint(),
|
|
293
293
|
type = typeJSON, ///
|
|
294
294
|
provisional = provisionalJSON, ///
|
|
295
295
|
json = {
|
|
296
296
|
string,
|
|
297
|
-
|
|
297
|
+
breakPoint,
|
|
298
298
|
type,
|
|
299
299
|
provisional
|
|
300
300
|
};
|
|
@@ -306,7 +306,7 @@ export default define(class Term extends Element {
|
|
|
306
306
|
|
|
307
307
|
static fromJSON(json, context) {
|
|
308
308
|
return instantiate((context) => {
|
|
309
|
-
const { string,
|
|
309
|
+
const { string, breakPoint } = json,
|
|
310
310
|
termNode = instantiateTerm(string, context),
|
|
311
311
|
node = termNode, ///
|
|
312
312
|
type = typeFromJSON(json, context),
|
|
@@ -314,7 +314,7 @@ export default define(class Term extends Element {
|
|
|
314
314
|
|
|
315
315
|
context = null;
|
|
316
316
|
|
|
317
|
-
const term = new Term(context, string, node,
|
|
317
|
+
const term = new Term(context, string, node, breakPoint, type, provisional);
|
|
318
318
|
|
|
319
319
|
return term;
|
|
320
320
|
}, context);
|
|
@@ -20,8 +20,8 @@ const { reverse } = arrayUtilities,
|
|
|
20
20
|
{ asyncExtract, asyncForwardsEvery, asyncBackwardsEvery } = asynchronousUtilities;
|
|
21
21
|
|
|
22
22
|
export default class TopLevelAssertion extends Element {
|
|
23
|
-
constructor(context, string, node,
|
|
24
|
-
super(context, string, node,
|
|
23
|
+
constructor(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses) {
|
|
24
|
+
super(context, string, node, breakPoint);
|
|
25
25
|
|
|
26
26
|
this.labels = labels;
|
|
27
27
|
this.suppositions = suppositions;
|
|
@@ -354,7 +354,7 @@ export default class TopLevelAssertion extends Element {
|
|
|
354
354
|
signatureJSON = signatureToSignatureJSON(this.signature),
|
|
355
355
|
hypothesesJSON = hypothesesToHypothesesJSON(this.hypotheses),
|
|
356
356
|
string = this.getString(),
|
|
357
|
-
|
|
357
|
+
breakPoint = this.getBreakPoint(),
|
|
358
358
|
labels = labelsJSON, ///
|
|
359
359
|
deduction = deductionJSON, ///
|
|
360
360
|
suppositions = suppositionsJSON, ///
|
|
@@ -362,7 +362,7 @@ export default class TopLevelAssertion extends Element {
|
|
|
362
362
|
hypotheses = hypothesesJSON, ///
|
|
363
363
|
json = {
|
|
364
364
|
string,
|
|
365
|
-
|
|
365
|
+
breakPoint,
|
|
366
366
|
labels,
|
|
367
367
|
deduction,
|
|
368
368
|
suppositions,
|
|
@@ -374,7 +374,7 @@ export default class TopLevelAssertion extends Element {
|
|
|
374
374
|
}
|
|
375
375
|
|
|
376
376
|
static fromJSON(Class, json, context) {
|
|
377
|
-
const {
|
|
377
|
+
const { breakPoint } = json,
|
|
378
378
|
labels = labelsFromJSON(json, context),
|
|
379
379
|
deduction = deductionFromJSON(json, context),
|
|
380
380
|
suppositions = suppositionsFromJSON(json, context),
|
|
@@ -384,7 +384,7 @@ export default class TopLevelAssertion extends Element {
|
|
|
384
384
|
node = null,
|
|
385
385
|
proof = null,
|
|
386
386
|
string = topLevelAssertionString, ///
|
|
387
|
-
topLevelAssertion = new Class(context, string, node,
|
|
387
|
+
topLevelAssertion = new Class(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses);
|
|
388
388
|
|
|
389
389
|
return topLevelAssertion;
|
|
390
390
|
}
|
|
@@ -16,8 +16,8 @@ import { labelFromJSON,
|
|
|
16
16
|
const { asyncForwardsEvery } = asynchronousUtilities;
|
|
17
17
|
|
|
18
18
|
export default class TopLevelMetaAssertion extends Element {
|
|
19
|
-
constructor(context, string, node,
|
|
20
|
-
super(context, string, node,
|
|
19
|
+
constructor(context, string, node, breakPoint, label, suppositions, deduction, proof, metaLevelAssumptions) {
|
|
20
|
+
super(context, string, node, breakPoint);
|
|
21
21
|
|
|
22
22
|
this.label = label;
|
|
23
23
|
this.suppositions = suppositions;
|
|
@@ -234,14 +234,14 @@ export default class TopLevelMetaAssertion extends Element {
|
|
|
234
234
|
suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
|
|
235
235
|
metaLevelAssumptionsJSON = metaLevelAssumptionsToMetaLevelAssumptionsJSON(this.metaLevelAssumptions),
|
|
236
236
|
string = this.getString(),
|
|
237
|
-
|
|
237
|
+
breakPoint = this.getBreakPoint(),
|
|
238
238
|
label = labelJSON, ///
|
|
239
239
|
deduction = deductionJSON, ///
|
|
240
240
|
suppositions = suppositionsJSON, ///
|
|
241
241
|
metaLevelAssumptions = metaLevelAssumptionsJSON, ///
|
|
242
242
|
json = {
|
|
243
243
|
string,
|
|
244
|
-
|
|
244
|
+
breakPoint,
|
|
245
245
|
label,
|
|
246
246
|
deduction,
|
|
247
247
|
suppositions,
|
|
@@ -252,7 +252,7 @@ export default class TopLevelMetaAssertion extends Element {
|
|
|
252
252
|
}
|
|
253
253
|
|
|
254
254
|
static fromJSON(Class, json, context) {
|
|
255
|
-
const {
|
|
255
|
+
const { breakPoint } = json,
|
|
256
256
|
label = labelFromJSON(json, context),
|
|
257
257
|
deduction = deductionFromJSON(json, context),
|
|
258
258
|
suppositions = suppositionsFromJSON(json, context),
|
|
@@ -260,7 +260,7 @@ export default class TopLevelMetaAssertion extends Element {
|
|
|
260
260
|
node = null,
|
|
261
261
|
proof = null,
|
|
262
262
|
string = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
|
|
263
|
-
topLevelMetaAssertion = new Class(context, string, node,
|
|
263
|
+
topLevelMetaAssertion = new Class(context, string, node, breakPoint, label, suppositions, deduction, proof, metaLevelAssumptions);
|
|
264
264
|
|
|
265
265
|
return topLevelMetaAssertion;
|
|
266
266
|
}
|
package/src/element/type.js
CHANGED
|
@@ -20,8 +20,8 @@ import { propertiesFromJSON,
|
|
|
20
20
|
const { push, first } = arrayUtilities;
|
|
21
21
|
|
|
22
22
|
export default define(class Type extends Element {
|
|
23
|
-
constructor(context, string, node,
|
|
24
|
-
super(context, string, node,
|
|
23
|
+
constructor(context, string, node, breakPoint, name, prefixName, superTypes, properties, provisional) {
|
|
24
|
+
super(context, string, node, breakPoint);
|
|
25
25
|
|
|
26
26
|
this.name = name;
|
|
27
27
|
this.prefixName = prefixName;
|
|
@@ -298,10 +298,10 @@ export default define(class Type extends Element {
|
|
|
298
298
|
|
|
299
299
|
toJSON(abridged = false) {
|
|
300
300
|
const string = this.getString(),
|
|
301
|
-
|
|
301
|
+
breakPoint = this.getBreakPoint(),
|
|
302
302
|
json = {
|
|
303
303
|
string,
|
|
304
|
-
|
|
304
|
+
breakPoint
|
|
305
305
|
};
|
|
306
306
|
|
|
307
307
|
if (!abridged) {
|
|
@@ -329,7 +329,7 @@ export default define(class Type extends Element {
|
|
|
329
329
|
|
|
330
330
|
static fromJSON(json, context) {
|
|
331
331
|
return instantiate((context) => {
|
|
332
|
-
const { string,
|
|
332
|
+
const { string, breakPoint } = json,
|
|
333
333
|
typeNode = instantiateType(string, context),
|
|
334
334
|
node = typeNode, ///
|
|
335
335
|
name = nameFromTypeNode(typeNode, context),
|
|
@@ -340,7 +340,7 @@ export default define(class Type extends Element {
|
|
|
340
340
|
|
|
341
341
|
context = null; ///
|
|
342
342
|
|
|
343
|
-
const type = new Type(context, string, node,
|
|
343
|
+
const type = new Type(context, string, node, breakPoint, name, prefixName, superTypes, properties, provisional);
|
|
344
344
|
|
|
345
345
|
return type;
|
|
346
346
|
}, context);
|
|
@@ -349,7 +349,7 @@ export default define(class Type extends Element {
|
|
|
349
349
|
static fromName(name, context) {
|
|
350
350
|
const string = name, ///
|
|
351
351
|
node = null,
|
|
352
|
-
|
|
352
|
+
breakPoint = null,
|
|
353
353
|
prefixName = null,
|
|
354
354
|
superTypes = [],
|
|
355
355
|
properties = [],
|
|
@@ -357,7 +357,7 @@ export default define(class Type extends Element {
|
|
|
357
357
|
|
|
358
358
|
context = null;
|
|
359
359
|
|
|
360
|
-
const type = new Type(context, string, node,
|
|
360
|
+
const type = new Type(context, string, node, breakPoint, name, prefixName, superTypes, properties, provisional);
|
|
361
361
|
|
|
362
362
|
return type;
|
|
363
363
|
}
|
|
@@ -8,8 +8,8 @@ import { instantiateTypePrefix } from "../process/instantiate";
|
|
|
8
8
|
import { nameFromTypePrefixNode } from "../utilities/element";
|
|
9
9
|
|
|
10
10
|
export default define(class TypePrefix extends Element {
|
|
11
|
-
constructor(context, string, node,
|
|
12
|
-
super(context, string, node,
|
|
11
|
+
constructor(context, string, node, breakPoint, name) {
|
|
12
|
+
super(context, string, node, breakPoint);
|
|
13
13
|
|
|
14
14
|
this.name = name;
|
|
15
15
|
}
|
|
@@ -77,10 +77,10 @@ export default define(class TypePrefix extends Element {
|
|
|
77
77
|
|
|
78
78
|
toJSON() {
|
|
79
79
|
const string = this.getString(),
|
|
80
|
-
|
|
80
|
+
breakPoint = this.getBreakPoint(),
|
|
81
81
|
json = {
|
|
82
82
|
string,
|
|
83
|
-
|
|
83
|
+
breakPoint
|
|
84
84
|
};
|
|
85
85
|
|
|
86
86
|
return json;
|
|
@@ -88,14 +88,14 @@ export default define(class TypePrefix extends Element {
|
|
|
88
88
|
|
|
89
89
|
static fromJSON(json, context) {
|
|
90
90
|
return instantiate((context) => {
|
|
91
|
-
const { string,
|
|
91
|
+
const { string, breakPoint } = json,
|
|
92
92
|
typePrefixNode = instantiateTypePrefix(string, context),
|
|
93
93
|
node = typePrefixNode, ///
|
|
94
94
|
name = nameFromTypePrefixNode(typePrefixNode, context);
|
|
95
95
|
|
|
96
96
|
context = null; ///
|
|
97
97
|
|
|
98
|
-
const typePrefix = new TypePrefix(context, string, node,
|
|
98
|
+
const typePrefix = new TypePrefix(context, string, node, breakPoint, name);
|
|
99
99
|
|
|
100
100
|
return typePrefix;
|
|
101
101
|
}, context);
|
package/src/element/variable.js
CHANGED
|
@@ -12,8 +12,8 @@ import { variableFromTermNode, identifierFromVariableNode } from "../utilities/e
|
|
|
12
12
|
import { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisionalJSON } from "../utilities/json";
|
|
13
13
|
|
|
14
14
|
export default define(class Variable extends Element {
|
|
15
|
-
constructor(context, string, node,
|
|
16
|
-
super(context, string, node,
|
|
15
|
+
constructor(context, string, node, breakPoint, type, identifier, provisional) {
|
|
16
|
+
super(context, string, node, breakPoint);
|
|
17
17
|
|
|
18
18
|
this.type = type;
|
|
19
19
|
this.identifier = identifier;
|
|
@@ -208,12 +208,12 @@ export default define(class Variable extends Element {
|
|
|
208
208
|
const typeJSON = typeToTypeJSON(this.type),
|
|
209
209
|
provisionalJSON = provisionalToProvisionalJSON(this.provisional),
|
|
210
210
|
string = this.getString(), ///
|
|
211
|
-
|
|
211
|
+
breakPoint = this.getBreakPoint(),
|
|
212
212
|
type = typeJSON, ///
|
|
213
213
|
provisional = provisionalJSON, ///
|
|
214
214
|
json = {
|
|
215
215
|
string,
|
|
216
|
-
|
|
216
|
+
breakPoint,
|
|
217
217
|
type,
|
|
218
218
|
provisional
|
|
219
219
|
};
|
|
@@ -225,7 +225,7 @@ export default define(class Variable extends Element {
|
|
|
225
225
|
|
|
226
226
|
static fromJSON(json, context) {
|
|
227
227
|
return instantiate((context) => {
|
|
228
|
-
const { string,
|
|
228
|
+
const { string, breakPoint } = json,
|
|
229
229
|
variableNode = instantiateVariable(string, context),
|
|
230
230
|
node = variableNode, ///
|
|
231
231
|
type = typeFromJSON(json, context),
|
|
@@ -234,7 +234,7 @@ export default define(class Variable extends Element {
|
|
|
234
234
|
|
|
235
235
|
context = null;
|
|
236
236
|
|
|
237
|
-
const variable = new Variable(context, string, node,
|
|
237
|
+
const variable = new Variable(context, string, node, breakPoint, type, identifier, provisional);
|
|
238
238
|
|
|
239
239
|
return variable;
|
|
240
240
|
}, context);
|