occam-verify-cli 1.0.824 → 1.0.826

package/src/element/assertion/contained.js

@@ -13,8 +13,8 @@ import { termFromContainedAssertionNode,
          containedAssertionFromStatementNode } from "../../utilities/element";
 
 export default define(class ContainedAssertion extends Assertion {
-  constructor(context, string, node, term, frame, negated, statement) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, term, frame, negated, statement) {
+    super(context, string, node, lineIndex);
 
     this.term = term;
     this.frame = frame;
@@ -243,6 +243,12 @@ export default define(class ContainedAssertion extends Assertion {
     return unifiesIndependently;
   }
 
+  toJSON() {
+    const json = super.toJSON();
+
+    return json;
+  }
+
   static name = "ContainedAssertion";
 
   static fromJSON(json, context) {
@@ -252,7 +258,7 @@ export default define(class ContainedAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               containedAssertionNode = instantiateContainedAssertion(string, context),
               node = containedAssertionNode,  ///
               term = termFromContainedAssertionNode(containedAssertionNode, context),
@@ -262,7 +268,7 @@ export default define(class ContainedAssertion extends Assertion {
 
         context = null;
 
-        containedAssertion = new ContainedAssertion(context, string, node, term, frame, negated, statement);
+        containedAssertion = new ContainedAssertion(context, string, node, lineIndex, term, frame, negated, statement);
       }, context);
     }
 

package/src/element/assertion/property.js

@@ -9,8 +9,8 @@ import { variableAssignmentFromPrepertyAssertion } from "../../process/assign";
 import { termFromPropertyAssertionNode, propertyAssertionFromStatementNode, propertyRelationFromPropertyAssertionNode } from "../../utilities/element";
 
 export default define(class PropertyAssertion extends Assertion {
-  constructor(context, string, node, term, propertyRelation) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, term, propertyRelation) {
+    super(context, string, node, lineIndex);
 
     this.term = term;
     this.propertyRelation = propertyRelation;
@@ -203,6 +203,12 @@ export default define(class PropertyAssertion extends Assertion {
     context.addAssignment(variableAssigment);
   }
 
+  toJSON() {
+    const json = super.toJSON();
+
+    return json;
+  }
+
   static name = "PropertyAssertion";
 
   static fromJSON(json, context) {
@@ -212,7 +218,7 @@ export default define(class PropertyAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               propertyAssertionNode = instantiatePropertyAssertion(string, context),
               node = propertyAssertionNode,  ///
               term = termFromPropertyAssertionNode(propertyAssertionNode, context),
@@ -220,7 +226,7 @@ export default define(class PropertyAssertion extends Assertion {
 
         context = null;
 
-        propertyAssertion = new PropertyAssertion(context, string, node, term, propertyRelation);
+        propertyAssertion = new PropertyAssertion(context, string, node, lineIndex, term, propertyRelation);
       }, context);
     }
 

package/src/element/assertion/satisfies.js

@@ -8,8 +8,8 @@ import { instantiateSatisfiesAssertion } from "../../process/instantiate";
 import { signatureFromJSatisfiesAssertionNode, referenceFromJSatisfiesAssertionNode, satisfiesAssertionFromStatementNode } from "../../utilities/element";
 
 export default define(class SatisfiesAssertion extends Assertion {
-  constructor(context, string, node, signature, reference) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, signature, reference) {
+    super(context, string, node, lineIndex);
 
     this.signature = signature;
     this.reference = reference;
@@ -157,6 +157,12 @@ export default define(class SatisfiesAssertion extends Assertion {
     return stepAndSubproofOrProofAssertionsUnify;
   }
 
+  toJSON() {
+    const json = super.toJSON();
+
+    return json;
+  }
+
   static name = "SatisfiesAssertion";
 
   static fromJSON(json, context) {
@@ -165,7 +171,7 @@ export default define(class SatisfiesAssertion extends Assertion {
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {const { string } = json,
+      instantiate((context) => {const { string, lineIndex } = json,
               definedAssertionNode = instantiateSatisfiesAssertion(string, context),
               node = definedAssertionNode,  ///
               signature = signatureFromJSatisfiesAssertionNode(definedAssertionNode, context),
@@ -173,7 +179,7 @@ export default define(class SatisfiesAssertion extends Assertion {
 
         context = null;
 
-        satisfiesAssertion = new SatisfiesAssertion(context, string, node, signature, reference);
+        satisfiesAssertion = new SatisfiesAssertion(context, string, node, lineIndex, signature, reference);
       }, context);
     }
 

package/src/element/assertion/subproof.js

@@ -13,8 +13,8 @@ import { subproofAssertionFromStatementNode } from "../../utilities/element";
 const { last, front, backwardsEvery } = arrayUtilities;
 
 export default define(class SubproofAssertion extends Assertion {
-  constructor(context, string, node, statements) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, statements) {
+    super(context, string, node, lineIndex);
 
     this.statements = statements;
   }
@@ -289,6 +289,12 @@ export default define(class SubproofAssertion extends Assertion {
     return topLevelMetaAssertionUnifies;
   }
 
+  toJSON() {
+    const json = super.toJSON();
+
+    return json;
+  }
+
   static name = "SubproofAssertion";
 
   static fromJSON(json, context) {
@@ -298,14 +304,14 @@ export default define(class SubproofAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               subproofAssertionNode = instantiateSubproofAssertion(string, context),
               statements = statementsFromSubproofAssertionNode(subproofAssertionNode, context),
               node = subproofAssertionNode; ///
 
         context = null;
 
-        subproorAssertion = new SubproofAssertion(context, string, node, statements);
+        subproorAssertion = new SubproofAssertion(context, string, node, lineIndex, statements);
       }, context);
     }
 

package/src/element/assertion/type.js

@@ -10,8 +10,8 @@ import { variableAssignmentFromTypeAssertion } from "../../process/assign";
 import { termFromTypeAssertionNode, typeAssertionFromStatementNode } from "../../utilities/element";
 
 export default define(class TypeAssertion extends Assertion {
-  constructor(context, string, node, term, type) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, term, type) {
+    super(context, string, node, lineIndex);
 
     this.term = term;
     this.type = type;
@@ -193,17 +193,15 @@ export default define(class TypeAssertion extends Assertion {
   }
 
   toJSON() {
-    const { name } = this.constructor,
-          typeJSON = typeToTypeJSON(this.type),
-          type = typeJSON,  ///
-          string = this.getString(),
-          json = {
-            name,
-            string,
-            type
-          };
-
-    return json;
+    const json = super.toJSON();
+
+    const typeJSON = typeToTypeJSON(this.type),
+          type = typeJSON;  ///
+
+    return {
+      ...json,
+      type
+    };
   }
 
   static name = "TypeAssertion";
@@ -215,7 +213,7 @@ export default define(class TypeAssertion extends Assertion {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               typeAssertionNode = instantiateTypeAssertion(string, context),
               term = termFromTypeAssertionNode(typeAssertionNode, context),
               type = typeFromJSON(json, context),
@@ -223,7 +221,7 @@ export default define(class TypeAssertion extends Assertion {
 
         context = null;
 
-        typeAssertion = new TypeAssertion(context, string, node, term, type);
+        typeAssertion = new TypeAssertion(context, string, node, lineIndex, term, type);
       }, context);
     }
 

package/src/element/assertion.js

@@ -37,9 +37,11 @@ export default class Assertion extends Element {
   toJSON() {
     const { name } = this.constructor,
           string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
             name,
-            string
+            string,
+            lineIndex
           };
 
     return json;

package/src/element/assumption.js

@@ -8,8 +8,8 @@ import { instantiateAssumption } from "../process/instantiate";
 import { join, reconcile, instantiate } from "../utilities/context";
 
 export default define(class Assumption extends Element {
-  constructor(context, string, node, reference, statement) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, reference, statement) {
+    super(context, string, node, lineIndex);
 
     this.reference = reference;
     this.statement = statement;
@@ -269,8 +269,10 @@ export default define(class Assumption extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -280,12 +282,12 @@ export default define(class Assumption extends Element {
 
   static fromJSON(json, context) {
     const assumption = instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             assumptionNode = instantiateAssumption(string, context),
             node = assumptionNode,  ///
             reference = referenceFromAssumptionNode(assumptionNode, context),
             statement = statementFromAssumptionNode(assumptionNode, context),
-            assumption = new Assumption(context, string, node, reference, statement);
+            assumption = new Assumption(context, string, node, lineIndex, reference, statement);
 
       return assumption;
     }, context);

package/src/element/combinator.js

@@ -10,8 +10,8 @@ import { validateStatementAsCombinator } from "../process/validate";
 import { attempt, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Combinator extends Element {
-  constructor(context, string, node, statement) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, statement) {
+    super(context, string, node, lineIndex);
 
     this.statement = statement;
   }
@@ -107,9 +107,11 @@ export default define(class Combinator extends Element {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;
@@ -123,12 +125,12 @@ export default define(class Combinator extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               combinatorNode = instantiateCombinator(string, context),
               node = combinatorNode,  ///
               statement = statementFromCombinatorNode(combinatorNode, context);
 
-        combinator = new Combinator(context, string, node, statement);
+        combinator = new Combinator(context, string, node, lineIndex, statement);
       }, context);
     }, json, context);
 

package/src/element/conclusion.js

@@ -7,8 +7,8 @@ import { instantiateConclusion } from "../process/instantiate";
 import { declare, attempt, descend, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Conclusion extends Element {
-  constructor(context, string, node, statement) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, statement) {
+    super(context, string, node, lineIndex);
 
     this.statement = statement;
   }
@@ -136,9 +136,11 @@ export default define(class Conclusion extends Element {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;
@@ -152,12 +154,12 @@ export default define(class Conclusion extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               conclusionNode = instantiateConclusion(string, context),
               node = conclusionNode,  ///
               statement = statementFromConclusionNode(conclusionNode, context);
 
-        conclusion = new Conclusion(context, string, node, statement);
+        conclusion = new Conclusion(context, string, node, lineIndex, statement);
       }, context);
     }, json, context);
 

package/src/element/constructor.js

@@ -11,8 +11,8 @@ import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { attempt, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Constructor extends Element {
-  constructor(context, string, node, term, type) {
-    super(context, string, node, type);
+  constructor(context, string, node, lineIndex, term, type) {
+    super(context, string, node, lineIndex);
 
     this.term = term;
     this.type = type;
@@ -151,10 +151,12 @@ export default define(class Constructor extends Element {
       const includeType = false,
             typeJSON = typeToTypeJSON(this.type),
             string = this.getString(includeType),
+            lineIndex = this.getLineIndex(),
             type = typeJSON,  ///
             json = {
               context,
               string,
+              lineIndex,
               type
             };
 
@@ -169,13 +171,13 @@ export default define(class Constructor extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               constructorNode = instantiateConstructor(string, context),
               node = constructorNode, ///
               term = termFromConstructorNode(constructorNode, context),
               type = typeFromJSON(json, context);
 
-        constructor = new Constructor(context, string, node, term, type);
+        constructor = new Constructor(context, string, node, lineIndex, term, type);
       }, context);
     }, json, context);
 

package/src/element/declaration/combinator.js

@@ -5,8 +5,8 @@ import Declaration from "../declaration";
 import { define } from "../../elements";
 
 export default define(class CombinatorDeclaration extends Declaration {
-  constructor(context, string, node, combinator) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, combinator) {
+    super(context, string, node, lineIndex);
 
     this.combinator = combinator;
   }

package/src/element/declaration/complexType.js

@@ -5,8 +5,8 @@ import Declaration from "../declaration";
 import { define } from "../../elements";
 
 export default define(class ComplexTypeDeclaration extends Declaration {
-  constructor(context, string, node, type, superTypes) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, type, superTypes) {
+    super(context, string, node, lineIndex);
 
     this.type = type;
     this.superTypes = superTypes;

package/src/element/declaration/constructor.js

@@ -5,8 +5,8 @@ import Declaration from "../declaration";
 import { define } from "../../elements";
 
 export default define(class ConstructorDeclaration extends Declaration {
-  constructor(context, string, node, type, provisional, constructor) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, type, provisional, constructor) {
+    super(context, string, node, lineIndex);
 
     this.type = type;
     this.provisional = provisional;

package/src/element/declaration/metavariable.js

@@ -5,8 +5,8 @@ import Declaration from "../declaration";
 import { define } from "../../elements";
 
 export default define(class MetavariableDeclaration extends Declaration {
-  constructor(context, string, node, metaType, metavariable) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, metaType, metavariable) {
+    super(context, string, node, lineIndex);
 
     this.metaType = metaType;
     this.metavariable = metavariable;

package/src/element/declaration/simpleType.js

@@ -7,8 +7,8 @@ import { superTypesStringFromSuperTypes } from "../../utilities/string";
 import {baseTypeFromNothing} from "../../utilities/type";
 
 export default define(class SimpleTypeDeclaration extends Declaration {
-  constructor(context, string, node, type, superTypes, provisional) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, type, superTypes, provisional) {
+    super(context, string, node, lineIndex);
 
     this.type = type;
     this.superTypes = superTypes;

package/src/element/declaration/typePrefix.js

@@ -5,8 +5,8 @@ import Declaration from "../declaration";
 import { define } from "../../elements";
 
 export default define(class TypePrefixDeclaration extends Declaration {
-  constructor(context, string, node, typePrefix) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, typePrefix) {
+    super(context, string, node, lineIndex);
 
     this.typePrefix = typePrefix;
   }

package/src/element/declaration/variable.js

@@ -5,8 +5,8 @@ import Declaration from "../declaration";
 import { define } from "../../elements";
 
 export default define(class VariableDeclaration extends Declaration {
-  constructor(context, string, node, type, variable, provisional) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, type, variable, provisional) {
+    super(context, string, node, lineIndex);
 
     this.type = type;
     this.variable = variable;

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, statement) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, statement) {
+    super(context, string, node, lineIndex);
 
     this.statement = statement;
   }
@@ -161,9 +161,11 @@ export default define(class Deduction extends Element {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;
@@ -177,12 +179,12 @@ export default define(class Deduction extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               deductionNode = instantiateDeduction(string, context),
               node = deductionNode,  ///
               statement = statementFromDeductionNode(deductionNode, context);
 
-        deduction = new Deduction(context, string, node, statement);
+        deduction = new Deduction(context, string, node, lineIndex, 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, subproofOrProofAssertions) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, subproofOrProofAssertions) {
+    super(context, string, node, lineIndex);
 
     this.subproofOrProofAssertions = subproofOrProofAssertions;
   }
@@ -52,6 +52,17 @@ export default define(class Derivation extends Element {
     return verifies;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "Derivation";
 });
 

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, leftTerm, rightTerm) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, leftTerm, rightTerm) {
+    super(context, string, node, lineIndex);
 
     this.leftTerm = leftTerm;
     this.rightTerm = rightTerm;
@@ -263,8 +263,10 @@ export default define(class Equality extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -272,7 +274,7 @@ export default define(class Equality extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             equalityNode = instantiateEquality(string, context),
             node = equalityNode,  ///
             leftTerm = leftTermFromEqualityNode(equalityNode, context),
@@ -280,7 +282,7 @@ export default define(class Equality extends Element {
 
       context = null;
 
-      const equality = new Equality(context, string, node, leftTerm, rightTerm);
+      const equality = new Equality(context, string, node, lineIndex, 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, type, terms) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, type, terms) {
+    super(context, string, node, lineIndex);
 
     this.type = type;
     this.terms = terms;
@@ -231,6 +231,17 @@ export default define(class Equivalence extends Element {
     return equivalence;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "Equivalence";
 
   static fromEquality(equality, context) {

package/src/element/error.js

@@ -23,5 +23,16 @@ export default define(class Error extends Element {
     return verifies;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "Error";
 });