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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.936",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.47",
|
|
14
14
|
"necessary": "^17.1.7",
|
|
15
|
-
"occam-furtle": "^3.0.
|
|
15
|
+
"occam-furtle": "^3.0.202",
|
|
16
16
|
"occam-grammars": "^1.3.524",
|
|
17
17
|
"occam-languages": "^0.0.204",
|
|
18
18
|
"occam-lexers": "^23.1.44",
|
package/src/action/verify.js
CHANGED
|
@@ -13,7 +13,7 @@ const { last } = arrayUtilities,
|
|
|
13
13
|
{ createReleaseContexts, verifyReleaseContexts, initialiseReleaseContexts } = verificationUtilities;
|
|
14
14
|
|
|
15
15
|
export default async function verifyAction(name, log) {
|
|
16
|
-
const callback = async (context,
|
|
16
|
+
const callback = async (context, breakPoint) => {
|
|
17
17
|
///
|
|
18
18
|
},
|
|
19
19
|
releaseContexts = [],
|
|
@@ -13,8 +13,8 @@ import { termFromContainedAssertionNode,
|
|
|
13
13
|
containedAssertionFromStatementNode } from "../../utilities/element";
|
|
14
14
|
|
|
15
15
|
export default define(class ContainedAssertion extends Assertion {
|
|
16
|
-
constructor(context, string, node,
|
|
17
|
-
super(context, string, node,
|
|
16
|
+
constructor(context, string, node, breakPoint, term, frame, negated, statement) {
|
|
17
|
+
super(context, string, node, breakPoint);
|
|
18
18
|
|
|
19
19
|
this.term = term;
|
|
20
20
|
this.frame = frame;
|
|
@@ -253,7 +253,7 @@ export default define(class ContainedAssertion extends Assertion {
|
|
|
253
253
|
|
|
254
254
|
if (this.name === name) {
|
|
255
255
|
instantiate((context) => {
|
|
256
|
-
const { string,
|
|
256
|
+
const { string, breakPoint } = json,
|
|
257
257
|
containedAssertionNode = instantiateContainedAssertion(string, context),
|
|
258
258
|
node = containedAssertionNode, ///
|
|
259
259
|
term = termFromContainedAssertionNode(containedAssertionNode, context),
|
|
@@ -263,7 +263,7 @@ export default define(class ContainedAssertion extends Assertion {
|
|
|
263
263
|
|
|
264
264
|
context = null;
|
|
265
265
|
|
|
266
|
-
containedAssertion = new ContainedAssertion(context, string, node,
|
|
266
|
+
containedAssertion = new ContainedAssertion(context, string, node, breakPoint, term, frame, negated, statement);
|
|
267
267
|
}, context);
|
|
268
268
|
}
|
|
269
269
|
|
|
@@ -10,8 +10,8 @@ import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions } from "..
|
|
|
10
10
|
import { termFromJDefinedAssertionNode, frameFromJDefinedAssertionNode, negatedFromJDefinedAssertionNode, definedAssertionFromStatementNode } from "../../utilities/element";
|
|
11
11
|
|
|
12
12
|
export default define(class DefinedAssertion extends Assertion {
|
|
13
|
-
constructor(context, string, node,
|
|
14
|
-
super(context, string, node,
|
|
13
|
+
constructor(context, string, node, breakPoint, term, frame, negated) {
|
|
14
|
+
super(context, string, node, breakPoint);
|
|
15
15
|
|
|
16
16
|
this.term = term;
|
|
17
17
|
this.frame= frame;
|
|
@@ -221,7 +221,7 @@ export default define(class DefinedAssertion extends Assertion {
|
|
|
221
221
|
|
|
222
222
|
if (this.name === name) {
|
|
223
223
|
instantiate((context) => {
|
|
224
|
-
const { string,
|
|
224
|
+
const { string, breakPoint } = json,
|
|
225
225
|
definedAssertionNode = instantiateDefinedAssertion(string, context),
|
|
226
226
|
node = definedAssertionNode, ///
|
|
227
227
|
term = termFromJDefinedAssertionNode(definedAssertionNode, context),
|
|
@@ -230,7 +230,7 @@ export default define(class DefinedAssertion extends Assertion {
|
|
|
230
230
|
|
|
231
231
|
context = null;
|
|
232
232
|
|
|
233
|
-
definedAssertion = new DefinedAssertion(context, string, node,
|
|
233
|
+
definedAssertion = new DefinedAssertion(context, string, node, breakPoint, term, frame, negated);
|
|
234
234
|
}, context);
|
|
235
235
|
}
|
|
236
236
|
|
|
@@ -9,8 +9,8 @@ import { variableAssignmentFromPrepertyAssertion } from "../../process/assign";
|
|
|
9
9
|
import { termFromPropertyAssertionNode, propertyAssertionFromStatementNode, propertyRelationFromPropertyAssertionNode } from "../../utilities/element";
|
|
10
10
|
|
|
11
11
|
export default define(class PropertyAssertion extends Assertion {
|
|
12
|
-
constructor(context, string, node,
|
|
13
|
-
super(context, string, node,
|
|
12
|
+
constructor(context, string, node, breakPoint, term, propertyRelation) {
|
|
13
|
+
super(context, string, node, breakPoint);
|
|
14
14
|
|
|
15
15
|
this.term = term;
|
|
16
16
|
this.propertyRelation = propertyRelation;
|
|
@@ -226,7 +226,7 @@ export default define(class PropertyAssertion extends Assertion {
|
|
|
226
226
|
|
|
227
227
|
if (this.name === name) {
|
|
228
228
|
instantiate((context) => {
|
|
229
|
-
const { string,
|
|
229
|
+
const { string, breakPoint } = json,
|
|
230
230
|
propertyAssertionNode = instantiatePropertyAssertion(string, context),
|
|
231
231
|
node = propertyAssertionNode, ///
|
|
232
232
|
term = termFromPropertyAssertionNode(propertyAssertionNode, context),
|
|
@@ -234,7 +234,7 @@ export default define(class PropertyAssertion extends Assertion {
|
|
|
234
234
|
|
|
235
235
|
context = null;
|
|
236
236
|
|
|
237
|
-
propertyAssertion = new PropertyAssertion(context, string, node,
|
|
237
|
+
propertyAssertion = new PropertyAssertion(context, string, node, breakPoint, term, propertyRelation);
|
|
238
238
|
}, context);
|
|
239
239
|
}
|
|
240
240
|
|
|
@@ -8,8 +8,8 @@ import { instantiateSignatureAssertion } from "../../process/instantiate";
|
|
|
8
8
|
import { signatureFromSignatureAssertionNode, referenceFromSignatureAssertionNode, signatureAssertionFromStatementNode } from "../../utilities/element";
|
|
9
9
|
|
|
10
10
|
export default define(class SignatureAssertion extends Assertion {
|
|
11
|
-
constructor(context, string, node,
|
|
12
|
-
super(context, string, node,
|
|
11
|
+
constructor(context, string, node, breakPoint, signature, reference) {
|
|
12
|
+
super(context, string, node, breakPoint);
|
|
13
13
|
|
|
14
14
|
this.signature = signature;
|
|
15
15
|
this.reference = reference;
|
|
@@ -211,7 +211,7 @@ export default define(class SignatureAssertion extends Assertion {
|
|
|
211
211
|
|
|
212
212
|
if (this.name === name) {
|
|
213
213
|
instantiate((context) => {
|
|
214
|
-
const { string,
|
|
214
|
+
const { string, breakPoint } = json,
|
|
215
215
|
definedAssertionNode = instantiateSignatureAssertion(string, context),
|
|
216
216
|
node = definedAssertionNode, ///
|
|
217
217
|
signature = signatureFromSignatureAssertionNode(definedAssertionNode, context),
|
|
@@ -219,7 +219,7 @@ export default define(class SignatureAssertion extends Assertion {
|
|
|
219
219
|
|
|
220
220
|
context = null;
|
|
221
221
|
|
|
222
|
-
signatureAssertion = new SignatureAssertion(context, string, node,
|
|
222
|
+
signatureAssertion = new SignatureAssertion(context, string, node, breakPoint, signature, reference);
|
|
223
223
|
}, context);
|
|
224
224
|
}
|
|
225
225
|
|
|
@@ -13,8 +13,8 @@ import { subproofAssertionFromStatementNode } from "../../utilities/element";
|
|
|
13
13
|
const { last, front, backwardsEvery } = arrayUtilities;
|
|
14
14
|
|
|
15
15
|
export default define(class SubproofAssertion extends Assertion {
|
|
16
|
-
constructor(context, string, node,
|
|
17
|
-
super(context, string, node,
|
|
16
|
+
constructor(context, string, node, breakPoint, statements) {
|
|
17
|
+
super(context, string, node, breakPoint);
|
|
18
18
|
|
|
19
19
|
this.statements = statements;
|
|
20
20
|
}
|
|
@@ -300,14 +300,14 @@ export default define(class SubproofAssertion extends Assertion {
|
|
|
300
300
|
|
|
301
301
|
if (this.name === name) {
|
|
302
302
|
instantiate((context) => {
|
|
303
|
-
const { string,
|
|
303
|
+
const { string, breakPoint } = json,
|
|
304
304
|
subproofAssertionNode = instantiateSubproofAssertion(string, context),
|
|
305
305
|
statements = statementsFromSubproofAssertionNode(subproofAssertionNode, context),
|
|
306
306
|
node = subproofAssertionNode; ///
|
|
307
307
|
|
|
308
308
|
context = null;
|
|
309
309
|
|
|
310
|
-
subproorAssertion = new SubproofAssertion(context, string, node,
|
|
310
|
+
subproorAssertion = new SubproofAssertion(context, string, node, breakPoint, statements);
|
|
311
311
|
}, context);
|
|
312
312
|
}
|
|
313
313
|
|
|
@@ -11,8 +11,8 @@ import { variableAssignmentFromTypeAssertion } from "../../process/assign";
|
|
|
11
11
|
import { termFromTypeAssertionNode, typeAssertionFromStatementNode } from "../../utilities/element";
|
|
12
12
|
|
|
13
13
|
export default define(class TypeAssertion extends Assertion {
|
|
14
|
-
constructor(context, string, node,
|
|
15
|
-
super(context, string, node,
|
|
14
|
+
constructor(context, string, node, breakPoint, term, type) {
|
|
15
|
+
super(context, string, node, breakPoint);
|
|
16
16
|
|
|
17
17
|
this.term = term;
|
|
18
18
|
this.type = type;
|
|
@@ -221,12 +221,12 @@ export default define(class TypeAssertion extends Assertion {
|
|
|
221
221
|
const typeJSON = typeToTypeJSON(this.type),
|
|
222
222
|
name = this.getName(),
|
|
223
223
|
string = this.getString(),
|
|
224
|
-
|
|
224
|
+
breakPoint = this.getBreakPoint(),
|
|
225
225
|
type = typeJSON,
|
|
226
226
|
json = {
|
|
227
227
|
name,
|
|
228
228
|
string,
|
|
229
|
-
|
|
229
|
+
breakPoint,
|
|
230
230
|
type
|
|
231
231
|
};
|
|
232
232
|
|
|
@@ -242,7 +242,7 @@ export default define(class TypeAssertion extends Assertion {
|
|
|
242
242
|
|
|
243
243
|
if (this.name === name) {
|
|
244
244
|
instantiate((context) => {
|
|
245
|
-
const { string,
|
|
245
|
+
const { string, breakPoint } = json,
|
|
246
246
|
typeAssertionNode = instantiateTypeAssertion(string, context),
|
|
247
247
|
term = termFromTypeAssertionNode(typeAssertionNode, context),
|
|
248
248
|
type = typeFromJSON(json, context),
|
|
@@ -250,7 +250,7 @@ export default define(class TypeAssertion extends Assertion {
|
|
|
250
250
|
|
|
251
251
|
context = null;
|
|
252
252
|
|
|
253
|
-
typeAssertion = new TypeAssertion(context, string, node,
|
|
253
|
+
typeAssertion = new TypeAssertion(context, string, node, breakPoint, term, type);
|
|
254
254
|
}, context);
|
|
255
255
|
}
|
|
256
256
|
|
package/src/element/assertion.js
CHANGED
|
@@ -43,11 +43,11 @@ export default class Assertion extends Element {
|
|
|
43
43
|
toJSON() {
|
|
44
44
|
const name = this.getName(),
|
|
45
45
|
string = this.getString(),
|
|
46
|
-
|
|
46
|
+
breakPoint = this.getBreakPoint(),
|
|
47
47
|
json = {
|
|
48
48
|
name,
|
|
49
49
|
string,
|
|
50
|
-
|
|
50
|
+
breakPoint
|
|
51
51
|
};
|
|
52
52
|
|
|
53
53
|
return json;
|
|
@@ -11,8 +11,8 @@ import { metaLevelAssumptionStringFromReferenceAndStatement } from "../../utilit
|
|
|
11
11
|
import { join, ablate, attempt, descend, reconcile, serialise, unserialise, instantiate } from "../../utilities/context";
|
|
12
12
|
|
|
13
13
|
export default define(class MetaLevelAssumption extends Element {
|
|
14
|
-
constructor(context, string, node,
|
|
15
|
-
super(context, string, node,
|
|
14
|
+
constructor(context, string, node, breakPoint, reference, statement) {
|
|
15
|
+
super(context, string, node, breakPoint);
|
|
16
16
|
|
|
17
17
|
this.reference = reference;
|
|
18
18
|
this.statement = statement;
|
|
@@ -286,11 +286,11 @@ export default define(class MetaLevelAssumption extends Element {
|
|
|
286
286
|
|
|
287
287
|
return serialise((context) => {
|
|
288
288
|
const string = this.getString(),
|
|
289
|
-
|
|
289
|
+
breakPoint = this.getBreakPoint(),
|
|
290
290
|
json = {
|
|
291
291
|
context,
|
|
292
292
|
string,
|
|
293
|
-
|
|
293
|
+
breakPoint
|
|
294
294
|
};
|
|
295
295
|
|
|
296
296
|
return json;
|
|
@@ -304,13 +304,13 @@ export default define(class MetaLevelAssumption extends Element {
|
|
|
304
304
|
|
|
305
305
|
unserialise((json, context) => {
|
|
306
306
|
instantiate((context) => {
|
|
307
|
-
const { string,
|
|
307
|
+
const { string, breakPoint } = json,
|
|
308
308
|
metaLevelAssumptionNode = instantiateMetaLevelAssumption(string, context),
|
|
309
309
|
node = metaLevelAssumptionNode, ///
|
|
310
310
|
reference = referenceFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context),
|
|
311
311
|
statement = statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context);
|
|
312
312
|
|
|
313
|
-
metaLevelAssumption = new MetaLevelAssumption(context, string, node,
|
|
313
|
+
metaLevelAssumption = new MetaLevelAssumption(context, string, node, breakPoint, reference, statement);
|
|
314
314
|
}, context);
|
|
315
315
|
}, json, context);
|
|
316
316
|
|
|
@@ -7,8 +7,8 @@ import {instantiate, reconcile} from "../utilities/context";
|
|
|
7
7
|
import { instantiateAssumption } from "../process/instantiate";
|
|
8
8
|
|
|
9
9
|
export default define(class Assumption extends Element {
|
|
10
|
-
constructor(context, string, node,
|
|
11
|
-
super(context, string, node,
|
|
10
|
+
constructor(context, string, node, breakPoint, reference, statement) {
|
|
11
|
+
super(context, string, node, breakPoint);
|
|
12
12
|
|
|
13
13
|
this.reference = reference;
|
|
14
14
|
this.statement = statement;
|
|
@@ -248,10 +248,10 @@ export default define(class Assumption extends Element {
|
|
|
248
248
|
|
|
249
249
|
toJSON() {
|
|
250
250
|
const string = this.getString(),
|
|
251
|
-
|
|
251
|
+
breakPoint = this.getBreakPoint(),
|
|
252
252
|
json = {
|
|
253
253
|
string,
|
|
254
|
-
|
|
254
|
+
breakPoint
|
|
255
255
|
};
|
|
256
256
|
|
|
257
257
|
return json;
|
|
@@ -259,12 +259,12 @@ export default define(class Assumption extends Element {
|
|
|
259
259
|
|
|
260
260
|
static fromJSON(json, context) {
|
|
261
261
|
return instantiate((context) => {
|
|
262
|
-
const { string,
|
|
262
|
+
const { string, breakPoint } = json,
|
|
263
263
|
assumptionNode = instantiateAssumption(string, context),
|
|
264
264
|
node = assumptionNode, ///
|
|
265
265
|
reference = referenceFromAssumptionNode(assumptionNode, context),
|
|
266
266
|
statement = statementFromAssumptionNode(assumptionNode, context),
|
|
267
|
-
assumption = new Assumption(context, string, node,
|
|
267
|
+
assumption = new Assumption(context, string, node, breakPoint, reference, statement);
|
|
268
268
|
|
|
269
269
|
return assumption;
|
|
270
270
|
}, context);
|
|
@@ -10,8 +10,8 @@ import { validateStatementAsCombinator } from "../process/validate";
|
|
|
10
10
|
import { attempt, serialise, unserialise, instantiate } from "../utilities/context";
|
|
11
11
|
|
|
12
12
|
export default define(class Combinator extends Element {
|
|
13
|
-
constructor(context, string, node,
|
|
14
|
-
super(context, string, node,
|
|
13
|
+
constructor(context, string, node, breakPoint, statement) {
|
|
14
|
+
super(context, string, node, breakPoint);
|
|
15
15
|
|
|
16
16
|
this.statement = statement;
|
|
17
17
|
}
|
|
@@ -106,11 +106,11 @@ export default define(class Combinator extends Element {
|
|
|
106
106
|
|
|
107
107
|
return serialise((context) => {
|
|
108
108
|
const string = this.getString(),
|
|
109
|
-
|
|
109
|
+
breakPoint = this.getBreakPoint(),
|
|
110
110
|
json = {
|
|
111
111
|
context,
|
|
112
112
|
string,
|
|
113
|
-
|
|
113
|
+
breakPoint
|
|
114
114
|
};
|
|
115
115
|
|
|
116
116
|
return json;
|
|
@@ -124,12 +124,12 @@ export default define(class Combinator extends Element {
|
|
|
124
124
|
|
|
125
125
|
unserialise((json, context) => {
|
|
126
126
|
instantiate((context) => {
|
|
127
|
-
const { string,
|
|
127
|
+
const { string, breakPoint } = json,
|
|
128
128
|
combinatorNode = instantiateCombinator(string, context),
|
|
129
129
|
node = combinatorNode, ///
|
|
130
130
|
statement = statementFromCombinatorNode(combinatorNode, context);
|
|
131
131
|
|
|
132
|
-
combinator = new Combinator(context, string, node,
|
|
132
|
+
combinator = new Combinator(context, string, node, breakPoint, statement);
|
|
133
133
|
}, context);
|
|
134
134
|
}, json, context);
|
|
135
135
|
|
|
@@ -7,8 +7,8 @@ import { instantiateConclusion } from "../process/instantiate";
|
|
|
7
7
|
import { declare, attempt, descend, serialise, unserialise, instantiate } from "../utilities/context";
|
|
8
8
|
|
|
9
9
|
export default define(class Conclusion extends Element {
|
|
10
|
-
constructor(context, string, node,
|
|
11
|
-
super(context, string, node,
|
|
10
|
+
constructor(context, string, node, breakPoint, statement) {
|
|
11
|
+
super(context, string, node, breakPoint);
|
|
12
12
|
|
|
13
13
|
this.statement = statement;
|
|
14
14
|
}
|
|
@@ -135,11 +135,11 @@ export default define(class Conclusion extends Element {
|
|
|
135
135
|
|
|
136
136
|
return serialise((context) => {
|
|
137
137
|
const string = this.getString(),
|
|
138
|
-
|
|
138
|
+
breakPoint = this.getBreakPoint(),
|
|
139
139
|
json = {
|
|
140
140
|
context,
|
|
141
141
|
string,
|
|
142
|
-
|
|
142
|
+
breakPoint
|
|
143
143
|
};
|
|
144
144
|
|
|
145
145
|
return json;
|
|
@@ -153,12 +153,12 @@ export default define(class Conclusion extends Element {
|
|
|
153
153
|
|
|
154
154
|
unserialise((json, context) => {
|
|
155
155
|
instantiate((context) => {
|
|
156
|
-
const { string,
|
|
156
|
+
const { string, breakPoint } = json,
|
|
157
157
|
conclusionNode = instantiateConclusion(string, context),
|
|
158
158
|
node = conclusionNode, ///
|
|
159
159
|
statement = statementFromConclusionNode(conclusionNode, context);
|
|
160
160
|
|
|
161
|
-
conclusion = new Conclusion(context, string, node,
|
|
161
|
+
conclusion = new Conclusion(context, string, node, breakPoint, statement);
|
|
162
162
|
}, context);
|
|
163
163
|
}, json, context);
|
|
164
164
|
|
|
@@ -12,8 +12,8 @@ import { provisionallyStringFromProvisional } from "../utilities/string";
|
|
|
12
12
|
import { attempt, serialise, unserialise, instantiate } from "../utilities/context";
|
|
13
13
|
|
|
14
14
|
export default define(class Constructor extends Element {
|
|
15
|
-
constructor(context, string, node,
|
|
16
|
-
super(context, string, node,
|
|
15
|
+
constructor(context, string, node, breakPoint, term, type) {
|
|
16
|
+
super(context, string, node, breakPoint);
|
|
17
17
|
|
|
18
18
|
this.term = term;
|
|
19
19
|
this.type = type;
|
|
@@ -155,12 +155,12 @@ export default define(class Constructor extends Element {
|
|
|
155
155
|
const includeType = false,
|
|
156
156
|
typeJSON = typeToTypeJSON(this.type),
|
|
157
157
|
string = this.getString(includeType),
|
|
158
|
-
|
|
158
|
+
breakPoint = this.getBreakPoint(),
|
|
159
159
|
type = typeJSON, ///
|
|
160
160
|
json = {
|
|
161
161
|
context,
|
|
162
162
|
string,
|
|
163
|
-
|
|
163
|
+
breakPoint,
|
|
164
164
|
type
|
|
165
165
|
};
|
|
166
166
|
|
|
@@ -175,13 +175,13 @@ export default define(class Constructor extends Element {
|
|
|
175
175
|
|
|
176
176
|
unserialise((json, context) => {
|
|
177
177
|
instantiate((context) => {
|
|
178
|
-
const { string,
|
|
178
|
+
const { string, breakPoint } = json,
|
|
179
179
|
constructorNode = instantiateConstructor(string, context),
|
|
180
180
|
node = constructorNode, ///
|
|
181
181
|
term = termFromConstructorNode(constructorNode, context),
|
|
182
182
|
type = typeFromJSON(json, context);
|
|
183
183
|
|
|
184
|
-
constructor = new Constructor(context, string, node,
|
|
184
|
+
constructor = new Constructor(context, string, node, breakPoint, term, type);
|
|
185
185
|
}, context);
|
|
186
186
|
}, json, context);
|
|
187
187
|
|
|
@@ -5,8 +5,8 @@ import Declaration from "../declaration";
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
6
|
|
|
7
7
|
export default define(class CombinatorDeclaration extends Declaration {
|
|
8
|
-
constructor(context, string, node,
|
|
9
|
-
super(context, string, node,
|
|
8
|
+
constructor(context, string, node, breakPoint, combinator) {
|
|
9
|
+
super(context, string, node, breakPoint);
|
|
10
10
|
|
|
11
11
|
this.combinator = combinator;
|
|
12
12
|
}
|
|
@@ -10,8 +10,8 @@ import { baseTypeFromNothing } from "../../utilities/type";
|
|
|
10
10
|
const { asyncEvery } = asynchronousUtilities;
|
|
11
11
|
|
|
12
12
|
export default define(class ComplexTypeDeclaration extends Declaration {
|
|
13
|
-
constructor(context, string, node,
|
|
14
|
-
super(context, string, node,
|
|
13
|
+
constructor(context, string, node, breakPoint, type, superTypes, provisional, propertyDeclarations) {
|
|
14
|
+
super(context, string, node, breakPoint);
|
|
15
15
|
|
|
16
16
|
this.type = type;
|
|
17
17
|
this.superTypes = superTypes;
|
|
@@ -5,8 +5,8 @@ import Declaration from "../declaration";
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
6
|
|
|
7
7
|
export default define(class ConstructorDeclaration extends Declaration {
|
|
8
|
-
constructor(context, string, node,
|
|
9
|
-
super(context, string, node,
|
|
8
|
+
constructor(context, string, node, breakPoint, type, provisional, constructor) {
|
|
9
|
+
super(context, string, node, breakPoint);
|
|
10
10
|
|
|
11
11
|
this.type = type;
|
|
12
12
|
this.provisional = provisional;
|
|
@@ -5,8 +5,8 @@ import Declaration from "../declaration";
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
6
|
|
|
7
7
|
export default define(class MetavariableDeclaration extends Declaration {
|
|
8
|
-
constructor(context, string, node,
|
|
9
|
-
super(context, string, node,
|
|
8
|
+
constructor(context, string, node, breakPoint, metaType, metavariable) {
|
|
9
|
+
super(context, string, node, breakPoint);
|
|
10
10
|
|
|
11
11
|
this.metaType = metaType;
|
|
12
12
|
this.metavariable = metavariable;
|
|
@@ -5,8 +5,8 @@ import Declaration from "../declaration";
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
6
|
|
|
7
7
|
export default define(class PropertyDeclaration extends Declaration {
|
|
8
|
-
constructor(context, string, node,
|
|
9
|
-
super(context, string, node,
|
|
8
|
+
constructor(context, string, node, breakPoint, property, type) {
|
|
9
|
+
super(context, string, node, breakPoint);
|
|
10
10
|
|
|
11
11
|
this.property = property;
|
|
12
12
|
this.type = type;
|
|
@@ -6,8 +6,8 @@ import { define } from "../../elements";
|
|
|
6
6
|
import { baseTypeFromNothing } from "../../utilities/type";
|
|
7
7
|
|
|
8
8
|
export default define(class SimpleTypeDeclaration extends Declaration {
|
|
9
|
-
constructor(context, string, node,
|
|
10
|
-
super(context, string, node,
|
|
9
|
+
constructor(context, string, node, breakPoint, type, superTypes, provisional) {
|
|
10
|
+
super(context, string, node, breakPoint);
|
|
11
11
|
|
|
12
12
|
this.type = type;
|
|
13
13
|
this.superTypes = superTypes;
|
|
@@ -5,8 +5,8 @@ import Declaration from "../declaration";
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
6
|
|
|
7
7
|
export default define(class TypePrefixDeclaration extends Declaration {
|
|
8
|
-
constructor(context, string, node,
|
|
9
|
-
super(context, string, node,
|
|
8
|
+
constructor(context, string, node, breakPoint, typePrefix) {
|
|
9
|
+
super(context, string, node, breakPoint);
|
|
10
10
|
|
|
11
11
|
this.typePrefix = typePrefix;
|
|
12
12
|
}
|
|
@@ -5,8 +5,8 @@ import Declaration from "../declaration";
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
6
|
|
|
7
7
|
export default define(class VariableDeclaration extends Declaration {
|
|
8
|
-
constructor(context, string, node,
|
|
9
|
-
super(context, string, node,
|
|
8
|
+
constructor(context, string, node, breakPoint, type, variable, provisional) {
|
|
9
|
+
super(context, string, node, breakPoint);
|
|
10
10
|
|
|
11
11
|
this.type = type;
|
|
12
12
|
this.variable = variable;
|
package/src/element/deduction.js
CHANGED
|
@@ -7,8 +7,8 @@ import { instantiateDeduction } from "../process/instantiate";
|
|
|
7
7
|
import { declare, attempt, descend, serialise, unserialise, instantiate } from "../utilities/context";
|
|
8
8
|
|
|
9
9
|
export default define(class Deduction extends Element {
|
|
10
|
-
constructor(context, string, node,
|
|
11
|
-
super(context, string, node,
|
|
10
|
+
constructor(context, string, node, breakPoint, statement) {
|
|
11
|
+
super(context, string, node, breakPoint);
|
|
12
12
|
|
|
13
13
|
this.statement = statement;
|
|
14
14
|
}
|
|
@@ -135,11 +135,11 @@ export default define(class Deduction extends Element {
|
|
|
135
135
|
|
|
136
136
|
return serialise((context) => {
|
|
137
137
|
const string = this.getString(),
|
|
138
|
-
|
|
138
|
+
breakPoint = this.getBreakPoint(),
|
|
139
139
|
json = {
|
|
140
140
|
context,
|
|
141
141
|
string,
|
|
142
|
-
|
|
142
|
+
breakPoint
|
|
143
143
|
};
|
|
144
144
|
|
|
145
145
|
return json;
|
|
@@ -153,12 +153,12 @@ export default define(class Deduction extends Element {
|
|
|
153
153
|
|
|
154
154
|
unserialise((json, context) => {
|
|
155
155
|
instantiate((context) => {
|
|
156
|
-
const { string,
|
|
156
|
+
const { string, breakPoint } = json,
|
|
157
157
|
deductionNode = instantiateDeduction(string, context),
|
|
158
158
|
node = deductionNode, ///
|
|
159
159
|
statement = statementFromDeductionNode(deductionNode, context);
|
|
160
160
|
|
|
161
|
-
deduction = new Deduction(context, string, node,
|
|
161
|
+
deduction = new Deduction(context, string, node, breakPoint, statement);
|
|
162
162
|
}, context);
|
|
163
163
|
}, json, context);
|
|
164
164
|
|
|
@@ -9,8 +9,8 @@ const { last } = arrayUtilities,
|
|
|
9
9
|
{ asyncEvery } = asynchronousUtilities;
|
|
10
10
|
|
|
11
11
|
export default define(class Derivation 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/equality.js
CHANGED
|
@@ -10,8 +10,8 @@ import { equalityFromStatementNode } from "../utilities/element";
|
|
|
10
10
|
import { equalityAssignmentFromEquality, leftVariableAssignmentFromEquality, rightVariableAssignmentFromEquality } from "../process/assign";
|
|
11
11
|
|
|
12
12
|
export default define(class Equality extends Element {
|
|
13
|
-
constructor(context, string, node,
|
|
14
|
-
super(context, string, node,
|
|
13
|
+
constructor(context, string, node, breakPoint, leftTerm, rightTerm) {
|
|
14
|
+
super(context, string, node, breakPoint);
|
|
15
15
|
|
|
16
16
|
this.leftTerm = leftTerm;
|
|
17
17
|
this.rightTerm = rightTerm;
|
|
@@ -265,10 +265,10 @@ export default define(class Equality extends Element {
|
|
|
265
265
|
|
|
266
266
|
toJSON() {
|
|
267
267
|
const string = this.getString(),
|
|
268
|
-
|
|
268
|
+
breakPoint = this.getBreakPoint(),
|
|
269
269
|
json = {
|
|
270
270
|
string,
|
|
271
|
-
|
|
271
|
+
breakPoint
|
|
272
272
|
};
|
|
273
273
|
|
|
274
274
|
return json;
|
|
@@ -278,7 +278,7 @@ export default define(class Equality extends Element {
|
|
|
278
278
|
|
|
279
279
|
static fromJSON(json, context) {
|
|
280
280
|
return instantiate((context) => {
|
|
281
|
-
const { string,
|
|
281
|
+
const { string, breakPoint } = json,
|
|
282
282
|
equalityNode = instantiateEquality(string, context),
|
|
283
283
|
node = equalityNode, ///
|
|
284
284
|
leftTerm = leftTermFromEqualityNode(equalityNode, context),
|
|
@@ -286,7 +286,7 @@ export default define(class Equality extends Element {
|
|
|
286
286
|
|
|
287
287
|
context = null;
|
|
288
288
|
|
|
289
|
-
const equality = new Equality(context, string, node,
|
|
289
|
+
const equality = new Equality(context, string, node, breakPoint, leftTerm, rightTerm);
|
|
290
290
|
|
|
291
291
|
return equality;
|
|
292
292
|
}, context);
|
|
@@ -13,8 +13,8 @@ import { equivalenceFromEquivalenceNode } from "../utilities/element";
|
|
|
13
13
|
const { compress } = arrayUtilities;
|
|
14
14
|
|
|
15
15
|
export default define(class Equivalence extends Element {
|
|
16
|
-
constructor(context, string, node,
|
|
17
|
-
super(context, string, node,
|
|
16
|
+
constructor(context, string, node, breakPoint, type, terms) {
|
|
17
|
+
super(context, string, node, breakPoint);
|
|
18
18
|
|
|
19
19
|
this.type = type;
|
|
20
20
|
this.terms = terms;
|