occam-verify-cli 1.0.843 → 1.0.847

package/src/element/assertion/property.js

@@ -203,14 +203,19 @@ export default define(class PropertyAssertion extends Assertion {
     context.addAssignment(variableAssigment);
   }
 
+  static name = "PropertyAssertion";
+
   toJSON() {
-    const json = super.toJSON();
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
 
     return json;
   }
 
-  static name = "PropertyAssertion";
-
   static fromJSON(json, context) {
     let propertyAssertion = null;
 

package/src/element/assertion/satisfies.js

@@ -157,21 +157,27 @@ export default define(class SatisfiesAssertion extends Assertion {
     return stepAndSubproofOrProofAssertionsUnify;
   }
 
+  static name = "SatisfiesAssertion";
+
   toJSON() {
-    const json = super.toJSON();
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
 
     return json;
   }
 
-  static name = "SatisfiesAssertion";
-
   static fromJSON(json, context) {
     let satisfiesAssertion = null;
 
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {const { string, lineIndex } = json,
+      instantiate((context) => {
+        const { string, lineIndex } = json,
               definedAssertionNode = instantiateSatisfiesAssertion(string, context),
               node = definedAssertionNode,  ///
               signature = signatureFromJSatisfiesAssertionNode(definedAssertionNode, context),

package/src/element/assertion/subproof.js

@@ -289,14 +289,19 @@ export default define(class SubproofAssertion extends Assertion {
     return topLevelMetaAssertionUnifies;
   }
 
+  static name = "SubproofAssertion";
+
   toJSON() {
-    const json = super.toJSON();
+    const string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          json = {
+            string,
+            lineIndex
+          };
 
     return json;
   }
 
-  static name = "SubproofAssertion";
-
   static fromJSON(json, context) {
     let subproorAssertion = null;
 

package/src/element/assertion/type.js

@@ -193,15 +193,17 @@ export default define(class TypeAssertion extends Assertion {
   }
 
   toJSON() {
-    const json = super.toJSON();
-
     const typeJSON = typeToTypeJSON(this.type),
-          type = typeJSON;  ///
-
-    return {
-      ...json,
-      type
-    };
+          string = this.getString(),
+          lineIndex = this.getLineIndex(),
+          type = typeJSON,
+          json = {
+            string,
+            lineIndex,
+            type
+          };
+
+    return json;
   }
 
   static name = "TypeAssertion";

package/src/element/assumption/metaLevel.js

@@ -122,21 +122,24 @@ export default define(class MetaLevelAssumption extends Element {
     const referenceString = this.reference.getString(),
           metaLevelAssumptionString = this.getString();  ///
 
-    context.trace(`Validating the '${metaLevelAssumptionString}' metaLevelAssumption's '${referenceString}' reference...`);
+    context.trace(`Validating the '${metaLevelAssumptionString}' meta-level assumption's '${referenceString}' reference...`);
 
     const reference = this.reference.validate(context);
 
     if (reference !== null) {
-      const metavariable = this.reference.getMetavariable(),
+      const context = reference.getContext(),
+            metavariable = this.reference.getMetavariable(),
             metavariablePresent = context.isMetavariablePresent(metavariable, context);
 
       if (metavariablePresent) {
+        this.reference = reference;
+
         referenceValidates = true;
       }
     }
 
     if (referenceValidates) {
-      context.debug(`...validated the '${metaLevelAssumptionString}' metaLevelAssumption's '${referenceString}' reference.`);
+      context.debug(`...validated the '${metaLevelAssumptionString}' meta-level assumption's '${referenceString}' reference.`);
     }
 
     return referenceValidates;
@@ -148,7 +151,7 @@ export default define(class MetaLevelAssumption extends Element {
     const metaLevelAssumptionString = this.getString(),  ///
           statementString = this.statement.getString();
 
-    context.trace(`Validating the '${metaLevelAssumptionString}' metaLevelAssumption's '${statementString}' statement...`);
+    context.trace(`Validating the '${metaLevelAssumptionString}' meta-level assumption's '${statementString}' statement...`);
 
     descend((context) => {
       const statement = this.statement.validate(context);
@@ -159,7 +162,7 @@ export default define(class MetaLevelAssumption extends Element {
     }, context);
 
     if (statementValidates) {
-      context.debug(`...validated the '${metaLevelAssumptionString}' metaLevelAssumption's '${statementString}' statement.`);
+      context.debug(`...validated the '${metaLevelAssumptionString}' meta-level assumption's '${statementString}' statement.`);
     }
 
     return statementValidates;
@@ -202,9 +205,11 @@ export default define(class MetaLevelAssumption extends Element {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;
@@ -218,13 +223,13 @@ export default define(class MetaLevelAssumption extends Element {
 
     unserialise((json, context) => {
       instantiate((context) => {
-        const { string } = json,
+        const { string, lineIndex } = json,
               metaLevelAssumptionNode = instantiateMetaLevelAssumption(string, context),
               node = metaLevelAssumptionNode,  ///
               reference = referenceFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context),
               statement = statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context);
 
-        metaLevelAssumption = new MetaLevelAssumption(context, string, node, reference, statement);
+        metaLevelAssumption = new MetaLevelAssumption(context, string, node, lineIndex, reference, statement);
       }, context);
     }, json, context);
 

package/src/element/assumption.js

@@ -267,6 +267,8 @@ export default define(class Assumption extends Element {
     return topLevelMetaAssertionUnifies;
   }
 
+  static name = "Assumption";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -278,8 +280,6 @@ export default define(class Assumption extends Element {
     return json;
   }
 
-  static name = "Assumption";
-
   static fromJSON(json, context) {
     const assumption = instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/derivation.js

@@ -52,17 +52,6 @@ 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

@@ -3,8 +3,8 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
-import { instantiate } from "../utilities/context";
 import { equateTerms } from "../process/equate";
+import { instantiate } from "../utilities/context";
 import { instantiateEquality } from "../process/instantiate";
 import { equalityFromStatementNode } from "../utilities/element";
 import { equalityAssignmentFromEquality, leftVariableAssignmentFromEquality, rightVariableAssignmentFromEquality } from "../process/assign";
@@ -259,8 +259,6 @@ export default define(class Equality extends Element {
     context.addAssignment(rightVariableAssignment);
   }
 
-  static name = "Equality";
-
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -272,6 +270,8 @@ export default define(class Equality extends Element {
     return json;
   }
 
+  static name = "Equality";
+
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/equivalence.js

@@ -231,17 +231,6 @@ 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

@@ -22,16 +22,5 @@ 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";
 });

package/src/element/hypothesis.js

@@ -89,6 +89,8 @@ export default define(class Hypothesis extends Element {
     return verifies;
   }
 
+  static name = "Hypothesis";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -100,8 +102,6 @@ export default define(class Hypothesis extends Element {
     return json;
   }
 
-  static name = "Hypothesis";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/judgement.js

@@ -38,6 +38,14 @@ export default define(class Judgement extends Element {
     return singular;
   }
 
+  isEqualTo(judgement) {
+    const judgementNode = judgement.getNode(),
+          judgementNodeMatches = this.matchJudgementNode(judgementNode),
+          equalTo = judgementNodeMatches;  ///
+
+    return equalTo;
+  }
+
   getAssumptions() { return this.frame.getAssumptions(); }
 
   getMetavariable() { return this.frame.getMetavariable(); }
@@ -193,13 +201,13 @@ export default define(class Judgement extends Element {
     const metavariableNode = this.getMetavariableNode(),
           topLevelMetaAssertion = this.getTopLevelMetaAssertion(),
           metaLevelAssumptions = topLevelMetaAssertion.getMetaLevelAssumptions(),
-          judgements = context.findJudgementsByMetavariableNode(metavariableNode);
+          declaredJudgements = context.findDeclaredJudgementsByMetavariableNode(metavariableNode);
 
     let assumptions;
 
     assumptions = this.getAssumptions();
 
-    assumptions = assumptionsFromJudgements(judgements, assumptions);
+    assumptions = assumptionsFromDeclaredJudgements(declaredJudgements, assumptions);
 
     reconcile((context) => {
       const metaLevelAssumptionsUnify = metaLevelAssumptions.every((metaLevelAssumption) => {
@@ -241,6 +249,8 @@ export default define(class Judgement extends Element {
     context.addAssignment(judgementAssignment);
   }
 
+  static name = "Judgement";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -252,8 +262,6 @@ export default define(class Judgement extends Element {
     return json;
   }
 
-  static name = "Judgement";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,
@@ -285,19 +293,19 @@ function frameFromJudgementNode(judgementNode, context) {
   return frame;
 }
 
-function assumptionsFromJudgements(judgements, assumptions = []) {
-  judgements.map((judgement) => {
-    const assumption = judgement.getAssumption();
-
-    assumptions.push(assumption);
-  });
-
-  return assumptions;
-}
-
 function assumptionFromJudgementNode(judgementNode, context) {
   const assumptionNode = judgementNode.getAssumptionNode(),
         assumption = context.findAssumptionByAssumptionNode(assumptionNode);
 
   return assumption;
 }
+
+function assumptionsFromDeclaredJudgements(declaredJudgements, assumptions = []) {
+  declaredJudgements.map((declaredJudgement) => {
+    const assumption = declaredJudgement.getAssumption();
+
+    assumptions.push(assumption);
+  });
+
+  return assumptions;
+}

package/src/element/metaType.js

@@ -34,6 +34,8 @@ export default define(class MetaType extends Element {
     return comparesToMetaTypeName;
   }
 
+  static name = "MetaType";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -45,8 +47,6 @@ export default define(class MetaType extends Element {
     return json;
   }
 
-  static name = "MetaType";
-
   static fromJSON(json, context) {
     const { string } = json,
           metaTypeName = string,  ///

package/src/element/metavariable.js

@@ -160,8 +160,6 @@ export default define(class Metavariable extends Element {
         this.type = type;
 
         typeVerifies = true;
-
-        context.error(`Type '${typeName}' is not present.`);
       }
 
       if (typeVerifies) {
@@ -264,7 +262,7 @@ export default define(class Metavariable extends Element {
       let term = null;
 
       if (declaredMetavaraible !== null) {
-        const type = metavariable.getType();
+        const type = declaredMetavaraible.getType();
 
         if (type !== null) {
           term = this.term.validateGivenType(type, context);
@@ -475,15 +473,9 @@ export default define(class Metavariable extends Element {
   unifyMetavariable(metavariable, context) {
     let metavariableUnifies;
 
-    const specificContext = context; ///
-
-    context = this.getContext();
-
-    const generalContext = context;  ///
-
-    context = specificContext;  ///
-
-    const generalMetavariable = this, ///
+    const generalContext = context, ///
+          specificContext = context,  ///
+          generalMetavariable = this, ///
           specificMetavariable = metavariable,  ///
           generalMetavariableString = generalMetavariable.getString(),
           specificMetavariableString = specificMetavariable.getString();
@@ -637,7 +629,7 @@ export default define(class Metavariable extends Element {
   toJSON() {
     const metaTypeJSON = metaTypeToMetaTypeJSON(this.metaType),
           metaType = metaTypeJSON,  ///
-          string = this.getString(), ///
+          string = this.getString(),
           lineIndex = this.getLineIndex(),
           json = {
             string,

package/src/element/parameter.js

@@ -49,6 +49,8 @@ export default define(class Parameter extends Element {
     return primitive;
   }
 
+  static name = "Parameter";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -60,8 +62,6 @@ export default define(class Parameter extends Element {
     return json;
   }
 
-  static name = "Parameter";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/procedureCall.js

@@ -118,6 +118,8 @@ export default define(class ProcedureCall extends Element {
     return unifiesIndependently;
   }
 
+  static name = "ProcedureCall";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -129,8 +131,6 @@ export default define(class ProcedureCall extends Element {
     return json;
   }
 
-  static name = "ProcedureCall";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/procedureReference.js

@@ -31,6 +31,8 @@ export default define(class ProcedureReference extends Element {
     return procedureName;
   }
 
+  static name = "ProcedureReference";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -42,8 +44,6 @@ export default define(class ProcedureReference extends Element {
     return json;
   }
 
-  static name = "ProcedureReference";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/proof.js

@@ -57,16 +57,5 @@ 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

@@ -289,9 +289,11 @@ export default define(class Premise extends ProofAssertion {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;

package/src/element/proofAssertion/supposition.js

@@ -311,9 +311,11 @@ export default define(class Supposition extends ProofAssertion {
 
     return serialise((context) => {
       const string = this.getString(),
+            lineIndex = this.getLineIndex(),
             json = {
               context,
-              string
+              string,
+              lineIndex
             };
 
       return json;

package/src/element/section.js

@@ -81,16 +81,5 @@ 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

@@ -216,6 +216,8 @@ export default define(class Signature extends Element {
     return substitutionsCorrelates;
   }
 
+  static name = "Signature";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -227,8 +229,6 @@ export default define(class Signature extends Element {
     return json;
   }
 
-  static name = "Signature";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/statement.js

@@ -370,6 +370,8 @@ export default define(class Statement extends Element {
     return topLevelAssertionUnifies;
   }
 
+  static name = "Statement";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -381,8 +383,6 @@ export default define(class Statement extends Element {
     return json;
   }
 
-  static name = "Statement";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/element/subDerivation.js

@@ -52,16 +52,5 @@ 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

@@ -147,16 +147,5 @@ 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";
 });