occam-verify-cli 1.0.825 → 1.0.827

package/src/element/label.js

@@ -9,8 +9,8 @@ import { metavariableFromLabelNode } from "../utilities/element";
 import { ablate, attempt, serialise, unserialise, instantiate } from "../utilities/context";
 
 export default define(class Label extends Element {
-  constructor(context, string, node, metavariable) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, metavariable) {
+    super(context, string, node, lineIndex);
 
     this.metavariable = metavariable;
   }
@@ -131,9 +131,11 @@ export default define(class Label extends Element {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;
@@ -147,12 +149,12 @@ export default define(class Label extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               labelNode = instantiateLabel(string, context),
               node = labelNode, ///
               metavariable = metavariableFromLabelNode(labelNode, context);
 
-        label = new Label(context, string, node, metavariable);
+        label = new Label(context, string, node, lineIndex, 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, name) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, name) {
+    super(context, string, node, lineIndex);
 
     this.name = name;
   }
@@ -36,8 +36,10 @@ export default define(class MetaType extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -56,7 +58,8 @@ export default define(class MetaType extends Element {
   static fromName(name, context) {
     const string = name,  ///
           node = null,
-          metaType = new MetaType(context, string, node, name);
+          lineIndex = null,
+          metaType = new MetaType(context, string, node, lineIndex, 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, name, term, type, metaType) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, name, term, type, metaType) {
+    super(context, string, node, lineIndex);
     
     this.name = name;
     this.term = term;
@@ -638,8 +638,10 @@ export default define(class Metavariable extends Element {
     const metaTypeJSON = metaTypeToMetaTypeJSON(this.metaType),
           metaType = metaTypeJSON,  ///
           string = this.getString(), ///
+          lineIndex = this.getLineIndex(),
           json = {
             string,
+            lineIndex,
             metaType
           };
 
@@ -650,14 +652,14 @@ export default define(class Metavariable extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = 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, name, term, type, metaType);
+            metavariable = new Metavariable(context, string, node, lineIndex, 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, name, identifier) {
-    super(context, string, node, identifier);
+  constructor(context, string, node, lineIndex, name, identifier) {
+    super(context, string, node, lineIndex);
 
     this.name = name;
     this.identifier = identifier;
@@ -51,8 +51,10 @@ export default define(class Parameter extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -62,7 +64,7 @@ export default define(class Parameter extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             parameterNode = instantiateParameter(string, context),
             node = parameterNode,  ///
             name = nameFromParaneterNode(parameterNode, context),
@@ -70,7 +72,7 @@ export default define(class Parameter extends Element {
 
       context = null;
 
-      const parameter = new Parameter(context, string, node, name, identifier);
+      const parameter = new Parameter(context, string, node, lineIndex, 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, parameters, procedureReference) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, parameters, procedureReference) {
+    super(context, string, node, lineIndex);
 
     this.parameters = parameters;
     this.procedureReference = procedureReference;
@@ -120,8 +120,10 @@ export default define(class ProcedureCall extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -131,7 +133,7 @@ export default define(class ProcedureCall extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             procedureCallNode = instantiateProcedureCall(string, context),
             node = procedureCallNode,  ///
             parameters = parametersFromProcedureCallNode(json, context),
@@ -139,7 +141,7 @@ export default define(class ProcedureCall extends Element {
 
       context = null;
 
-      const procedureCall = new ProcedureCall(context, string, node, parameters, procedureReference);
+      const procedureCall = new ProcedureCall(context, string, node, lineIndex, 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, 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 ProcedureReference extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -44,14 +46,14 @@ export default define(class ProcedureReference extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             procedureReferenceNode = instantiateProcedureReference(string, context),
             node = procedureReferenceNode,  ///
             name = nameFromProcedureReferenceNode(procedureReferenceNode, context);
 
       context = null;
 
-      const procedureReference = new ProcedureReference(context, string, node, name);
+      const procedureReference = new ProcedureReference(context, string, node, lineIndex, 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, derivation) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, derivation) {
+    super(context, string, node, lineIndex);
 
     this.derivation = derivation;
   }
@@ -57,5 +57,16 @@ export default define(class Proof extends Element {
     return verifies;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "Proof";
 });

package/src/element/proofAssertion/premise.js

@@ -8,8 +8,8 @@ import { procedureCallFromPremiseNode } from "../../utilities/element";
 import { join, declare, attempt, reconcile, serialise, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class Premise extends ProofAssertion {
-  constructor(context, string, node, statement, procedureCall) {
-    super(context, string, node, statement);
+  constructor(context, string, node, lineIndex, statement, procedureCall) {
+    super(context, string, node, lineIndex, statement);
 
     this.procedureCall = procedureCall;
   }
@@ -305,13 +305,13 @@ export default define(class Premise extends ProofAssertion {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               premiseNode = instantiatePremise(string, context),
               node = premiseNode,  ///
               statement = statementFromPremiseNode(premiseNode, context),
               procedureCall = procedureCallFromPremiseNode(premiseNode, context);
 
-        premise = new Premise(context, string, node, statement, procedureCall);
+        premise = new Premise(context, string, node, lineIndex, statement, procedureCall);
       }, context);
     }, json, context);
 

package/src/element/proofAssertion/step.js

@@ -14,8 +14,8 @@ const { asyncSome } = asynchronousUtilities,
       { backwardsSome } = arrayUtilities;
 
 export default define(class Step extends ProofAssertion {
-  constructor(context, string, node, statement, reference, satisfiesAssertion) {
-    super(context, string, node, statement);
+  constructor(context, string, node, lineIndex, statement, reference, satisfiesAssertion) {
+    super(context, string, node, lineIndex, statement);
 
     this.reference = reference;
     this.satisfiesAssertion = satisfiesAssertion;

package/src/element/proofAssertion/supposition.js

@@ -8,8 +8,8 @@ import { procedureCallFromSuppositionNode } from "../../utilities/element";
 import { join, declare, attempt, reconcile, serialise, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class Supposition extends ProofAssertion {
-  constructor(context, string, node, statement, procedureCall) {
-    super(context, string, node, statement);
+  constructor(context, string, node, lineIndex, statement, procedureCall) {
+    super(context, string, node, lineIndex, statement);
 
     this.procedureCall = procedureCall;
   }
@@ -327,13 +327,13 @@ export default define(class Supposition extends ProofAssertion {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               suppositionNode = instantiateSupposition(string, context),
               node = suppositionNode,  ///
               statement = statementFromSuppositionNode(suppositionNode, context),
               procedureCall = procedureCallFromSuppositionNode(suppositionNode, context);
 
-        supposition = new Supposition(context, string, node, statement, procedureCall);
+        supposition = new Supposition(context, string, node, lineIndex, statement, procedureCall);
       }, context);
     }, json, context);
 

package/src/element/proofAssertion.js

@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
 import { equateStatements } from "../process/equate";
 
 export default class ProofAssertion 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;
   }

package/src/element/property.js

@@ -9,8 +9,8 @@ import { nameFromPropertyNode } from "../utilities/element";
 import { nominalTypeNameFromJSON, nominalTypeNameToNominalTypeNameJSON } from "../utilities/json";
 
 export default define(class Property extends Element {
-  constructor(context, string, node, name, nominalTypeName) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, name, nominalTypeName) {
+    super(context, string, node, lineIndex);
 
     this.name = name;
     this.nominalTypeName = nominalTypeName;
@@ -47,8 +47,10 @@ export default define(class Property extends Element {
     const nominalTypeNameJSON = nominalTypeNameToNominalTypeNameJSON(this.nominalTypeName),
           nominalTypeName = nominalTypeNameJSON,  ///
           string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
             string,
+            lineIndex,
             nominalTypeName
           };
 
@@ -59,7 +61,7 @@ export default define(class Property extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             propertyNode = instantiateProperty(string, context),
             node = propertyNode,  ///
             name = nameFromPropertyNode(propertyNode, context),
@@ -67,7 +69,7 @@ export default define(class Property extends Element {
 
       context = null;
 
-      const property = new Property(context, string, node, name, nominalTypeName);
+      const property = new Property(context, string, node, lineIndex, name, nominalTypeName);
 
       return property;
     }, context);

package/src/element/propertyRelation.js

@@ -8,8 +8,8 @@ import { instantiatePropertyRelation } from "../process/instantiate";
 import { propertyFromPropertyRelationNode } from "../utilities/element";
 
 export default define(class PropertyRelation extends Element {
-  constructor(context, string, node, term, property) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, term, property) {
+    super(context, string, node, lineIndex);
 
     this.term = term;
     this.property = property;
@@ -116,8 +116,10 @@ export default define(class PropertyRelation extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -125,7 +127,7 @@ export default define(class PropertyRelation extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             propertyRelationNode = instantiatePropertyRelation(string, context),
             node = propertyRelationNode,  ///
             term = termFromPropertyRelationNode(propertyRelationNode, context),
@@ -133,7 +135,7 @@ export default define(class PropertyRelation extends Element {
 
       context = null;
 
-      const propertyRelation = new PropertyRelation(context, string, node, term, property);
+      const propertyRelation = new PropertyRelation(context, string, node, lineIndex, term, property);
 
       return propertyRelation;
     }, context);

package/src/element/reference.js

@@ -10,8 +10,8 @@ import { ablate, attempt, serialise, reconcile, unserialise, instantiate } from
 import { metavariableFromReferenceNode, topLevelMetaAssertionFromReferenceNode } from "../utilities/element";
 
 export default define(class Reference extends Element {
-  constructor(context, string, node, metavariable, topLevelMetaAssertion) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, metavariable, topLevelMetaAssertion) {
+    super(context, string, node, lineIndex);
 
     this.metavariable = metavariable;
     this.topLevelMetaAssertion = topLevelMetaAssertion;
@@ -318,9 +318,11 @@ export default define(class Reference extends Element {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;
@@ -334,13 +336,13 @@ export default define(class Reference extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               referenceNode = instantiateReference(string, context),
               node = referenceNode,  ///
               metavariable = metavariableFromReferenceNode(referenceNode, context),
               topLevelMetaAssertion = topLevelMetaAssertionFromReferenceNode(referenceNode, context);
 
-        reference = new Reference(context, string, node, metavariable, topLevelMetaAssertion);
+        reference = new Reference(context, string, node, lineIndex, metavariable, topLevelMetaAssertion);
       }, context);
     }, json, context);
 

package/src/element/rule.js

@@ -11,8 +11,8 @@ const { reverse } = arrayUtilities,
       { asyncExtract, asyncForwardsEvery, asyncBackwardsEvery } = asynchronousUtilities;
 
 export default define(class Rule extends Element {
-  constructor(context, string, node, proof, labels, premises, conclusion) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, proof, labels, premises, conclusion) {
+    super(context, string, node, lineIndex);
 
     this.proof = proof;
     this.labels = labels;
@@ -55,11 +55,9 @@ export default define(class Rule extends Element {
     return metavariableNodeMatches;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies = false;
 
-    const context = this.getContext();
-
     await this.break(context);
 
     const ruleString = this.getString(); ///
@@ -67,7 +65,7 @@ export default define(class Rule extends Element {
     context.trace(`Verifying the '${ruleString}' rule...`);
 
     await enclose(async (context) => {
-      const labelsVerify = this.verifyLabels();
+      const labelsVerify = this.verifyLabels(context);
 
       if (labelsVerify) {
         const premisesVerify = await this.verifyPremises(context);
@@ -97,11 +95,10 @@ export default define(class Rule extends Element {
     return verifies;
   }
 
-  verifyLabel(label) {
+  verifyLabel(context, label) {
     let labelVerifies;
 
-    const context = this.getContext(),
-          ruleString = this.getString(),  ///
+    const ruleString = this.getString(),  ///
           labelString = label.getString();
 
     context.trace(`Verifying the '${ruleString}' rule's '${labelString}' label...`);
@@ -115,16 +112,15 @@ export default define(class Rule extends Element {
     return labelVerifies;
   }
 
-  verifyLabels() {
+  verifyLabels(context) {
     let labelsVerify;
 
-    const context = this.getContext(),
-          ruleString = this.getString();  ///
+    const ruleString = this.getString();  ///
 
     context.trace(`Verifying the '${ruleString}' rule's labels...`);
 
     labelsVerify = this.labels.every((label) => {
-      const labelVerifies = this.verifyLabel(label);
+      const labelVerifies = this.verifyLabel(context, label);
 
       if (labelVerifies) {
         return true;
@@ -320,12 +316,14 @@ export default define(class Rule extends Element {
     const labelsJSON = labelsToLabelsJSON(this.labels),
           premisesJSON = premisesToPremisesJSON(this.premises),
           conclusionJSON = conclusionToConclusionJSON(this.conclusion),
+          string = this.getString(),
+          lineIndex = this.getLineIndex(),
           labels = labelsJSON,  ///
           premises = premisesJSON,  ///
           conclusion = conclusionJSON,  ///
-          string = this.getString(),
           json = {
             string,
+            lineIndex,
             labels,
             premises,
             conclusion
@@ -337,13 +335,13 @@ export default define(class Rule extends Element {
   static name = "Rule";
 
   static fromJSON(json, context) {
-    const node = null,
+    const { string, lineIndex } = json,
+          node = null,
           proof = null,
-          string = null,
           labels = labelsFromJSON(json, context),
           premises = premisesFromJSON(json, context),
           conclusion = conclusionFromJSON(json, context),
-          rule = new Rule(context, string, node, proof, labels, premises, conclusion);
+          rule = new Rule(context, string, node, lineIndex, proof, labels, premises, conclusion);
 
     return rule;
   }

package/src/element/section.js

@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
 import { define } from "../elements";
 
 export default define(class Section extends Element {
-  constructor(context, string, node, hypotheses, axiom, lemma, theorem, conjecture) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, hypotheses, axiom, lemma, theorem, conjecture) {
+    super(context, string, node, lineIndex);
 
     this.hypotheses = hypotheses;
     this.axiom = axiom;
@@ -42,11 +42,10 @@ export default define(class Section extends Element {
     return sectionNode;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies = false;
 
-    const context = this.getContext(),
-          sectionString = this.getString();  ///
+    const sectionString = this.getString();  ///
 
     context.trace(`Verifying the '${sectionString}' section...`);
 
@@ -82,5 +81,16 @@ export default define(class Section extends Element {
     return hypothesesVerify;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "Section";
 });

package/src/element/signature.js

@@ -13,8 +13,8 @@ import { termsFromSignatureNode } from "../utilities/element";
 const { match, compare, correlate } = arrayUtilities;
 
 export default define(class Signature extends Element {
-  constructor(context, string, node, terms) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, terms) {
+    super(context, string, node, lineIndex);
 
     this.terms = terms;
   }
@@ -218,8 +218,10 @@ export default define(class Signature extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -229,11 +231,11 @@ export default define(class Signature extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             signatureNode = instantiateSignature(string, context),
             node = signatureNode,  ///
             terms = termsFromSignatureNode(signatureNode, context),
-            signature = new Signature(context, string, node, terms);
+            signature = new Signature(context, string, node, lineIndex, terms);
 
       return signature;
     }, context);

package/src/element/statement.js

@@ -372,8 +372,10 @@ export default define(class Statement extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -383,13 +385,13 @@ export default define(class Statement extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             statementNode = instantiateStatement(string, context),
             node = statementNode; ///
 
       context = null;
 
-      const statement = new Statement(context, string, node);
+      const statement = new Statement(context, string, node, lineIndex);
 
       return statement;
     }, context);