occam-verify-cli 1.0.935 → 1.0.937

package/src/element/substitution.js

@@ -9,11 +9,11 @@ const { first, second } = arrayUtilities,
       { primitiveFromNode } =primitiveUtilities;
 
 class Element {
-  constructor(contexts, string, node, lineIndex) {
+  constructor(contexts, string, node, breakPoint) {
     this.contexts = contexts;
     this.string = string;
     this.node = node;
-    this.lineIndex = lineIndex;
+    this.breakPoint = breakPoint;
   }
 
   getContexts() {
@@ -28,8 +28,8 @@ class Element {
     return this.node;
   }
 
-  getLineIndex() {
-    return this.lineIndex;
+  getBreakPoint() {
+    return this.breakPoint;
   }
 
   setContexts(contexts) {
@@ -44,12 +44,12 @@ class Element {
     this.node = node;
   }
 
-  setLineIndex(lineIndex) {
-    this.lineIndex = lineIndex;
+  setLineIndex(breakPoint) {
+    this.breakPoint = breakPoint;
   }
 
   async break(context) {
-    this.lineIndex = await context.break(this.node, this.lineIndex);
+    this.breakPoint = await context.break(this.node, this.breakPoint);
   }
 
   matchNode(node) { return this.node.match(node); }
@@ -243,14 +243,22 @@ export default class Substitution extends Element {
 
     return serialises((...contexts) => {
       const name = this.getName(),
-            string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              name,
-              contexts,
-              string,
-              lineIndex
-            };
+            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

@@ -14,8 +14,8 @@ import { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisi
 const { filter } = arrayUtilities;
 
 export default define(class Term extends Element {
-  constructor(context, string, node, lineIndex, type, provisional) {
-    super(context, string, node, lineIndex, provisional);
+  constructor(context, string, node, breakPoint, type, provisional) {
+    super(context, string, node, breakPoint, provisional);
 
     this.type = type;
     this.provisional = provisional;
@@ -288,13 +288,21 @@ export default define(class Term extends Element {
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
           provisionalJSON = provisionalToProvisionalJSON(this.provisional),
-          string = this.getString(), ///
-          lineIndex = this.getLineIndex(),
-          type = typeJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const type = typeJSON,  ///
           provisional = provisionalJSON,  ///
           json = {
             string,
-            lineIndex,
+            breakPoint,
             type,
             provisional
           };
@@ -306,7 +314,7 @@ export default define(class Term extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             termNode = instantiateTerm(string, context),
             node = termNode,  ///
             type = typeFromJSON(json, context),
@@ -314,7 +322,7 @@ export default define(class Term extends Element {
 
       context = null;
 
-      const term = new Term(context, string, node, lineIndex, type, provisional);
+      const term = new Term(context, string, node, breakPoint, type, provisional);
 
       return term;
     }, context);

package/src/element/topLevelAssertion.js

@@ -20,8 +20,8 @@ const { reverse } = arrayUtilities,
       { asyncExtract, asyncForwardsEvery, asyncBackwardsEvery } = asynchronousUtilities;
 
 export default class TopLevelAssertion extends Element {
-  constructor(context, string, node, lineIndex, labels, suppositions, deduction, proof, signature, hypotheses) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses) {
+    super(context, string, node, breakPoint);
 
     this.labels = labels;
     this.suppositions = suppositions;
@@ -353,16 +353,24 @@ export default class TopLevelAssertion extends Element {
           suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
           signatureJSON = signatureToSignatureJSON(this.signature),
           hypothesesJSON = hypothesesToHypothesesJSON(this.hypotheses),
-          string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          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,  ///
           hypotheses = hypothesesJSON,  ///
           json = {
             string,
-            lineIndex,
+            breakPoint,
             labels,
             deduction,
             suppositions,
@@ -374,7 +382,7 @@ export default class TopLevelAssertion extends Element {
   }
 
   static fromJSON(Class, json, context) {
-    const { lineIndex } = json,
+    const { breakPoint } = json,
           labels = labelsFromJSON(json, context),
           deduction = deductionFromJSON(json, context),
           suppositions = suppositionsFromJSON(json, context),
@@ -384,7 +392,7 @@ export default class TopLevelAssertion extends Element {
           node = null,
           proof = null,
           string = topLevelAssertionString, ///
-          topLevelAssertion = new Class(context, string, node, lineIndex, labels, suppositions, deduction, proof, signature, hypotheses);
+          topLevelAssertion = new Class(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses);
 
     return topLevelAssertion;
   }

package/src/element/topLevelMetaAssertion.js

@@ -16,8 +16,8 @@ import { labelFromJSON,
 const { asyncForwardsEvery } = asynchronousUtilities;
 
 export default class TopLevelMetaAssertion extends Element {
-  constructor(context, string, node, lineIndex, label, suppositions, deduction, proof, metaLevelAssumptions) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, label, suppositions, deduction, proof, metaLevelAssumptions) {
+    super(context, string, node, breakPoint);
 
     this.label = label;
     this.suppositions = suppositions;
@@ -233,15 +233,23 @@ export default class TopLevelMetaAssertion extends Element {
           deductionJSON = deductionToDeductionJSON(this.deduction),
           suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
           metaLevelAssumptionsJSON = metaLevelAssumptionsToMetaLevelAssumptionsJSON(this.metaLevelAssumptions),
-          string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          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,  ///
           json = {
             string,
-            lineIndex,
+            breakPoint,
             label,
             deduction,
             suppositions,
@@ -252,7 +260,7 @@ export default class TopLevelMetaAssertion extends Element {
   }
 
   static fromJSON(Class, json, context) {
-    const { lineIndex } = json,
+    const { breakPoint } = json,
           label = labelFromJSON(json, context),
           deduction = deductionFromJSON(json, context),
           suppositions = suppositionsFromJSON(json, context),
@@ -260,7 +268,7 @@ export default class TopLevelMetaAssertion extends Element {
           node = null,
           proof = null,
           string = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
-          topLevelMetaAssertion = new Class(context, string, node, lineIndex, label, suppositions, deduction, proof, metaLevelAssumptions);
+          topLevelMetaAssertion = new Class(context, string, node, breakPoint, label, suppositions, deduction, proof, metaLevelAssumptions);
 
     return topLevelMetaAssertion;
   }

package/src/element/type.js

@@ -20,8 +20,8 @@ import { propertiesFromJSON,
 const { push, first } = arrayUtilities;
 
 export default define(class Type extends Element {
-  constructor(context, string, node, lineIndex, name, prefixName, superTypes, properties, provisional) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, name, prefixName, superTypes, properties, provisional) {
+    super(context, string, node, breakPoint);
 
     this.name = name;
     this.prefixName = prefixName;
@@ -298,10 +298,10 @@ export default define(class Type extends Element {
 
   toJSON(abridged = false) {
     const string = this.getString(),
-          lineIndex = this.getLineIndex(),
+          breakPoint = this.getBreakPoint(),
           json = {
             string,
-            lineIndex
+            breakPoint
           };
 
     if (!abridged) {
@@ -329,7 +329,7 @@ export default define(class Type extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             typeNode = instantiateType(string, context),
             node = typeNode, ///
             name = nameFromTypeNode(typeNode, context),
@@ -340,7 +340,7 @@ export default define(class Type extends Element {
 
       context = null; ///
 
-      const type = new Type(context, string, node, lineIndex, name, prefixName, superTypes, properties, provisional);
+      const type = new Type(context, string, node, breakPoint, name, prefixName, superTypes, properties, provisional);
 
       return type;
     }, context);
@@ -349,7 +349,7 @@ export default define(class Type extends Element {
   static fromName(name, context) {
     const string = name,  ///
           node = null,
-          lineIndex = null,
+          breakPoint = null,
           prefixName = null,
           superTypes = [],
           properties = [],
@@ -357,7 +357,7 @@ export default define(class Type extends Element {
 
     context = null;
 
-    const type = new Type(context, string, node, lineIndex, name, prefixName, superTypes, properties, provisional);
+    const type = new Type(context, string, node, breakPoint, name, prefixName, superTypes, properties, provisional);
 
     return type;
   }

package/src/element/typePrefix.js

@@ -8,8 +8,8 @@ import { instantiateTypePrefix } from "../process/instantiate";
 import { nameFromTypePrefixNode } from "../utilities/element";
 
 export default define(class TypePrefix 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;
   }
@@ -76,26 +76,34 @@ export default define(class TypePrefix extends Element {
   static name = "TypePrefix";
 
   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,
             typePrefixNode = instantiateTypePrefix(string, context),
             node = typePrefixNode, ///
             name = nameFromTypePrefixNode(typePrefixNode, context);
 
       context = null; ///
 
-      const typePrefix = new TypePrefix(context, string, node, lineIndex, name);
+      const typePrefix = new TypePrefix(context, string, node, breakPoint, name);
 
       return typePrefix;
     }, context);

package/src/element/variable.js

@@ -12,8 +12,8 @@ import { variableFromTermNode, identifierFromVariableNode } from "../utilities/e
 import { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisionalJSON } from "../utilities/json";
 
 export default define(class Variable extends Element {
-  constructor(context, string, node, lineIndex, type, identifier, provisional) {
-    super(context, string, node, lineIndex);
+  constructor(context, string, node, breakPoint, type, identifier, provisional) {
+    super(context, string, node, breakPoint);
 
     this.type = type;
     this.identifier = identifier;
@@ -207,13 +207,21 @@ export default define(class Variable extends Element {
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
           provisionalJSON = provisionalToProvisionalJSON(this.provisional),
-          string = this.getString(), ///
-          lineIndex = this.getLineIndex(),
-          type = typeJSON,  ///
+          string = this.getString();
+
+    let breakPoint;
+
+    breakPoint = this.getBreakPoint();
+
+    const breakPointJSON = breakPoint.toJSON();
+
+    breakPoint = breakPointJSON;  ///
+
+    const type = typeJSON,  ///
           provisional = provisionalJSON,  ///
           json = {
             string,
-            lineIndex,
+            breakPoint,
             type,
             provisional
           };
@@ -225,7 +233,7 @@ export default define(class Variable extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string, lineIndex } = json,
+      const { string, breakPoint } = json,
             variableNode = instantiateVariable(string, context),
             node = variableNode,  ///
             type = typeFromJSON(json, context),
@@ -234,7 +242,7 @@ export default define(class Variable extends Element {
 
       context = null;
 
-      const variable = new Variable(context, string, node, lineIndex, type, identifier, provisional);
+      const variable = new Variable(context, string, node, breakPoint, type, identifier, provisional);
 
       return variable;
     }, context);