occam-verify-cli 1.0.937 → 1.0.939

package/lib/utilities/breakPoint.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get breakPointFromJSON () {
+        return breakPointFromJSON;
+    },
+    get breakPointToBreakPointJSON () {
+        return breakPointToBreakPointJSON;
+    }
+});
+const _occamlanguages = require("occam-languages");
+function breakPointFromJSON(json) {
+    let breakPoint;
+    ({ breakPoint } = json);
+    if (breakPoint !== null) {
+        const breakPointJSON = breakPoint; ///
+        json = breakPointJSON; ///
+        breakPoint = _occamlanguages.BreakPoint.fromJSON(json); ///
+    }
+    return breakPoint;
+}
+function breakPointToBreakPointJSON(breakPoint) {
+    let breakPointJSON = null;
+    if (breakPointJSON !== null) {
+        breakPointJSON = breakPoint.toJSON();
+    }
+    return breakPointJSON;
+}
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYnJlYWtQb2ludC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQnJlYWtQb2ludCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIGJyZWFrUG9pbnRGcm9tSlNPTihqc29uKSB7XG4gIGxldCBicmVha1BvaW50O1xuXG4gICh7IGJyZWFrUG9pbnQgfSA9IGpzb24pO1xuXG4gIGlmIChicmVha1BvaW50ICE9PSBudWxsKSB7XG4gICAgY29uc3QgYnJlYWtQb2ludEpTT04gPSBicmVha1BvaW50OyAgLy8vXG5cbiAgICBqc29uID0gYnJlYWtQb2ludEpTT047ICAvLy9cblxuICAgIGJyZWFrUG9pbnQgPSBCcmVha1BvaW50LmZyb21KU09OKGpzb24pOyAgLy8vXG4gIH1cblxuICByZXR1cm4gYnJlYWtQb2ludDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJyZWFrUG9pbnRUb0JyZWFrUG9pbnRKU09OKGJyZWFrUG9pbnQpIHtcbiAgbGV0IGJyZWFrUG9pbnRKU09OID0gbnVsbDtcblxuICBpZiAoYnJlYWtQb2ludEpTT04gIT09IG51bGwpIHtcbiAgICBicmVha1BvaW50SlNPTiA9IGJyZWFrUG9pbnQudG9KU09OKCk7XG4gIH1cblxuICByZXR1cm4gYnJlYWtQb2ludEpTT047XG59XG4iXSwibmFtZXMiOlsiYnJlYWtQb2ludEZyb21KU09OIiwiYnJlYWtQb2ludFRvQnJlYWtQb2ludEpTT04iLCJqc29uIiwiYnJlYWtQb2ludCIsImJyZWFrUG9pbnRKU09OIiwiQnJlYWtQb2ludCIsImZyb21KU09OIiwidG9KU09OIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUFJZ0JBO2VBQUFBOztRQWdCQUM7ZUFBQUE7OztnQ0FsQlc7QUFFcEIsU0FBU0QsbUJBQW1CRSxJQUFJO0lBQ3JDLElBQUlDO0lBRUgsQ0FBQSxFQUFFQSxVQUFVLEVBQUUsR0FBR0QsSUFBRztJQUVyQixJQUFJQyxlQUFlLE1BQU07UUFDdkIsTUFBTUMsaUJBQWlCRCxZQUFhLEdBQUc7UUFFdkNELE9BQU9FLGdCQUFpQixHQUFHO1FBRTNCRCxhQUFhRSwwQkFBVSxDQUFDQyxRQUFRLENBQUNKLE9BQVEsR0FBRztJQUM5QztJQUVBLE9BQU9DO0FBQ1Q7QUFFTyxTQUFTRiwyQkFBMkJFLFVBQVU7SUFDbkQsSUFBSUMsaUJBQWlCO0lBRXJCLElBQUlBLG1CQUFtQixNQUFNO1FBQzNCQSxpQkFBaUJELFdBQVdJLE1BQU07SUFDcEM7SUFFQSxPQUFPSDtBQUNUIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.937",
+  "version": "1.0.939",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/element/assertion/contained.js

@@ -4,6 +4,7 @@ import Assertion from "../assertion";
 
 import { define } from "../../elements";
 import { instantiate } from "../../utilities/context";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateContainedAssertion } from "../../process/instantiate";
 import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions, statementFromStatementAndSubstitutions } from "../../utilities/substitutions";
 import { termFromContainedAssertionNode,
@@ -253,9 +254,10 @@ export default define(class ContainedAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               containedAssertionNode = instantiateContainedAssertion(string, context),
               node = containedAssertionNode,  ///
+              breakPoint = breakPointFromJSON(json),
               term = termFromContainedAssertionNode(containedAssertionNode, context),
               frame = frameFromContainedAssertionNode(containedAssertionNode, context),
               negated = negatedFromContainedAssertionNode(containedAssertionNode, context),

package/src/element/assertion/defined.js

@@ -4,6 +4,7 @@ import Assertion from "../assertion";
 
 import { define } from "../../elements";
 import { instantiate } from "../../utilities/context";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateDefinedAssertion } from "../../process/instantiate";
 import { separateGroundedTermsAndDefinedVariables } from "../../utilities/equivalences";
 import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions } from "../../utilities/substitutions";
@@ -221,9 +222,10 @@ export default define(class DefinedAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               definedAssertionNode = instantiateDefinedAssertion(string, context),
               node = definedAssertionNode,  ///
+              breakPoint = breakPointFromJSON(json),
               term = termFromJDefinedAssertionNode(definedAssertionNode, context),
               frame = frameFromJDefinedAssertionNode(definedAssertionNode, context),
               negated = negatedFromJDefinedAssertionNode(definedAssertionNode, context);

package/src/element/assertion/property.js

@@ -4,6 +4,7 @@ import Assertion from "../assertion";
 
 import { define } from "../../elements";
 import { instantiate } from "../../utilities/context";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiatePropertyAssertion } from "../../process/instantiate";
 import { variableAssignmentFromPrepertyAssertion } from "../../process/assign";
 import { termFromPropertyAssertionNode, propertyAssertionFromStatementNode, propertyRelationFromPropertyAssertionNode } from "../../utilities/element";
@@ -226,9 +227,10 @@ export default define(class PropertyAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               propertyAssertionNode = instantiatePropertyAssertion(string, context),
               node = propertyAssertionNode,  ///
+              breakPoint = breakPointFromJSON(json),
               term = termFromPropertyAssertionNode(propertyAssertionNode, context),
               propertyRelation = propertyRelationFromPropertyAssertionNode(propertyAssertionNode, context);
 

package/src/element/assertion/signature.js

@@ -4,6 +4,7 @@ import Assertion from "../assertion";
 
 import { define } from "../../elements";
 import { join, reconcile, instantiate } from "../../utilities/context";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateSignatureAssertion } from "../../process/instantiate";
 import { signatureFromSignatureAssertionNode, referenceFromSignatureAssertionNode, signatureAssertionFromStatementNode } from "../../utilities/element";
 
@@ -211,9 +212,10 @@ export default define(class SignatureAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               definedAssertionNode = instantiateSignatureAssertion(string, context),
               node = definedAssertionNode,  ///
+              breakPoint = breakPointFromJSON(json),
               signature = signatureFromSignatureAssertionNode(definedAssertionNode, context),
               reference = referenceFromSignatureAssertionNode(definedAssertionNode, context);
 

package/src/element/assertion/subproof.js

@@ -7,6 +7,7 @@ import Assertion from "../assertion";
 import { define } from "../../elements";
 import { reconcile } from "../../utilities/context";
 import { join, descend, instantiate } from "../../utilities/context";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateSubproofAssertion } from "../../process/instantiate";
 import { subproofAssertionFromStatementNode } from "../../utilities/element";
 
@@ -300,10 +301,11 @@ export default define(class SubproofAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               subproofAssertionNode = instantiateSubproofAssertion(string, context),
-              statements = statementsFromSubproofAssertionNode(subproofAssertionNode, context),
-              node = subproofAssertionNode; ///
+              node = subproofAssertionNode,  ///
+              breakPoint = breakPointFromJSON(json),
+              statements = statementsFromSubproofAssertionNode(subproofAssertionNode, context);
 
         context = null;
 

package/src/element/assertion/type.js

@@ -8,6 +8,7 @@ import { instantiateTypeAssertion } from "../../process/instantiate";
 import { typeFromJSON, typeToTypeJSON } from "../../utilities/json";
 import { termFromTermAndSubstitutions } from "../../utilities/substitutions";
 import { variableAssignmentFromTypeAssertion } from "../../process/assign";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../../utilities/breakPoint";
 import { termFromTypeAssertionNode, typeAssertionFromStatementNode } from "../../utilities/element";
 
 export default define(class TypeAssertion extends Assertion {
@@ -226,7 +227,7 @@ export default define(class TypeAssertion extends Assertion {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -250,8 +251,9 @@ export default define(class TypeAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               typeAssertionNode = instantiateTypeAssertion(string, context),
+              breakPoint = breakPointFromJSON(json),
               term = termFromTypeAssertionNode(typeAssertionNode, context),
               type = typeFromJSON(json, context),
               node = typeAssertionNode; ///

package/src/element/assertion.js

@@ -2,6 +2,8 @@
 
 import { Element } from "occam-languages";
 
+import { breakPointToBreakPointJSON } from "../utilities/breakPoint";
+
 export default class Assertion extends Element {
   getName() {
     const { name } = this.constructor;
@@ -48,7 +50,7 @@ export default class Assertion extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 

package/src/element/assumption/metaLevel.js

@@ -6,6 +6,7 @@ import { define } from "../../elements";
 import { unifyStatement } from "../../process/unify";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { instantiateMetaLevelAssumption } from "../../process/instantiate";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../../utilities/breakPoint";
 import { metaLevelAssumptionFromMetaLevelAssumptionNode } from "../../utilities/element";
 import { metaLevelAssumptionStringFromReferenceAndStatement } from "../../utilities/string";
 import { join, ablate, attempt, descend, reconcile, serialise, unserialise, instantiate } from "../../utilities/context";
@@ -291,7 +292,7 @@ export default define(class MetaLevelAssumption extends Element {
 
       breakPoint = this.getBreakPoint();
 
-      const breakPointJSON = breakPoint.toJSON();
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
       breakPoint = breakPointJSON;  ///
 
@@ -312,9 +313,10 @@ export default define(class MetaLevelAssumption extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               metaLevelAssumptionNode = instantiateMetaLevelAssumption(string, context),
               node = metaLevelAssumptionNode,  ///
+              breakPoint = breakPointFromJSON(json),
               reference = referenceFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context),
               statement = statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context);
 

package/src/element/assumption.js

@@ -3,8 +3,9 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
-import {instantiate, reconcile} from "../utilities/context";
 import { instantiateAssumption } from "../process/instantiate";
+import { reconcile, instantiate } from "../utilities/context";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class Assumption extends Element {
   constructor(context, string, node, breakPoint, reference, statement) {
@@ -253,7 +254,7 @@ export default define(class Assumption extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -267,9 +268,10 @@ export default define(class Assumption extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             assumptionNode = instantiateAssumption(string, context),
             node = assumptionNode,  ///
+            breakPoint = breakPointFromJSON(json),
             reference = referenceFromAssumptionNode(assumptionNode, context),
             statement = statementFromAssumptionNode(assumptionNode, context),
             assumption = new Assumption(context, string, node, breakPoint, reference, statement);

package/src/element/combinator.js

@@ -8,6 +8,7 @@ import { statementFromCombinatorNode } from "../utilities/element";
 import { unifyStatementWithCombinator } from "../process/unify";
 import { validateStatementAsCombinator } from "../process/validate";
 import { attempt, serialise, unserialise, instantiate } from "../utilities/context";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class Combinator extends Element {
   constructor(context, string, node, breakPoint, statement) {
@@ -111,7 +112,7 @@ export default define(class Combinator extends Element {
 
       breakPoint = this.getBreakPoint();
 
-      const breakPointJSON = breakPoint.toJSON();
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
       breakPoint = breakPointJSON;  ///
 
@@ -132,9 +133,10 @@ export default define(class Combinator extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               combinatorNode = instantiateCombinator(string, context),
               node = combinatorNode,  ///
+              breakPoint = breakPointFromJSON(json),
               statement = statementFromCombinatorNode(combinatorNode, context);
 
         combinator = new Combinator(context, string, node, breakPoint, statement);

package/src/element/conclusion.js

@@ -4,6 +4,7 @@ import { Element } from "occam-languages";
 
 import { define } from "../elements";
 import { instantiateConclusion } from "../process/instantiate";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { declare, attempt, descend, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Conclusion extends Element {
@@ -140,7 +141,7 @@ export default define(class Conclusion extends Element {
 
       breakPoint = this.getBreakPoint();
 
-      const breakPointJSON = breakPoint.toJSON();
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
       breakPoint = breakPointJSON;  ///
 
@@ -161,9 +162,10 @@ export default define(class Conclusion extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               conclusionNode = instantiateConclusion(string, context),
               node = conclusionNode,  ///
+              breakPoint = breakPointFromJSON(json),
               statement = statementFromConclusionNode(conclusionNode, context);
 
         conclusion = new Conclusion(context, string, node, breakPoint, statement);

package/src/element/constructor.js

@@ -3,13 +3,14 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
+import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { instantiateConstructor } from "../process/instantiate";
 import { termFromConstructorNode } from "../utilities/element";
 import { unifyTermWithConstructor } from "../process/unify";
 import { validateTermAsConstructor } from "../process/validate";
-import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { provisionallyStringFromProvisional } from "../utilities/string";
 import { attempt, serialise, unserialise, instantiate } from "../utilities/context";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class Constructor extends Element {
   constructor(context, string, node, breakPoint, term, type) {
@@ -160,7 +161,7 @@ export default define(class Constructor extends Element {
 
       breakPoint = this.getBreakPoint();
 
-      const breakPointJSON = breakPoint.toJSON();
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
       breakPoint = breakPointJSON;  ///
 
@@ -183,9 +184,10 @@ export default define(class Constructor extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               constructorNode = instantiateConstructor(string, context),
               node = constructorNode, ///
+              breakPoint = breakPointFromJSON(json),
               term = termFromConstructorNode(constructorNode, context),
               type = typeFromJSON(json, context);
 

package/src/element/deduction.js

@@ -4,6 +4,7 @@ import { Element } from "occam-languages";
 
 import { define } from "../elements";
 import { instantiateDeduction } from "../process/instantiate";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { declare, attempt, descend, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Deduction extends Element {
@@ -140,7 +141,7 @@ export default define(class Deduction extends Element {
 
       breakPoint = this.getBreakPoint();
 
-      const breakPointJSON = breakPoint.toJSON();
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
       breakPoint = breakPointJSON;  ///
 
@@ -161,9 +162,10 @@ export default define(class Deduction extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               deductionNode = instantiateDeduction(string, context),
               node = deductionNode,  ///
+              breakPoint = breakPointFromJSON(json),
               statement = statementFromDeductionNode(deductionNode, context);
 
         deduction = new Deduction(context, string, node, breakPoint, statement);

package/src/element/equality.js

@@ -7,6 +7,7 @@ import { equateTerms } from "../process/equate";
 import { instantiate } from "../utilities/context";
 import { instantiateEquality } from "../process/instantiate";
 import { equalityFromStatementNode } from "../utilities/element";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { equalityAssignmentFromEquality, leftVariableAssignmentFromEquality, rightVariableAssignmentFromEquality } from "../process/assign";
 
 export default define(class Equality extends Element {
@@ -270,7 +271,7 @@ export default define(class Equality extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -286,9 +287,10 @@ export default define(class Equality extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             equalityNode = instantiateEquality(string, context),
             node = equalityNode,  ///
+            breakPoint = breakPointFromJSON(json),
             leftTerm = leftTermFromEqualityNode(equalityNode, context),
             rightTerm = rightTermFromEqualityNode(equalityNode, context);
 

package/src/element/frame.js

@@ -7,6 +7,7 @@ import { instantiate } from "../utilities/context";
 import { instantiateFrame } from "../process/instantiate";
 import { FRAME_META_TYPE_NAME } from "../metaTypeNames";
 import { metavariableFromFrameNode } from "../utilities/element";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class Frame extends Element {
   constructor(context, string, node, breakPoint, assumptions, metavariable) {
@@ -311,7 +312,7 @@ export default define(class Frame extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -327,9 +328,10 @@ export default define(class Frame extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             frameNode = instantiateFrame(string, context),
             node = frameNode, ///
+            breakPoint = breakPointFromJSON(json),
             assumptions = assumptionsFromFrameNode(frameNode, context),
             metavariable = metavariableFromFrameNode(frameNode, context);
 

package/src/element/hypothesis.js

@@ -5,6 +5,7 @@ import { Element } from "occam-languages";
 import { define } from "../elements";
 import { instantiateHypothesis } from "../process/instantiate";
 import { statementFromHypothesisNode } from "../utilities/element";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { declare, attempt, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Hypothesis extends Element {
@@ -111,7 +112,7 @@ export default define(class Hypothesis extends Element {
 
       breakPoint = this.getBreakPoint();
 
-      const breakPointJSON = breakPoint.toJSON();
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
       breakPoint = breakPointJSON;  ///
 
@@ -130,9 +131,10 @@ export default define(class Hypothesis extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               hypothesisNode = instantiateHypothesis(string, context),
               node = hypothesisNode,  ///
+              breakPoint = breakPointFromJSON(json),
               statement = statementFromHypothesisNode(hypothesisNode, context);
 
         hypothesis = new Hypothesis(context, string, node, breakPoint, statement);

package/src/element/judgement.js

@@ -7,6 +7,7 @@ import { instantiateJudgement } from "../process/instantiate";
 import { reconcile, instantiate } from "../utilities/context";
 import { judgementFromStatementNode } from "../utilities/element";
 import { judgementAssignmentFromJudgement } from "../process/assign";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class Judgement extends Element {
   constructor(context, string, node, breakPoint, frame, assumption) {
@@ -250,7 +251,7 @@ export default define(class Judgement extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -264,9 +265,10 @@ export default define(class Judgement extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             judgementNode = instantiateJudgement(string, context),
             node = judgementNode,  ///
+            breakPoint = breakPointFromJSON(json),
             frame = frameFromJudgementNode(judgementNode, context),
             assumption = assumptionFromJudgementNode(judgementNode, context);
 

package/src/element/label.js

@@ -4,6 +4,7 @@ import { Element } from "occam-languages";
 
 import { define } from "../elements";
 import { instantiateLabel } from "../process/instantiate";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { labelFromLabelNode, metavariableFromLabelNode } from "../utilities/element";
 import { ablate, attempt, serialise, unserialise, instantiate } from "../utilities/context";
 
@@ -134,7 +135,7 @@ export default define(class Label extends Element {
 
       breakPoint = this.getBreakPoint();
 
-      const breakPointJSON = breakPoint.toJSON();
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
       breakPoint = breakPointJSON;  ///
 
@@ -155,9 +156,10 @@ export default define(class Label extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               labelNode = instantiateLabel(string, context),
               node = labelNode, ///
+              breakPoint = breakPointFromJSON(json),
               metavariable = metavariableFromLabelNode(labelNode, context);
 
         label = new Label(context, string, node, breakPoint, metavariable);

package/src/element/metaType.js

@@ -3,6 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
+import { breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class MetaType extends Element {
   constructor(context, string, node, breakPoint, name) {
@@ -43,7 +44,7 @@ export default define(class MetaType extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 

package/src/element/metavariable.js

@@ -5,11 +5,12 @@ import { Element } from "occam-languages";
 import elements from "../elements";
 
 import { define } from "../elements";
-import { instantiate } from "../utilities/context";
 import { EMPTY_STRING } from "../constants";
+import { instantiate } from "../utilities/context";
 import { instantiateMetavariable } from "../process/instantiate";
 import { metaTypeFromJSON, metaTypeToMetaTypeJSON } from "../utilities/json";
 import { unifyMetavariable, unifyMetavariableIntrinsically } from "../process/unify";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { nameFromMetavariableNode, termFromMetavariableNode, typeFromMetavariableNode, metavariableFromStatementNode } from "../utilities/element";
 
 export default define(class Metavariable extends Element {
@@ -621,7 +622,7 @@ export default define(class Metavariable extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -638,9 +639,10 @@ export default define(class Metavariable extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             metavariableNode = instantiateMetavariable(string, context),
             node = metavariableNode,  ///
+            breakPoint = breakPointFromJSON(json),
             name = nameFromMetavariableNode(metavariableNode, context),
             term = termFromMetavariableNode(metavariableNode, context),
             type = typeFromMetavariableNode(metavariableNode, context),

package/src/element/parameter.js

@@ -6,6 +6,7 @@ import { define } from "../elements";
 import { instantiate } from "../utilities/context";
 import { instantiateParameter } from "../process/instantiate";
 import { nameFromParaneterNode, identifierFromParameterNode } from "../utilities/element";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class Parameter extends Element {
   constructor(context, string, node, breakPoint, name, identifier) {
@@ -58,7 +59,7 @@ export default define(class Parameter extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -72,9 +73,10 @@ export default define(class Parameter extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             parameterNode = instantiateParameter(string, context),
             node = parameterNode,  ///
+            breakPoint = breakPointFromJSON(json),
             name = nameFromParaneterNode(parameterNode, context),
             identifier = identifierFromParameterNode(parameterNode, context);
 

package/src/element/procedureCall.js

@@ -6,6 +6,7 @@ import { termsUtilities } from "occam-furtle";
 import { define } from "../elements";
 import { instantiate, evaluate } from "../utilities/context";
 import { instantiateProcedureCall } from "../process/instantiate";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { parametersFromProcedureCallNode, procedureReferenceFromProcedureCallNode } from "../utilities/element";
 
 const { termsFromPrimitives } = termsUtilities;
@@ -127,7 +128,7 @@ export default define(class ProcedureCall extends Element {
 
     breakPoint = this.getBreakPoint();
 
-    const breakPointJSON = breakPoint.toJSON();
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
 
     breakPoint = breakPointJSON;  ///
 
@@ -141,9 +142,10 @@ export default define(class ProcedureCall extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             procedureCallNode = instantiateProcedureCall(string, context),
             node = procedureCallNode,  ///
+            breakPoint = breakPointFromJSON(json),
             parameters = parametersFromProcedureCallNode(json, context),
             procedureReference = procedureReferenceFromProcedureCallNode(json, context);