occam-verify-cli 1.0.936 → 1.0.938

package/src/element/signature.js

@@ -4,8 +4,8 @@ import { Element } from "occam-languages";
 import { arrayUtilities } from "necessary";
 
 import { define } from "../elements";
-import { instantiateSignature } from "../process/instantiate";
 import { signatureFromSignatureNode } from "../utilities/element";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { join, ablate, attempt, reconcile, serialise, unserialise, instantiate } from "../utilities/context";
 
 const { match } = arrayUtilities;
@@ -233,13 +233,21 @@ export default define(class Signature extends Element {
     const context = this.getContext();
 
     return serialise((context) => {
-      const string = this.getString(),
-            breakPoint = this.getBreakPoint(),
-            json = {
-              context,
-              string,
-              breakPoint
-            };
+      const string = this.getString();
+
+      let breakPoint;
+
+      breakPoint = this.getBreakPoint();
+
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);
@@ -250,9 +258,10 @@ export default define(class Signature extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, breakPoint } = json,
+        const { string } = json,
               signatureNode = instantiateSignature(string, context),
               node = signatureNode,  ///
+              breakPoint = breakPointFromJSON(json),
               terms = termsFromSignatureNode(signatureNode, context);
 
         signature = new Signature(context, string, node, breakPoint, terms);

package/src/element/statement.js

@@ -5,8 +5,9 @@ import { Element } from "occam-languages";
 import { define } from "../elements";
 import { unifyStatement } from "../process/unify";
 import { validateStatements } from "../utilities/validation";
-import { instantiateStatement } from "../process/instantiate";
 import { reconcile, instantiate } from "../utilities/context";
+import { instantiateStatement } from "../process/instantiate";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class Statement extends Element {
   getStatementNode() {
@@ -393,21 +394,30 @@ export default define(class Statement extends Element {
   static name = "Statement";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             statementNode = instantiateStatement(string, context),
-            node = statementNode; ///
+            node = statementNode, ///
+            breakPoint = breakPointFromJSON(json);
 
       context = null;
 

package/src/element/substitution/frame.js

@@ -3,6 +3,7 @@
 import Substitution from "../substitution";
 
 import { define } from "../../elements";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
@@ -195,7 +196,7 @@ export default define(class FrameSubstitution extends Substitution {
         const context = specificContext;  ///
 
         instantiate((context) => {
-          const { string, breakPoint } = json,
+          const { string } = json,
                 specificContext = context,  ///
                 contexts = [
                   generalContext,
@@ -203,6 +204,7 @@ export default define(class FrameSubstitution extends Substitution {
                 ],
                 frameSubstitutionNode = instantiateFrameSubstitution(string, context),
                 node = frameSubstitutionNode, ///
+                breakPoint = breakPointFromJSON(json),
                 targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
                 replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
 

package/src/element/substitution/reference.js

@@ -3,6 +3,7 @@
 import Substitution from "../substitution";
 
 import { define } from "../../elements";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
@@ -200,7 +201,7 @@ export default define(class ReferenceSubstitution extends Substitution {
         const context = specificContext;  ///
 
         instantiate((context) => {
-          const { string, breakPoint } = json,
+          const { string } = json,
                 specificContext = context,  ///
                 contexts = [
                   generalContext,
@@ -208,6 +209,7 @@ export default define(class ReferenceSubstitution extends Substitution {
                 ],
                 referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
                 node = referenceSubstitutionNode, ///
+                breakPoint = breakPointFromJSON(json),
                 targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
                 replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
 

package/src/element/substitution/statement.js

@@ -5,6 +5,7 @@ import Substitution from "../substitution";
 import { define } from "../../elements";
 import { unifySubstitution } from "../../process/unify";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateStatementSubstitution } from "../../process/instantiate";
 import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilities/element";
 import { join, ablates, manifest, attempts, descend, reconcile, instantiate, unserialises } from "../../utilities/context";
@@ -360,7 +361,7 @@ export default define(class StatementSubstitution extends Substitution {
         const context = specificContext;  ///
 
         instantiate((context) => {
-          const { string, breakPoint } = json,
+          const { string } = json,
                 specificContext = context,  ///
                 contexts = [
                   generalContext,
@@ -368,6 +369,7 @@ export default define(class StatementSubstitution extends Substitution {
                 ],
                 statementSubstitutionNode = instantiateStatementSubstitution(string, context),
                 node = statementSubstitutionNode, ///
+                breakPoint = breakPointFromJSON(json),
                 resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
                 substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext),
                 targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),

package/src/element/substitution/term.js

@@ -4,6 +4,7 @@ import Substitution from "../substitution";
 
 import { define } from "../../elements";
 import { stripBracketsFromTerm } from "../../utilities/brackets";
+import { breakPointFromJSON } from "../../utilities/breakPoint";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionFromTermSubstitutionNode } from "../../utilities/element";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
@@ -204,7 +205,7 @@ export default define(class TermSubstitution extends Substitution {
         const context = specificContext;  ///
 
         instantiate((context) => {
-          const { string, breakPoint } = json,
+          const { string } = json,
                 specificContext = context,  ///
                 contexts = [
                   generalContext,
@@ -212,6 +213,7 @@ export default define(class TermSubstitution extends Substitution {
                 ],
                 termSubstitutionNode = instantiateTermSubstitution(string, context),
                 node = termSubstitutionNode,  ///
+                breakPoint = breakPointFromJSON(json),
                 targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
                 replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
 

package/src/element/substitution.js

@@ -4,6 +4,7 @@ import { arrayUtilities } from "necessary";
 
 import { serialises } from "../utilities/context";
 import { primitiveUtilities } from "occam-furtle";
+import { breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 const { first, second } = arrayUtilities,
       { primitiveFromNode } =primitiveUtilities;
@@ -243,14 +244,22 @@ export default class Substitution extends Element {
 
     return serialises((...contexts) => {
       const name = this.getName(),
-            string = this.getString(),
-            breakPoint = this.getBreakPoint(),
-            json = {
-              name,
-              contexts,
-              string,
-              breakPoint
-            };
+            string = this.getString();
+
+      let breakPoint;
+
+      breakPoint = this.getBreakPoint();
+
+      const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        name,
+        contexts,
+        string,
+        breakPoint
+      };
 
       return json;
     }, ...contexts);

package/src/element/term.js

@@ -9,6 +9,7 @@ import { validateTerms } from "../utilities/validation";
 import { instantiateTerm } from "../process/instantiate";
 import { variablesFromTerm } from "../utilities/equivalence";
 import { unifyTermIntrinsically } from "../process/unify";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisionalJSON } from "../utilities/json";
 
 const { filter } = arrayUtilities;
@@ -288,9 +289,17 @@ export default define(class Term extends Element {
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
           provisionalJSON = provisionalToProvisionalJSON(this.provisional),
-          string = this.getString(), ///
-          breakPoint = this.getBreakPoint(),
-          type = typeJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+    breakPoint = breakPointJSON;  ///
+
+    const type = typeJSON,  ///
           provisional = provisionalJSON,  ///
           json = {
             string,
@@ -306,9 +315,10 @@ export default define(class Term extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             termNode = instantiateTerm(string, context),
             node = termNode,  ///
+            breakPoint = breakPointFromJSON(json),
             type = typeFromJSON(json, context),
             provisional = provisionalFromJSON(json, context);
 

package/src/element/topLevelAssertion.js

@@ -4,6 +4,7 @@ import { arrayUtilities } from "necessary";
 import { Element, asynchronousUtilities } from "occam-languages";
 
 import { enclose } from "../utilities/context";
+import { breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { topLevelAssertionStringFromLabelsSignatureSuppositionsAndDeduction } from "../utilities/string";
 import { labelsFromJSON,
          deductionFromJSON,
@@ -353,9 +354,17 @@ export default class TopLevelAssertion extends Element {
           suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
           signatureJSON = signatureToSignatureJSON(this.signature),
           hypothesesJSON = hypothesesToHypothesesJSON(this.hypotheses),
-          string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          labels = labelsJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+    breakPoint = breakPointJSON;  ///
+
+    const labels = labelsJSON,  ///
           deduction = deductionJSON,  ///
           suppositions = suppositionsJSON,  ///
           signature = signatureJSON,  ///

package/src/element/topLevelMetaAssertion.js

@@ -3,6 +3,7 @@
 import { Element, asynchronousUtilities } from "occam-languages";
 
 import { enclose } from "../utilities/context";
+import { breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction } from "../utilities/string";
 import { labelFromJSON,
          labelToLabelJSON,
@@ -233,9 +234,17 @@ export default class TopLevelMetaAssertion extends Element {
           deductionJSON = deductionToDeductionJSON(this.deduction),
           suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
           metaLevelAssumptionsJSON = metaLevelAssumptionsToMetaLevelAssumptionsJSON(this.metaLevelAssumptions),
-          string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          label = labelJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+    breakPoint = breakPointJSON;  ///
+
+    const label = labelJSON,  ///
           deduction = deductionJSON,  ///
           suppositions = suppositionsJSON,  ///
           metaLevelAssumptions = metaLevelAssumptionsJSON,  ///

package/src/element/type.js

@@ -8,6 +8,7 @@ import { instantiate } from "../utilities/context";
 import { instantiateType } from "../process/instantiate";
 import { nameFromTypeNode } from "../utilities/element";
 import { baseTypeFromNothing } from "../utilities/type";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { propertiesFromJSON,
          prefixNameFromJSON,
          superTypesFromJSON,
@@ -297,12 +298,20 @@ export default define(class Type extends Element {
   }
 
   toJSON(abridged = false) {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     if (!abridged) {
       const prefixNameJSON = prefixnameToPrevixNameJSON(this.prefixName),
@@ -329,9 +338,10 @@ export default define(class Type extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             typeNode = instantiateType(string, context),
             node = typeNode, ///
+            breakPoint = breakPointFromJSON(json),
             name = nameFromTypeNode(typeNode, context),
             prefixName = prefixNameFromJSON(json, context),
             superTypes = superTypesFromJSON(json, context),

package/src/element/typePrefix.js

@@ -6,6 +6,7 @@ import { define } from "../elements";
 import { instantiate } from "../utilities/context";
 import { instantiateTypePrefix } from "../process/instantiate";
 import { nameFromTypePrefixNode } from "../utilities/element";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 
 export default define(class TypePrefix extends Element {
   constructor(context, string, node, breakPoint, name) {
@@ -76,21 +77,30 @@ export default define(class TypePrefix extends Element {
   static name = "TypePrefix";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             typePrefixNode = instantiateTypePrefix(string, context),
             node = typePrefixNode, ///
+            breakPoint = breakPointFromJSON(json),
             name = nameFromTypePrefixNode(typePrefixNode, context);
 
       context = null; ///

package/src/element/variable.js

@@ -9,6 +9,7 @@ import { instantiate } from "../utilities/context";
 import { instantiateVariable } from "../process/instantiate";
 import { provisionallyStringFromProvisional } from "../utilities/string";
 import { variableFromTermNode, identifierFromVariableNode } from "../utilities/element";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisionalJSON } from "../utilities/json";
 
 export default define(class Variable extends Element {
@@ -207,9 +208,17 @@ export default define(class Variable extends Element {
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
           provisionalJSON = provisionalToProvisionalJSON(this.provisional),
-          string = this.getString(), ///
-          breakPoint = this.getBreakPoint(),
-          type = typeJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);
+
+    breakPoint = breakPointJSON;  ///
+
+    const type = typeJSON,  ///
           provisional = provisionalJSON,  ///
           json = {
             string,
@@ -225,9 +234,10 @@ export default define(class Variable extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, breakPoint } = json,
+      const { string } = json,
             variableNode = instantiateVariable(string, context),
             node = variableNode,  ///
+            breakPoint = breakPointFromJSON(json),
             type = typeFromJSON(json, context),
             identifier = identifierFromVariableNode(variableNode, context),
             provisional = provisionalFromJSON(json, context);

package/src/utilities/breakPoint.js

@@ -0,0 +1,29 @@
+"use strict";
+
+import { BreakPoint } from "occam-languages";
+
+export function breakPointFromJSON(json) {
+  let breakPoint;
+
+  ({ breakPoint } = json);
+
+  if (breakPoint !== null) {
+    const breakPointJSON = breakPoint;  ///
+
+    json = breakPointJSON;  ///
+
+    breakPoint = BreakPoint.fromJSON(json);  ///
+  }
+
+  return breakPoint;
+}
+
+export function breakPointToBreakPointJSON(breakPoint) {
+  let breakPointJSON = null;
+
+  if (breakPointJSON !== null) {
+    breakPointJSON = breakPoint.toJSON();
+  }
+
+  return breakPointJSON;
+}