occam-verify-cli 1.0.438 → 1.0.444

package/src/element/step.js

@@ -2,11 +2,13 @@
 
 import Element from "../element";
 import elements from "../elements";
-import unifyMixins from "../mixins/step/unify";
 import TemporaryContext from "../context/temporary";
 
 import { define } from "../elements";
+import { instantiateStep } from "../process/instantiate";
+import { unifyStatements } from "../utilities/unification";
 import { equateStatements } from "../process/equate";
+import { stepFromStepNode } from "../utilities/element";
 import { propertyAssertionFromStatement } from "../utilities/statement";
 
 export default define(class Step extends Element {
@@ -55,96 +57,121 @@ export default define(class Step extends Element {
     return step;
   }
 
-  matchTermAndPropertyRelation(term, propertyRelation, context) {
-    let termAndPropertyRelationMatch = false;
+  compareTermAndPropertyRelation(term, propertyRelation, context) {
+    let comparesToTermAndPropertyRelation = false;
 
     const propertyAssertion = propertyAssertionFromStatement(this.statement, context);
 
     if (propertyAssertion !== null) {
-      termAndPropertyRelationMatch = propertyAssertion.matchTermAndPropertyRelation(term, propertyRelation, context);
+      comparesToTermAndPropertyRelation = propertyAssertion.compareTermAndPropertyRelation(term, propertyRelation, context);
     }
 
-    return termAndPropertyRelationMatch;
+    return comparesToTermAndPropertyRelation;
   }
 
-  validate(substitutions, assignments, context) {
-    let validates = false;
+  verify(substitutions, assignments, context) {
+    let verifies = false;
 
     const temporaryContext = TemporaryContext.fromNothing(context);
 
     context = temporaryContext; ///
 
-    const stepString = this.string; ///
+    const node = this.getNode(),
+          stepString = this.getString(); ///
 
-    context.trace(`Validating the '${stepString}' step...`, this.node);
+    context.trace(`Verifying the '${stepString}' step...`, node);
 
-    if (this.statement !== null) {
-      const stated = this.isStated(),
-            statementVerifies = this.statement.validate(assignments, stated, context);
+    if (this.statement === null) {
+      context.debug(`Unable to verify the '${stepString}' step because it is nonsense.`, node);
+    } else {
+      const referenceVerifies = this.verifyReference(context);
 
-      if (statementVerifies) {
-        const qualified = this.isQualified(),
-              satisfied = this.isSatisfied();
+      if (referenceVerifies) {
+        const satisfiesAssertioVeriries = this.verifySatisfiesAssertion(context);
 
-        if (false) {
-          ///
-        } else if (qualified) {
-          const referenceVerifies = this.reference.validate(context);
+        if (satisfiesAssertioVeriries) {
+          const stated = this.isStated(),
+                statementValidates = this.statement.validate(assignments, stated, context);
 
-          if (referenceVerifies) {
-            validates = true;
-          }
-        } else if (satisfied) {
-          const stated = true,
-                assignments = null,
-                satisfiesAssertionVerifies = this.satisfiesAssertion.validate(assignments, stated, context);
+          if (statementValidates) {
+            const statementUnifies = unifyStatements.some((unifyStatement) => {
+              const statementUnifies = unifyStatement(this.statement, this.reference, this.satisfiesAssertion, substitutions, context);
+
+              if (statementUnifies) {
+                return true;
+              }
+            });
+
+            if (statementUnifies) {
+              const { Step } = elements,
+                    step = Step.fromStatement(this.statement, context),
+                    stepOrSubproof = step;  ///
+
+              context.addStepOrSubproof(stepOrSubproof);
+
+              this.setContext(context);
 
-          if (satisfiesAssertionVerifies) {
-            validates = true;
+              verifies = true;
+            }
           }
-        } else {
-          validates = true;
         }
       }
-    } else {
-      context.debug(`Cannot validate the '${stepString}' step because it is nonsense.`, this.node);
     }
 
-    if (validates) {
-      this.context = context;
-
-      context.debug(`...verified the '${stepString}' step.`, this.node);
+    if (verifies) {
+      context.debug(`...verified the '${stepString}' step.`, node);
     }
 
-    return validates;
+    return verifies;
   }
 
-  unify(substitutions, context) {
-    let unifies;
+  verifyReference(context) {
+    let referenceVeriries;
 
-    context = this.context;
+    const node = this.getNode(),
+          stepString = this.getString();  ///
 
-    const stepString = this.string;  ///
+    context.trace(`Verifying the '${stepString}' step's reference... `, node);
 
-    context.trace(`Unifying the '${stepString}' step...`, this.node);
+    if (this.reference !== null) {
+      referenceVeriries = this.reference.verify(context);
+    } else {
+      referenceVeriries = true;
+    }
 
-    unifies = unifyMixins.some((unifyMixin) => {
-      const unifies = unifyMixin(this.statement, this.reference, this.satisfiesAssertion, substitutions, context);
+    if (referenceVeriries) {
+      context.debug(`...verified the '${stepString}' step's reference. `, node);
+    }
 
-      if (unifies) {
-        return true;
-      }
-    });
+    return referenceVeriries;
+  }
+
+  verifySatisfiesAssertion(context) {
+    let satisfiesAssertionVerifies;
+
+    const node = this.getNode(),
+          stepString = this.getString();  ///
 
-    if (unifies) {
-      context.debug(`...unified the '${stepString}' step.`, this.node);
+    context.trace(`Verifying the '${stepString}' step's satisfies assertion... `, node);
+
+    if (this.satisfiesAssertion !== null) {
+      const stated = true,
+            assignments = null;
+
+      satisfiesAssertionVerifies = this.satisfiesAssertion.validate(assignments, stated, context);
+    } else {
+      satisfiesAssertionVerifies = true;
     }
 
-    return unifies;
+    if (satisfiesAssertionVerifies) {
+      context.debug(`...verified the '${stepString}' step's satisfies assertion. `, node);
+    }
+
+    return satisfiesAssertionVerifies;
   }
 
-  equateWithStatement(statement, context) {
-    let statementEquates;
+  compareStatment(statement, context) {
+    let comparesToStatement;
 
     const leftStatement = statement,  ///
           rightStatement = this.statement,  ///
@@ -152,9 +179,9 @@ export default define(class Step extends Element {
           rightStatementNode = rightStatement.getNode(),
           statementsEquate = equateStatements(leftStatementNode, rightStatementNode, context);
 
-    statementEquates = statementsEquate;  ///
+    comparesToStatement = statementsEquate;  ///
 
-    return statementEquates;
+    return comparesToStatement;
   }
 
   unifyWithSatisfiesAssertion(satisfiesAssertion, context) {
@@ -191,4 +218,15 @@ export default define(class Step extends Element {
   }
 
   static name = "Step";
+
+  static fromStatement(statement, context) {
+    const statementString = statement.getString(),
+          stepString = statementString, ///
+          string = `${stepString}
+`,
+          stepNode = instantiateStep(string, context),
+          step = stepFromStepNode(stepNode, context);
+
+    return step;;
+  }
 });

package/src/element/subDerivation.js

@@ -32,19 +32,15 @@ export default define(class SubDerivation extends Element {
 
     verifies = this.stepsOrSubproofs.every((stepOrSubproof) => { ///
       const assignments = [],
-            stepOrSubproofValidates = stepOrSubproof.validate(substitutions, assignments, context);
+            stepOrSubproofVarifies = stepOrSubproof.verify(substitutions, assignments, context);
 
-      if (stepOrSubproofValidates) {
-        const stepOrSubproofUnifies = stepOrSubproof.unify(substitutions, context);
+      if (stepOrSubproofVarifies) {
+        const assignmentsAssigned = assignAssignments(assignments, context);
 
-        if (stepOrSubproofUnifies) {
-          const assignmentsAssigned = assignAssignments(assignments, context);
+        if (assignmentsAssigned) {
+          context.addStepOrSubproof(stepOrSubproof);
 
-          if (assignmentsAssigned) {
-            context.addStepOrSubproof(stepOrSubproof);
-
-            return true;
-          }
+          return true;
         }
       }
     });

package/src/element/subproof.js

@@ -46,16 +46,8 @@ export default define(class Subproof extends Element {
     return sStep;
   }
 
-  unify(substitutions, context) {
-    let unifies;
-
-    unifies = true; ///
-
-    return unifies;
-  }
-
   verify(substitutions, assignments, context) {
-    let subproofVerifies = false;
+    let verifies = false;
 
     const localContext = LocalContext.fromNothing(context);  ///
 
@@ -73,14 +65,14 @@ export default define(class Subproof extends Element {
       const subDerivationVerifies = this.subDerivation.verify(substitutions, context);
 
       if (subDerivationVerifies) {
-        subproofVerifies = true;
+        verifies = true;
       }
     }
 
-    return subproofVerifies;
+    return verifies;
   }
 
-  equateWithStatement(statement, context) {
+  compareStatement(statement, context) {
     const statementUnifies = false;
 
     return statementUnifies;

package/src/element/substitution/frame.js

@@ -33,8 +33,6 @@ export default define(class FrameSubstitution extends Substitution {
 
   isMetavariableEqualToMetavariable(metavariable) { return this.metavariable.isEqualTo(metavariable); }
 
-  matchParameter(parameter) { return this.metavariable.matchParameter(parameter); }
-
   verify(context) {
     let verifies = false;
 

package/src/element/substitution/reference.js

@@ -22,11 +22,7 @@ export default define(class ReferenceSubstitution extends Substitution {
     return this.metavariable;
   }
 
-  isReferenceEqualToReference(reference) {
-    const referenceEqualToReference = this.reference.isEqualTo(reference);
-
-    return referenceEqualToReference;
-  }
+  isReferenceEqualToReference(reference) { return this.reference.isEqualTo(reference); }
 
   static name = "ReferenceSubstitution";
 

package/src/element/substitution/statement.js

@@ -43,18 +43,16 @@ export default define(class StatementSubstitution extends Substitution {
     return replacementNode;
   }
 
-  isSimple() {
-    const simple = (this.substitution === null);
-
-    return simple;
+  setStatement(statement) {
+    this.statement = statement;
   }
 
-  isStatementEqualToStatement(statement, context) {
-    statement = stripBracketsFromStatement(statement, context); ///
-
-    const statementEqualToStatement = this.statement.isEqualTo(statement);
+  setMetavariable(metavariable) {
+    this.metavariable = metavariable;
+  }
 
-    return statementEqualToStatement;
+  setSubstitution(substitution) {
+    this.substitution = substitution;
   }
 
   isMetavariableEqualToMetavariable(metavariable) { return this.metavariable.isEqualTo(metavariable); }
@@ -75,7 +73,19 @@ export default define(class StatementSubstitution extends Substitution {
     return substitutionEqualToSubstitution;
   }
 
-  matchParameter(parameter) { return this.metavariable.matchParameter(parameter); }
+  isStatementEqualToStatement(statement, context) {
+    statement = stripBracketsFromStatement(statement, context); ///
+
+    const statementEqualToStatement = this.statement.isEqualTo(statement);
+
+    return statementEqualToStatement;
+  }
+
+  isSimple() {
+    const simple = (this.substitution === null);
+
+    return simple;
+  }
 
   unifyStatement(statement, context) {
     let substitution = null;
@@ -205,8 +215,17 @@ export default define(class StatementSubstitution extends Substitution {
     statement = stripBracketsFromStatement(statement, context); ///
 
     const string = stringFromStatementAndMetavariable(statement, metavariable),
-          statementSubstitutionNode = instantiateStatementSubstitution(string, context),
-          statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context);
+          statementSubstitutionNode = instantiateStatementSubstitution(string, context);
+
+    context = {
+      nodeAsString: () => string
+    };
+
+    const statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context);
+
+    statementSubstitution.setStatement(statement);
+
+    statementSubstitution.setMetavariable(metavariable);
 
     return statementSubstitution;
   }
@@ -215,8 +234,19 @@ export default define(class StatementSubstitution extends Substitution {
     statement = stripBracketsFromStatement(statement, context); ///
 
     const string = stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context),
-          statementSubstitutionNode = instantiateStatementSubstitution(string, context),
-          statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, substitution, context);
+          statementSubstitutionNode = instantiateStatementSubstitution(string, context);
+
+    context = {
+      nodeAsString: () => string
+    };
+
+    const statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context);
+
+    statementSubstitution.setStatement(statement);
+
+    statementSubstitution.setMetavariable(metavariable);
+
+    statementSubstitution.setSubstitution(substitution);
 
     return statementSubstitution;
   }

package/src/element/substitution/term.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import elements from "../../elements";
 import Substitution from "../substitution";
 
 import { define } from "../../elements";
@@ -31,28 +30,26 @@ export default define(class TermSubstitution extends Substitution {
     return replacementNode;
   }
 
+  isTermEqualToTerm(term, context) {
+    term = stripBracketsFromTerm(term, context); ///
+
+    const termEqualToTerm = this.term.isEqualTo(term);
+
+    return termEqualToTerm;
+  }
+
   isTrivial() {
     let trivial = false;
 
-    const termEqualToVariable = this.term.isEqualToVariable(this.variable);
+    const termComparesToVaraible = this.term.compareVariable(this.variable);
 
-    if (termEqualToVariable) {
+    if (termComparesToVaraible) {
       trivial = true;
     }
 
     return trivial;
   }
 
-  isTermEqualToTerm(term, context) {
-    term = stripBracketsFromTerm(term, context); ///
-
-    const termEqualToTerm = this.term.isEqualTo(term);
-
-    return termEqualToTerm;
-  }
-
-  matchParameter(parameter) { return this.variable.matchParameter(parameter); }
-
   verify(context) {
     let verifies = false;
 

package/src/element/substitution.js

@@ -110,14 +110,12 @@ export default class Substitution extends Element {
     return substitutionEqualToSubstitution;
   }
 
-  matchParameter(parameter) {
-    const parameterMatches = false;
+  compareParameter(parameter) {
+    const comparesToParameter = false;
 
-    return parameterMatches;
+    return comparesToParameter;
   }
 
-  matchSubstitutionNode(substitutionNode) { return this.node.match(substitutionNode); }
-
   resolve(substitutions, context) {
     const resolved = true;
 

package/src/element/substitutions.js

@@ -6,6 +6,7 @@ import Element from "../element";
 
 import { define } from "../elements";
 import { EMPTY_STRING } from "../constants";
+import { substitutionsStringFromSubstitutions } from "../utilities/string";
 
 const { find, first, clear, prune, filter, compress, correlate } = arrayUtilities;
 
@@ -25,8 +26,6 @@ export default define(class Substitutions extends Element {
     return this.savedArray;
   }
 
-  getLength() { return this.array.length; }
-
   getMetavariables() {
     const metavariables = [];
 
@@ -75,6 +74,8 @@ export default define(class Substitutions extends Element {
     return firstSubstitution;
   }
 
+  getLength() { return this.array.length; }
+
   mapSubstitution(callback) { return this.array.map(callback); }
 
   findSubstitution(callback) { return this.array.find(callback) || null; }  ///
@@ -200,9 +201,13 @@ export default define(class Substitutions extends Element {
   addSubstitution(substitution, context) {
     this.array.push(substitution);
 
-    const substitutionString = substitution.getString();
+    const string = this.asString(),
+          substitutionString = substitution.getString(),
+          substitutionsString = string; ///
 
-    context.trace(`Added the '${substitutionString}' substitution.`);
+    this.setString(string);
+
+    context.trace(`Added the '${substitutionString}' substitution to the '${substitutionsString}' substitutions.`);
   }
 
   removeSubstitution(substitution, context) {
@@ -216,9 +221,13 @@ export default define(class Substitutions extends Element {
       }
     });
 
-    const substitutionString = substitution.getString();
+    const string = this.asString(),
+          substitutionString = substitution.getString(),
+          substitutionsString = string; ///
+
+    this.setString(string);
 
-    context.trace(`Removed the '${substitutionString}' substitution.`);
+    context.trace(`Removed the '${substitutionString}' substitution from the '${substitutionsString}' substitutions.`);
   }
 
   correlateSubstitutions(substitutions) {
@@ -236,16 +245,6 @@ export default define(class Substitutions extends Element {
     return correlates;
   }
 
-  removeTrivialSubstitutions()  {
-    filter(this.array, (substitution) => {
-      const trivial = substitution.isTrivial();
-
-      if (!trivial) {
-        return true;
-      }
-    });
-  }
-
   clear() {
     clear(this.array);
 
@@ -318,6 +317,10 @@ export default define(class Substitutions extends Element {
     ];
 
     this.savedArray = null;
+
+    const string = this.asString();
+
+    this.setString(string);
   }
 
   continue() {
@@ -332,15 +335,8 @@ export default define(class Substitutions extends Element {
     if (length === 0) {
       string = EMPTY_STRING;
     } else {
-      const substitutionsString = this.array.reduce((substitutionsString, substitution) => {
-        const substitutionString = substitution.getString();
-
-        substitutionsString = (substitutionsString === null) ?
-                                 substitutionString :
-                                  `${substitutionsString}, ${substitutionString}`;
-
-        return substitutionsString;
-      }, null);
+      const substitutions = this.array, ///
+            substitutionsString = substitutionsStringFromSubstitutions(substitutions);
 
       string = substitutionsString; ///
     }
@@ -349,16 +345,38 @@ export default define(class Substitutions extends Element {
   }
 
   static fromArray(array) {
-    const savedArray = [],
-          substitutions = new Substitutions(array, savedArray);
+    let string;
+
+    const context = null;
+
+    string = null;
+
+    const node = null,
+          savedArray = [],
+          substitutions = new Substitutions(context, string, node, array, savedArray);
+
+    string = substitutions.asString();
+
+    substitutions.setString(string);
 
     return substitutions;
   }
 
   static fromNothing() {
-    const array = [],
-          savedArray = null,
-          substitutions = new Substitutions(array, savedArray);
+    let string;
+
+    const context = null;
+
+    string = null;
+
+    const node = null,
+          array = [],
+          savedArray = [],
+          substitutions = new Substitutions(context, string, node, array, savedArray);
+
+    string = substitutions.asString();
+
+    substitutions.setString(string);
 
     return substitutions;
   }