occam-verify-cli 1.0.935 → 1.0.937

package/src/element/deduction.js

@@ -7,8 +7,8 @@ import { instantiateDeduction } from "../process/instantiate";
 import { declare, attempt, descend, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Deduction extends Element {
-  constructor(context, string, node, lineIndex, statement) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, statement) {
+    super(context, string, node, breakPoint);
 
     this.statement = statement;
   }
@@ -134,13 +134,21 @@ export default define(class Deduction extends Element {
     const context = this.getContext();
 
     return serialise((context) => {
-      const string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              context,
-              string,
-              lineIndex
-            };
+      const string = this.getString();
+
+      let breakPoint;
+
+      breakPoint = this.getBreakPoint();
+
+      const breakPointJSON = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);
@@ -153,12 +161,12 @@ export default define(class Deduction extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, lineIndex } = json,
+        const { string, breakPoint } = json,
               deductionNode = instantiateDeduction(string, context),
               node = deductionNode,  ///
               statement = statementFromDeductionNode(deductionNode, context);
 
-        deduction = new Deduction(context, string, node, lineIndex, statement);
+        deduction = new Deduction(context, string, node, breakPoint, statement);
       }, context);
     }, json, context);
 

package/src/element/derivation.js

@@ -9,8 +9,8 @@ const { last } = arrayUtilities,
       { asyncEvery } = asynchronousUtilities;
 
 export default define(class Derivation extends Element {
-  constructor(context, string, node, lineIndex, subproofOrProofAssertions) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, subproofOrProofAssertions) {
+    super(context, string, node, breakPoint);
 
     this.subproofOrProofAssertions = subproofOrProofAssertions;
   }

package/src/element/equality.js

@@ -10,8 +10,8 @@ import { equalityFromStatementNode } from "../utilities/element";
 import { equalityAssignmentFromEquality, leftVariableAssignmentFromEquality, rightVariableAssignmentFromEquality } from "../process/assign";
 
 export default define(class Equality extends Element {
-  constructor(context, string, node, lineIndex, leftTerm, rightTerm) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, leftTerm, rightTerm) {
+    super(context, string, node, breakPoint);
 
     this.leftTerm = leftTerm;
     this.rightTerm = rightTerm;
@@ -264,12 +264,20 @@ export default define(class Equality extends Element {
   }
 
   toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
@@ -278,7 +286,7 @@ export default define(class Equality extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             equalityNode = instantiateEquality(string, context),
             node = equalityNode,  ///
             leftTerm = leftTermFromEqualityNode(equalityNode, context),
@@ -286,7 +294,7 @@ export default define(class Equality extends Element {
 
       context = null;
 
-      const equality = new Equality(context, string, node, lineIndex, leftTerm, rightTerm);
+      const equality = new Equality(context, string, node, breakPoint, leftTerm, rightTerm);
 
       return equality;
     }, context);

package/src/element/equivalence.js

@@ -13,8 +13,8 @@ import { equivalenceFromEquivalenceNode } from "../utilities/element";
 const { compress } = arrayUtilities;
 
 export default define(class Equivalence extends Element {
-  constructor(context, string, node, lineIndex, type, terms) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, type, terms) {
+    super(context, string, node, breakPoint);
 
     this.type = type;
     this.terms = terms;

package/src/element/frame.js

@@ -9,8 +9,8 @@ import { FRAME_META_TYPE_NAME } from "../metaTypeNames";
 import { metavariableFromFrameNode } from "../utilities/element";
 
 export default define(class Frame extends Element {
-  constructor(context, string, node, lineIndex, assumptions, metavariable) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, assumptions, metavariable) {
+    super(context, string, node, breakPoint);
 
     this.assumptions = assumptions;
     this.metavariable = metavariable;
@@ -305,12 +305,20 @@ export default define(class Frame extends Element {
   }
 
   toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
@@ -319,7 +327,7 @@ export default define(class Frame extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             frameNode = instantiateFrame(string, context),
             node = frameNode, ///
             assumptions = assumptionsFromFrameNode(frameNode, context),
@@ -327,7 +335,7 @@ export default define(class Frame extends Element {
 
       context = null;
 
-      const frame = new Frame(context, string, node, lineIndex, assumptions, metavariable);
+      const frame = new Frame(context, string, node, breakPoint, assumptions, metavariable);
 
       return frame;
     }, context);

package/src/element/hypothesis.js

@@ -8,8 +8,8 @@ import { statementFromHypothesisNode } from "../utilities/element";
 import { declare, attempt, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Hypothesis extends Element {
-  constructor(context, string, node, lineIndex, statement) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, statement) {
+    super(context, string, node, breakPoint);
 
     this.statement = statement;
   }
@@ -105,13 +105,21 @@ export default define(class Hypothesis extends Element {
     const context = this.getContext();
 
     return serialise((context) => {
-      const string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              context,
-              string,
-              lineIndex
-            };
+      const string = this.getString();
+
+      let breakPoint;
+
+      breakPoint = this.getBreakPoint();
+
+      const breakPointJSON = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);
@@ -122,12 +130,12 @@ export default define(class Hypothesis extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, lineIndex } = json,
+        const { string, breakPoint } = json,
               hypothesisNode = instantiateHypothesis(string, context),
               node = hypothesisNode,  ///
               statement = statementFromHypothesisNode(hypothesisNode, context);
 
-        hypothesis = new Hypothesis(context, string, node, lineIndex, statement);
+        hypothesis = new Hypothesis(context, string, node, breakPoint, statement);
       }, context);
     }, json, context);
 

package/src/element/judgement.js

@@ -9,8 +9,8 @@ import { judgementFromStatementNode } from "../utilities/element";
 import { judgementAssignmentFromJudgement } from "../process/assign";
 
 export default define(class Judgement extends Element {
-  constructor(context, string, node, lineIndex, frame, assumption) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, frame, assumption) {
+    super(context, string, node, breakPoint);
 
     this.frame = frame;
     this.assumption = assumption;
@@ -244,19 +244,27 @@ export default define(class Judgement extends Element {
   static name = "Judgement";
 
   toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             judgementNode = instantiateJudgement(string, context),
             node = judgementNode,  ///
             frame = frameFromJudgementNode(judgementNode, context),
@@ -264,7 +272,7 @@ export default define(class Judgement extends Element {
 
       context = null;
 
-      const judgement = new Judgement(context, string, node, lineIndex, frame, assumption);
+      const judgement = new Judgement(context, string, node, breakPoint, frame, assumption);
 
       return judgement;
     }, context);

package/src/element/label.js

@@ -8,8 +8,8 @@ import { labelFromLabelNode, metavariableFromLabelNode } from "../utilities/elem
 import { ablate, attempt, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Label extends Element {
-  constructor(context, string, node, lineIndex, metavariable) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, metavariable) {
+    super(context, string, node, breakPoint);
 
     this.metavariable = metavariable;
   }
@@ -128,13 +128,21 @@ export default define(class Label extends Element {
     const context = this.getContext();
 
     return serialise((context) => {
-      const string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              context,
-              string,
-              lineIndex
-            };
+      const string = this.getString();
+
+      let breakPoint;
+
+      breakPoint = this.getBreakPoint();
+
+      const breakPointJSON = breakPoint.toJSON();
+
+      breakPoint = breakPointJSON;  ///
+
+      const json = {
+        context,
+        string,
+        breakPoint
+      };
 
       return json;
     }, context);
@@ -147,12 +155,12 @@ export default define(class Label extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string, lineIndex } = json,
+        const { string, breakPoint } = json,
               labelNode = instantiateLabel(string, context),
               node = labelNode, ///
               metavariable = metavariableFromLabelNode(labelNode, context);
 
-        label = new Label(context, string, node, lineIndex, metavariable);
+        label = new Label(context, string, node, breakPoint, metavariable);
       }, context);
     }, json, context);
 

package/src/element/metaType.js

@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
 import { define } from "../elements";
 
 export default define(class MetaType extends Element {
-  constructor(context, string, node, lineIndex, name) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, name) {
+    super(context, string, node, breakPoint);
 
     this.name = name;
   }
@@ -37,12 +37,20 @@ export default define(class MetaType extends Element {
   static name = "MetaType";
 
   toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
@@ -58,8 +66,8 @@ export default define(class MetaType extends Element {
   static fromName(name, context) {
     const string = name,  ///
           node = null,
-          lineIndex = null,
-          metaType = new MetaType(context, string, node, lineIndex, name);
+          breakPoint = null,
+          metaType = new MetaType(context, string, node, breakPoint, name);
 
     return metaType;
   }

package/src/element/metavariable.js

@@ -13,8 +13,8 @@ import { unifyMetavariable, unifyMetavariableIntrinsically } from "../process/un
 import { nameFromMetavariableNode, termFromMetavariableNode, typeFromMetavariableNode, metavariableFromStatementNode } from "../utilities/element";
 
 export default define(class Metavariable extends Element {
-  constructor(context, string, node, lineIndex, name, term, type, metaType) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, name, term, type, metaType) {
+    super(context, string, node, breakPoint);
     
     this.name = name;
     this.term = term;
@@ -615,13 +615,21 @@ export default define(class Metavariable extends Element {
   toJSON() {
     const metaTypeJSON = metaTypeToMetaTypeJSON(this.metaType),
           metaType = metaTypeJSON,  ///
-          string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex,
-            metaType
-          };
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint,
+      metaType
+    };
 
     return json;
   }
@@ -630,14 +638,14 @@ export default define(class Metavariable extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             metavariableNode = instantiateMetavariable(string, context),
             node = metavariableNode,  ///
             name = nameFromMetavariableNode(metavariableNode, context),
             term = termFromMetavariableNode(metavariableNode, context),
             type = typeFromMetavariableNode(metavariableNode, context),
             metaType = metaTypeFromJSON(json, context),
-            metavariable = new Metavariable(context, string, node, lineIndex, name, term, type, metaType);
+            metavariable = new Metavariable(context, string, node, breakPoint, name, term, type, metaType);
 
       return metavariable;
     }, context);

package/src/element/parameter.js

@@ -8,8 +8,8 @@ import { instantiateParameter } from "../process/instantiate";
 import { nameFromParaneterNode, identifierFromParameterNode } from "../utilities/element";
 
 export default define(class Parameter extends Element {
-  constructor(context, string, node, lineIndex, name, identifier) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, name, identifier) {
+    super(context, string, node, breakPoint);
 
     this.name = name;
     this.identifier = identifier;
@@ -52,19 +52,27 @@ export default define(class Parameter extends Element {
   static name = "Parameter";
 
   toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             parameterNode = instantiateParameter(string, context),
             node = parameterNode,  ///
             name = nameFromParaneterNode(parameterNode, context),
@@ -72,7 +80,7 @@ export default define(class Parameter extends Element {
 
       context = null;
 
-      const parameter = new Parameter(context, string, node, lineIndex, name, identifier);
+      const parameter = new Parameter(context, string, node, breakPoint, name, identifier);
 
       return parameter;
     }, context);

package/src/element/procedureCall.js

@@ -11,8 +11,8 @@ import { parametersFromProcedureCallNode, procedureReferenceFromProcedureCallNod
 const { termsFromPrimitives } = termsUtilities;
 
 export default define(class ProcedureCall extends Element {
-  constructor(context, string, node, lineIndex, parameters, procedureReference) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, parameters, procedureReference) {
+    super(context, string, node, breakPoint);
 
     this.parameters = parameters;
     this.procedureReference = procedureReference;
@@ -121,19 +121,27 @@ export default define(class ProcedureCall extends Element {
   static name = "ProcedureCall";
 
   toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             procedureCallNode = instantiateProcedureCall(string, context),
             node = procedureCallNode,  ///
             parameters = parametersFromProcedureCallNode(json, context),
@@ -141,7 +149,7 @@ export default define(class ProcedureCall extends Element {
 
       context = null;
 
-      const procedureCall = new ProcedureCall(context, string, node, lineIndex, parameters, procedureReference);
+      const procedureCall = new ProcedureCall(context, string, node, breakPoint, parameters, procedureReference);
 
       return procedureCall;
     }, context);

package/src/element/procedureReference.js

@@ -8,8 +8,8 @@ import { instantiateProcedureReference } from "../process/instantiate";
 import { nameFromProcedureReferenceNode } from "../utilities/element";
 
 export default define(class ProcedureReference extends Element {
-  constructor(context, string, node, lineIndex, name) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, name) {
+    super(context, string, node, breakPoint);
 
     this.name = name;
   }
@@ -34,26 +34,34 @@ export default define(class ProcedureReference extends Element {
   static name = "ProcedureReference";
 
   toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
+    const string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const json = {
+      string,
+      breakPoint
+    };
 
     return json;
   }
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             procedureReferenceNode = instantiateProcedureReference(string, context),
             node = procedureReferenceNode,  ///
             name = nameFromProcedureReferenceNode(procedureReferenceNode, context);
 
       context = null;
 
-      const procedureReference = new ProcedureReference(context, string, node, lineIndex, name);
+      const procedureReference = new ProcedureReference(context, string, node, breakPoint, name);
 
       return procedureReference;
     }, context);

package/src/element/proof.js

@@ -6,8 +6,8 @@ import { define } from "../elements";
 import { enclose } from "../utilities/context";
 
 export default define(class Proof extends Element {
-  constructor(context, string, node, lineIndex, derivation) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, derivation) {
+    super(context, string, node, breakPoint);
 
     this.derivation = derivation;
   }