occam-verify-cli 1.0.825 → 1.0.827

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;
@@ -32,21 +32,19 @@ export default define(class ConstructorDeclaration extends Declaration {
     return constructorDeclarationNode;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies = false;
 
-    const context = this.getContext();
-
     await this.break(context);
 
     const constructorDeclarationString = this.getString();  ///
 
     context.trace(`Verifying the '${constructorDeclarationString}' constructor declaration...`);
 
-    const typeVerified = this.verifyType();
+    const typeVerified = this.verifyType(context);
 
     if (typeVerified) {
-      const constructorValidates = this.validateConstructor();
+      const constructorValidates = this.validateConstructor(context);
 
       if (constructorValidates) {
         this.constructor.setType(this.type);
@@ -64,11 +62,10 @@ export default define(class ConstructorDeclaration extends Declaration {
     return verifies;
   }
 
-  verifyType() {
+  verifyType(context) {
     let typeVerifies = false;
 
-    const context = this.getContext(),
-          typeString = this.type.getString(),
+    const typeString = this.type.getString(),
           constructorDeclarationString = this.getString();  ///
 
     context.trace(`Verifying the '${constructorDeclarationString}' constructor declaration's '${typeString}' type...`);
@@ -100,11 +97,10 @@ export default define(class ConstructorDeclaration extends Declaration {
     return typeVerifies;
   }
 
-  validateConstructor() {
+  validateConstructor(context) {
     let constructorValidates;
 
-    const context = this.getContext(),
-          includeType = false,
+    const includeType = false,
           constructorString = this.constructor.getString(includeType),
           constructorDeclarationString = this.getString();  ///
 

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;
@@ -20,21 +20,19 @@ export default define(class MetavariableDeclaration extends Declaration {
     return this.metavariable;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies;
 
-    const context = this.getContext();
-
     await this.break(context);
 
     const metavariableDeclarationString = this.getString(); ///
 
     context.trace(`Verifying the '${metavariableDeclarationString}' metavariable declaration...`);
 
-    const metavariableVerifies = this.verifyMetavariable();
+    const metavariableVerifies = this.verifyMetavariable(context);
 
     if (metavariableVerifies) {
-      const metaTypeVerifies = this.verifyMetaType();
+      const metaTypeVerifies = this.verifyMetaType(context);
 
       if (metaTypeVerifies) {
         const declaredMetavariable = this.metavariable; ///
@@ -52,11 +50,10 @@ export default define(class MetavariableDeclaration extends Declaration {
     return verifies;
   }
 
-  verifyMetaType() {
+  verifyMetaType(context) {
     let metaTypeVerifies = true;
 
-    const context = this.getContext(),
-          metaTypeString = this.metaType.getString(),
+    const metaTypeString = this.metaType.getString(),
           metaTypeDeclarationString = this.getString(); ///
 
     context.trace(`Verifying the '${metaTypeDeclarationString}' metavariable declaration's '${metaTypeString}' metaType...`);
@@ -70,11 +67,10 @@ export default define(class MetavariableDeclaration extends Declaration {
     return metaTypeVerifies;
   }
 
-  verifyMetavariable() {
+  verifyMetavariable(context) {
     let metavariableVerifies = false;
 
-    const context = this.getContext(),
-          metavariableString = this.metavariable.getString(),
+    const metavariableString = this.metavariable.getString(),
           metavariableDeclarationString = this.getString(); ///
 
     context.trace(`Verifying the '${metavariableDeclarationString}' metavariable declaration's '${metavariableString}' 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;
@@ -34,27 +34,25 @@ export default define(class SimpleTypeDeclaration extends Declaration {
     return simpleTypeDeclarationNode;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies = false;
 
-    const context = this.getContext();
-
     await this.break(context);
 
     const simpleTypeDeclarationString = this.getString();  ///
 
     context.trace(`Verifying the '${simpleTypeDeclarationString}' simple type declaration...`);
 
-    const typeVerifies = this.verifyType();
+    const typeVerifies = this.verifyType(context);
 
     if (typeVerifies) {
-      const superTypesVerify = this.verifySuperTypes();
+      const superTypesVerify = this.verifySuperTypes(context);
 
       if (superTypesVerify) {
-        const typePrefixVerifies = this.verifyTypePrefix();
+        const typePrefixVerifies = this.verifyTypePrefix(context);
 
         if (typePrefixVerifies) {
-          const propertiesVerifies = this.verifyProperties();
+          const propertiesVerifies = this.verifyProperties(context);
 
           if (propertiesVerifies) {
             context.addType(this.type);
@@ -72,11 +70,10 @@ export default define(class SimpleTypeDeclaration extends Declaration {
     return verifies;
   }
 
-  verifyType() {
+  verifyType(context) {
     let typeVerifies = false;
 
-    const context = this.getContext(),
-          typeString = this.type.getString(),
+    const typeString = this.type.getString(),
           simpleTypeDeclarationString = this.getString(); ///
 
     context.trace(`Verifying the '${simpleTypeDeclarationString}' simple type declaration's '${typeString}' type...`);
@@ -107,11 +104,10 @@ export default define(class SimpleTypeDeclaration extends Declaration {
     return typeVerifies;
   }
 
-  verifySuperType(superType, superTypes) {
+  verifySuperType(context, superType, superTypes) {
     let superTypeVerifies = false;
 
-    const context = this.getContext(),
-          superTypeString = superType.getString(),
+    const superTypeString = superType.getString(),
           simpleTypeDeclarationString = this.getString(); ///;
 
     context.trace(`Verifying the '${simpleTypeDeclarationString}' simple type declaration's '${superTypeString}' super-type...`);
@@ -141,11 +137,10 @@ export default define(class SimpleTypeDeclaration extends Declaration {
     return superTypeVerifies;
   }
 
-  verifySuperTypes() {
+  verifySuperTypes(context) {
     let superTypesVerify;
 
-    const context = this.getContext(),
-          superTypes = [],
+    const superTypes = [],
           superTypesString = superTypesStringFromSuperTypes(this.superTypes),
           simpleTypeDeclarationString = this.getString(); ///;
 
@@ -154,7 +149,7 @@ export default define(class SimpleTypeDeclaration extends Declaration {
         context.trace(`Verifying the '${simpleTypeDeclarationString}' simple type declaration's super-types...`);
 
     superTypesVerify = this.superTypes.every((superType) => {
-      const superTypeVerifies = this.verifySuperType(superType, superTypes);
+      const superTypeVerifies = this.verifySuperType(context, superType, superTypes);
 
       if (superTypeVerifies) {
         return true;
@@ -181,12 +176,11 @@ export default define(class SimpleTypeDeclaration extends Declaration {
     return superTypesVerify;
   }
 
-  verifyTypePrefix() {
+  verifyTypePrefix(context) {
     let typePrefixVerifies = false;
 
-    const context = this.getContext(),
-      typeString = this.type.getString(),
-      simpleTypeDeclarationString = this.getString(); ///;
+    const typeString = this.type.getString(),
+          simpleTypeDeclarationString = this.getString(); ///;
 
     context.trace(`Verifying the '${simpleTypeDeclarationString}' simple type declaration's '${typeString}' type's prefix...`);
 
@@ -205,11 +199,10 @@ export default define(class SimpleTypeDeclaration extends Declaration {
     return typePrefixVerifies;
   }
 
-  verifyProperties() {
+  verifyProperties(context) {
     let propertiesVerify = true;  ///
 
-    const context = this.getContext(),
-          typeString = this.type.getString(),
+    const typeString = this.type.getString(),
           simpleTypeDeclarationString = this.getString(); ///;
 
     context.trace(`Verifying the '${simpleTypeDeclarationString}' simple type declaration's '${typeString}' type's properties...`);

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;
   }
@@ -22,11 +22,9 @@ export default define(class TypePrefixDeclaration extends Declaration {
     return typePrefixDeclarationNode;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies = false;
 
-    const context = this.getContext();
-
     await this.break(context);
 
     const typePrefixDeclarationString = this.getString();  ///
@@ -37,7 +35,7 @@ export default define(class TypePrefixDeclaration extends Declaration {
           typesLength = types.length;
 
     if (typesLength === 0) {
-      const typePrefixVerifies = this.verifyTypePrefix();
+      const typePrefixVerifies = this.verifyTypePrefix(context);
 
       if (typePrefixVerifies) {
         context.addTypePrefix(this.typePrefix);
@@ -55,11 +53,10 @@ export default define(class TypePrefixDeclaration extends Declaration {
     return verifies;
   }
 
-  verifyTypePrefix() {
+  verifyTypePrefix(context) {
     let typePrefixVerifies = false;
 
-    const context = this.getContext(),
-          typePrefixString = this.typePrefix.getString();
+    const typePrefixString = this.typePrefix.getString();
 
     context.trace(`Verifying the '${typePrefixString}' type prefix...`);
 

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;
@@ -32,21 +32,19 @@ export default define(class VariableDeclaration extends Declaration {
     return variableDeclarationNode;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies = false;
 
-    const context = this.getContext();
-
     await this.break(context);
 
     const variableDeclarationString = this.getString(); ///
 
     context.trace(`Verifying the '${variableDeclarationString}' variable declaration...`);
 
-    const typeVerifies = this.verifyType();
+    const typeVerifies = this.verifyType(context);
 
     if (typeVerifies) {
-      const variableVerifies = this.verifyVariable();
+      const variableVerifies = this.verifyVariable(context);
 
       if (variableVerifies) {
         const declaredVariable = this.variable;
@@ -64,11 +62,10 @@ export default define(class VariableDeclaration extends Declaration {
     return verifies;
   }
 
-  verifyType() {
+  verifyType(context) {
     let typeVerifies = false;
 
-    const context = this.getContext(),
-          typeString = this.type.getString(),
+    const typeString = this.type.getString(),
           variableDeclarationString = this.getString(); ///
 
     context.trace(`Verifying the '${variableDeclarationString}' variable declaration's '${typeString}' type...`);
@@ -100,11 +97,10 @@ export default define(class VariableDeclaration extends Declaration {
     return typeVerifies;
   }
 
-  verifyVariable() {
+  verifyVariable(context) {
     let  variableVerifies = false;
 
-    const context = this.getContext(),
-          variableString = this.variable.getString(),
+    const variableString = this.variable.getString(),
           variableDeclarationString = this.getString(); ///
 
     context.trace(`Verifying the '${variableDeclarationString}' variable declaration's '${variableString}' 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

@@ -12,16 +12,26 @@ export default define(class Error extends Element {
     return errorNode;
   }
 
-  async verify() {
+  async verify(context) {
     let verifies = false;
 
-    const context = this.getContext(),
-          errorString = this.getString();  ///
+    const errorString = this.getString();  ///
 
     context.warning(`The '${errorString}' error cannot be verified.`);
 
     return verifies;
   }
 
+  toJSON() {
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
+
+    return json;
+  }
+
   static name = "Error";
 });

package/src/element/frame.js

@@ -10,8 +10,8 @@ import { metavariableFromFrameNode } from "../utilities/element";
 import { assumptionsStringFromAssumptions } from "../utilities/string";
 
 export default define(class Frame extends Element {
-  constructor(context, string, node, assumptions, metavariable) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, assumptions, metavariable) {
+    super(context, string, node, lineIndex);
 
     this.assumptions = assumptions;
     this.metavariable = metavariable;
@@ -286,8 +286,10 @@ export default define(class Frame extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -297,7 +299,7 @@ export default define(class Frame extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             frameNode = instantiateFrame(string, context),
             node = frameNode, ///
             assumptions = assumptionsFromFrameNode(frameNode, context),
@@ -305,7 +307,7 @@ export default define(class Frame extends Element {
 
       context = null;
 
-      const frame = new Frame(context, string, node, assumptions, metavariable);
+      const frame = new Frame(context, string, node, lineIndex, assumptions, metavariable);
 
       return frame;
     }, context);

package/src/element/hypothesis.js

@@ -8,8 +8,8 @@ import { instantiateHypothesis } from "../process/instantiate";
 import { statementFromHypothesisNode } from "../utilities/element";
 
 export default define(class Hypothesis 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;
   }
@@ -91,8 +91,10 @@ export default define(class Hypothesis extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -102,14 +104,14 @@ export default define(class Hypothesis extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             hypothesisNode = instantiateHypothesis(string, context),
             node = hypothesisNode,  ///
             statement = statementFromHypothesisNode(hypothesisNode, context);
 
       context = null;
 
-      const hypothesis = new Hypothesis(context, string, node, statement);
+      const hypothesis = new Hypothesis(context, string, node, lineIndex, statement);
 
       return hypothesis;
     }, 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, frame, assumption) {
-    super(context, string, node);
+  constructor(context, string, node, lineIndex, frame, assumption) {
+    super(context, string, node, lineIndex);
 
     this.frame = frame;
     this.assumption = assumption;
@@ -243,8 +243,10 @@ export default define(class Judgement extends Element {
 
   toJSON() {
     const string = this.getString(),
+          lineIndex = this.getLineIndex(),
           json = {
-            string
+            string,
+            lineIndex
           };
 
     return json;
@@ -254,7 +256,7 @@ export default define(class Judgement extends Element {
 
   static fromJSON(json, context) {
     return instantiate((context) => {
-      const { string } = json,
+      const { string, lineIndex } = json,
             judgementNode = instantiateJudgement(string, context),
             node = judgementNode,  ///
             frame = frameFromJudgementNode(judgementNode, context),
@@ -262,7 +264,7 @@ export default define(class Judgement extends Element {
 
       context = null;
 
-      const judgement = new Judgement(context, string, node, frame, assumption);
+      const judgement = new Judgement(context, string, node, lineIndex, frame, assumption);
 
       return judgement;
     }, context);