occam-verify-cli 1.0.824 → 1.0.826

package/src/element/subDerivation.js

@@ -9,8 +9,8 @@ const { last } = arrayUtilities,
       { asyncEvery } = asynchronousUtilities;
 
 export default define(class SubDerivation 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,5 +52,16 @@ export default define(class SubDerivation extends Element {
     return verifies;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "SubDerivation";
 });

package/src/element/subproof.js

@@ -8,8 +8,8 @@ import { enclose } from "../utilities/context";
 const { asyncEvery } = asynchronousUtilities;
 
 export default define(class Subproof extends Element {
-  constructor(context, string, node, suppositions, subDerivation) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, suppositions, subDerivation) {
+    super(context, string, node, lineIndex);
 
     this.suppositions = suppositions;
     this.subDerivation = subDerivation;
@@ -147,5 +147,16 @@ export default define(class Subproof extends Element {
     return unifiesWithSatisfiesAssertion;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "Subproof";
 });

package/src/element/substitution/frame.js

@@ -9,8 +9,8 @@ import { join, ablate, descend, attempt, instantiate } from "../../utilities/con
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
 
 export default define(class FrameSubstitution extends Substitution {
-  constructor(context, string, node, generalContext, targetFrame, replacementFrame) {
-    super(context, string, node, generalContext);
+  constructor(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame) {
+    super(context, string, node, lineIndex, generalContext);
 
     this.targetFrame = targetFrame;
     this.replacementFrame = replacementFrame;
@@ -191,14 +191,14 @@ export default define(class FrameSubstitution extends Substitution {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               frameSubstitutionNode = instantiateFrameSubstitution(string, context),
               node = frameSubstitutionNode, ///
               generalContext = generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context),
               targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
               replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
 
-        frameSubstitutionn = new FrameSubstitution(context, string, node, generalContext, targetFrame, replacementFrame);
+        frameSubstitutionn = new FrameSubstitution(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame);
       }, context);
     }
 

package/src/element/substitution/reference.js

@@ -9,8 +9,8 @@ import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilit
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
 
 export default define(class ReferenceSubstitution extends Substitution {
-  constructor(context, string, node, generalContext, targetReference, replacementReference) {
-    super(context, string, node, generalContext);
+  constructor(context, string, node, lineIndex, generalContext, targetReference, replacementReference) {
+    super(context, string, node, lineIndex, generalContext);
 
     this.targetReference = targetReference;
     this.replacementReference = replacementReference;
@@ -198,14 +198,14 @@ export default define(class ReferenceSubstitution extends Substitution {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
               node = referenceSubstitutionNode, ///
               generalContext = generalContextFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
               targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
               replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
 
-        referenceSubstitutionn = new ReferenceSubstitution(context, string, node, generalContext, targetReference, replacementReference);
+        referenceSubstitutionn = new ReferenceSubstitution(context, string, node, lineIndex, generalContext, targetReference, replacementReference);
       }, context);
     }
 

package/src/element/substitution/statement.js

@@ -11,8 +11,8 @@ import { join, ablate, attempt, descend, reconcile, instantiate } from "../../ut
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
 export default define(class StatementSubstitution extends Substitution {
-  constructor(context, string, node, generalContext, resolved, substitution, targetStatement, replacementStatement) {
-    super(context, string, node, generalContext);
+  constructor(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement) {
+    super(context, string, node, lineIndex, generalContext);
 
     this.resolved = resolved;
     this.substitution = substitution;
@@ -384,7 +384,7 @@ export default define(class StatementSubstitution extends Substitution {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               statementSubstitutionNode = instantiateStatementSubstitution(string, context),
               node = statementSubstitutionNode, ///
               generalContext = generalContextFromStatementSubstitutionNode(statementSubstitutionNode, context),
@@ -393,7 +393,7 @@ export default define(class StatementSubstitution extends Substitution {
               targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
               replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context);
 
-        statementSubstitutionn = new StatementSubstitution(context, string, node, generalContext, resolved, substitution, targetStatement, replacementStatement);
+        statementSubstitutionn = new StatementSubstitution(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement);
       }, context);
     }
 

package/src/element/substitution/term.js

@@ -10,8 +10,8 @@ import { termSubstitutionStringFromTermAndVariable } from "../../utilities/strin
 import { join, ablate, descend, attempt, instantiate } from "../../utilities/context";
 
 export default define(class TermSubstitution extends Substitution {
-  constructor(context, string, node, generalContext, targetTerm, replacementTerm) {
-    super(context, string, node, generalContext);
+  constructor(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm) {
+    super(context, string, node, lineIndex, generalContext);
 
     this.targetTerm = targetTerm;
     this.replacementTerm = replacementTerm;
@@ -202,14 +202,14 @@ export default define(class TermSubstitution extends Substitution {
 
     if (this.name === name) {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               termSubstitutionNode = instantiateTermSubstitution(string, context),
               node = termSubstitutionNode,  ///
               generalContext = generalContextFromTermSubstitutionNode(termSubstitutionNode, context),
               targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
               replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
 
-        termSubstitutionn = new TermSubstitution(context, string, node, generalContext, targetTerm, replacementTerm);
+        termSubstitutionn = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);
       }, context);
     }
 

package/src/element/substitution.js

@@ -6,8 +6,8 @@ import { primitiveUtilities } from "occam-furtle";
 const { primitiveFromNode } =primitiveUtilities;
 
 export default class Substitution extends Element {
-  constructor(context, string, node, generalContext) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, generalContext) {
+    super(context, string, node, lineIndex);
 
     this.generalContext = generalContext;
   }
@@ -138,9 +138,11 @@ export default class Substitution extends Element {
   toJSON() {
     const { name } = this.constructor,
           string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
             name,
-            string
+            string,
+            lineIndex
           };
 
     return json;

package/src/element/term.js

@@ -13,8 +13,8 @@ import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 const { filter } = arrayUtilities;
 
 export default define(class Term extends Element {
-  constructor(context, string, node, type) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, type) {
+    super(context, string, node, lineIndex);
 
     this.type = type;
   }
@@ -236,9 +236,11 @@ export default define(class Term extends Element {
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
           string = this.getString(), ///
+          lineIndex = this.getLineIndex(),
           type = typeJSON,  ///
           json = {
             string,
+            lineIndex,
             type
           };
 
@@ -249,14 +251,14 @@ export default define(class Term extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             termNode = instantiateTerm(string, context),
             node = termNode,  ///
             type = typeFromJSON(json, context);
 
       context = null;
 
-      const term = new Term(context, string, node, type);
+      const term = new Term(context, string, node, lineIndex, type);
 
       return term;
     }, context);

package/src/element/topLevelAssertion.js

@@ -20,8 +20,8 @@ const { reverse, correlate } = arrayUtilities,
       { asyncExtract, asyncForwardsEvery, asyncBackwardsEvery } = asynchronousUtilities;
 
 export default class TopLevelAssertion extends Element {
-  constructor(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, labels, suppositions, deduction, proof, signature, hypotheses) {
+    super(context, string, node, lineIndex);
 
     this.labels = labels;
     this.suppositions = suppositions;
@@ -384,12 +384,16 @@ 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,  ///
           deduction = deductionJSON,  ///
           suppositions = suppositionsJSON,  ///
           signature = signatureJSON,  ///
           hypotheses = hypothesesJSON,  ///
           json = {
+            string,
+            lineIndex,
             labels,
             deduction,
             suppositions,
@@ -401,7 +405,8 @@ export default class TopLevelAssertion extends Element {
   }
 
   static fromJSON(Class, json, context) {
-    const labels = labelsFromJSON(json, context),
+    const { lineIndex } = json,
+          labels = labelsFromJSON(json, context),
           deduction = deductionFromJSON(json, context),
           suppositions = suppositionsFromJSON(json, context),
           signature = signatureFromJSON(json, context),
@@ -410,7 +415,7 @@ export default class TopLevelAssertion extends Element {
           node = null,
           proof = null,
           string = topLevelAssertionString, ///
-          topLevelAssertion = new Class(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses);
+          topLevelAssertion = new Class(context, string, node, lineIndex, 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, label, suppositions, deduction, proof, metaLevelAssumptions) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, label, suppositions, deduction, proof, metaLevelAssumptions) {
+    super(context, string, node, lineIndex);
 
     this.label = label;
     this.suppositions = suppositions;
@@ -235,11 +235,15 @@ 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,  ///
           deduction = deductionJSON,  ///
           suppositions = suppositionsJSON,  ///
           metaLevelAssumptions = metaLevelAssumptionsJSON,  ///
           json = {
+            string,
+            lineIndex,
             label,
             deduction,
             suppositions,
@@ -250,14 +254,15 @@ export default class TopLevelMetaAssertion extends Element {
   }
 
   static fromJSON(Class, json, context) {
-    const label = labelFromJSON(json, context),
+    const { lineIndex } = json,
+          label = labelFromJSON(json, context),
           deduction = deductionFromJSON(json, context),
           suppositions = suppositionsFromJSON(json, context),
           metaLevelAssumptions = metaLevelAssumptionsFromJSON(json, context),
           node = null,
           proof = null,
           string = topLevelMetaAssertionStringFromLabelSuppositionsDeductionAndMetaLevelAssumptions(label, suppositions, deduction, metaLevelAssumptions),
-          topLevelMetaAssertion = new Class(context, string, node, label, suppositions, deduction, proof, metaLevelAssumptions);
+          topLevelMetaAssertion = new Class(context, string, node, lineIndex, label, suppositions, deduction, proof, metaLevelAssumptions);
 
     return topLevelMetaAssertion;
   }

package/src/element/type.js

@@ -13,8 +13,8 @@ import { superTypesFromJSON, provisionalFromJSON, propertiesFromJSON, provisiona
 const { push, first } = arrayUtilities;
 
 export default define(class Type extends Element {
-  constructor(context, string, node, name, prefixName, superTypes, properties, provisional) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, name, prefixName, superTypes, properties, provisional) {
+    super(context, string, node, lineIndex);
 
     this.name = name;
     this.prefixName = prefixName;
@@ -303,8 +303,10 @@ export default define(class Type extends Element {
           properties = propertiesJSON,  ///
           provisional = provisinoalJSOM,  ///
           string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
             string,
+            lineIndex,
             superTypes,
             properties,
             provisional
@@ -317,7 +319,7 @@ export default define(class Type extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             typeNode = instantiateType(string, context),
             node = typeNode, ///
             name = nameFromTypeNode(typeNode, context),
@@ -328,7 +330,7 @@ export default define(class Type extends Element {
 
       context = null; ///
 
-      const type = new Type(context, string, node, name, prefixName, superTypes, properties, provisional);
+      const type = new Type(context, string, node, lineIndex, name, prefixName, superTypes, properties, provisional);
 
       return type;
     }, context);
@@ -337,6 +339,7 @@ export default define(class Type extends Element {
   static fromName(name, context) {
     const string = name,  ///
           node = null,
+          lineIndex = null,
           prefixName = null,
           superTypes = [],
           properties = [],
@@ -344,7 +347,7 @@ export default define(class Type extends Element {
 
     context = null;
 
-    const type = new Type(context, string, node, name, prefixName, superTypes, properties, provisional);
+    const type = new Type(context, string, node, lineIndex, 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, name) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, name) {
+    super(context, string, node, lineIndex);
 
     this.name = name;
   }
@@ -33,8 +33,10 @@ export default define(class TypePrefix extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -44,14 +46,14 @@ export default define(class TypePrefix extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             typePrefixNode = instantiateTypePrefix(string, context),
             node = typePrefixNode, ///
             name = nameFromTypePrefixNode(typePrefixNode, context);
 
       context = null; ///
 
-      const typePrefix = new TypePrefix(context, string, node, name);
+      const typePrefix = new TypePrefix(context, string, node, lineIndex, name);
 
       return typePrefix;
     }, context);

package/src/element/variable.js

@@ -11,8 +11,8 @@ import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { variableFromTermNode, identifierFromVarialbeNode } from "../utilities/element";
 
 export default define(class Variable extends Element {
-  constructor(context, string, node, type, identifier) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, type, identifier) {
+    super(context, string, node, lineIndex);
 
     this.type = type;
     this.identifier = identifier;
@@ -172,8 +172,10 @@ export default define(class Variable extends Element {
     const typeJSON = typeToTypeJSON(this.type),
           type = typeJSON,  ///
           string = this.getString(), ///
+          lineIndex = this.getLineIndex(),
           json = {
             string,
+            lineIndex,
             type
           };
 
@@ -184,7 +186,7 @@ export default define(class Variable extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             variableNode = instantiateVariable(string, context),
             node = variableNode,  ///
             type = typeFromJSON(json, context),
@@ -192,7 +194,7 @@ export default define(class Variable extends Element {
 
       context = null;
 
-      const variable = new Variable(context, string, node, type, identifier);
+      const variable = new Variable(context, string, node, lineIndex, type, identifier);
 
       return variable;
     }, context);