occam-verify-cli 1.0.936 → 1.0.937

package/src/element/constructor.js

@@ -154,9 +154,17 @@ export default define(class Constructor extends Element {
     return serialise((context) => {
       const includeType = false,
             typeJSON = typeToTypeJSON(this.type),
-            string = this.getString(includeType),
-            breakPoint = this.getBreakPoint(),
-            type = typeJSON,  ///
+            string = this.getString(includeType);
+
+      let breakPoint;
+
+      breakPoint = this.getBreakPoint();
+
+      const breakPointJSON = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const type = typeJSON,  ///
             json = {
               context,
               string,

package/src/element/deduction.js

@@ -134,13 +134,21 @@ export default define(class Deduction 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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);

package/src/element/equality.js

@@ -264,12 +264,20 @@ export default define(class Equality extends Element {
   }
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/frame.js

@@ -305,12 +305,20 @@ export default define(class Frame extends Element {
   }
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/hypothesis.js

@@ -105,13 +105,21 @@ export default define(class Hypothesis 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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);

package/src/element/judgement.js

@@ -244,12 +244,20 @@ export default define(class Judgement extends Element {
   static name = "Judgement";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/label.js

@@ -128,13 +128,21 @@ export default define(class Label 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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);

package/src/element/metaType.js

@@ -37,12 +37,20 @@ export default define(class MetaType extends Element {
   static name = "MetaType";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/metavariable.js

@@ -615,13 +615,21 @@ export default define(class Metavariable extends Element {
   toJSON() {
     const metaTypeJSON = metaTypeToMetaTypeJSON(this.metaType),
           metaType = metaTypeJSON,  ///
-          string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint,
-            metaType
-          };
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint,
+      metaType
+    };
 
     return json;
   }

package/src/element/parameter.js

@@ -52,12 +52,20 @@ export default define(class Parameter extends Element {
   static name = "Parameter";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/procedureCall.js

@@ -121,12 +121,20 @@ export default define(class ProcedureCall extends Element {
   static name = "ProcedureCall";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/procedureReference.js

@@ -34,12 +34,20 @@ export default define(class ProcedureReference extends Element {
   static name = "ProcedureReference";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/proofAssertion/premise.js

@@ -287,13 +287,21 @@ export default define(class Premise extends ProofAssertion {
     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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);

package/src/element/proofAssertion/supposition.js

@@ -310,13 +310,21 @@ export default define(class Supposition extends ProofAssertion {
     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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);

package/src/element/property.js

@@ -217,9 +217,17 @@ export default define(class Property extends Element {
 
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
-          string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          type = typeJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const type = typeJSON,  ///
           json = {
             string,
             breakPoint,

package/src/element/propertyRelation.js

@@ -148,12 +148,20 @@ export default define(class PropertyRelation extends Element {
   static name = "PropertyRelation";
 
   toJSON() {
-    const string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          json = {
-            string,
-            breakPoint
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/reference.js

@@ -293,13 +293,21 @@ export default define(class Reference 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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);

package/src/element/rule.js

@@ -316,9 +316,17 @@ export default define(class Rule extends Element {
     const labelsJSON = labelsToLabelsJSON(this.labels),
           premisesJSON = premisesToPremisesJSON(this.premises),
           conclusionJSON = conclusionToConclusionJSON(this.conclusion),
-          string = this.getString(),
-          breakPoint = this.getBreakPoint(),
-          labels = labelsJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const labels = labelsJSON,  ///
           premises = premisesJSON,  ///
           conclusion = conclusionJSON,  ///
           json = {

package/src/element/signature.js

@@ -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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);

package/src/element/statement.js

@@ -393,12 +393,20 @@ 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 = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }

package/src/element/substitution.js

@@ -243,14 +243,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 = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        name,
+        contexts,
+        string,
+        breakPoint
+      };
 
       return json;
     }, ...contexts);

package/src/element/term.js

@@ -288,9 +288,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 = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const type = typeJSON,  ///
           provisional = provisionalJSON,  ///
           json = {
             string,

package/src/element/topLevelAssertion.js

@@ -353,9 +353,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 = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const labels = labelsJSON,  ///
           deduction = deductionJSON,  ///
           suppositions = suppositionsJSON,  ///
           signature = signatureJSON,  ///

package/src/element/topLevelMetaAssertion.js

@@ -233,9 +233,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 = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const label = labelJSON,  ///
           deduction = deductionJSON,  ///
           suppositions = suppositionsJSON,  ///
           metaLevelAssumptions = metaLevelAssumptionsJSON,  ///