occam-verify-cli 1.0.438 → 1.0.448

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;
   }

package/src/element/supposition.js

@@ -1,26 +1,19 @@
 "use strict";
 
-import Element from "../element";
-import elements from "../elements";
+import ProofAssertion from "./proofAssertion";
 import TemporaryContext from "../context/temporary";
 import assignAssignments from "../process/assign";
 
 import { define } from "../elements";
-import { subproofAssertionFromStatement } from "../utilities/statement";
 import { termsFromJSON, framesFromJSON, statementFromJSON, procedureCallFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON, procedureCallToProcedureCallJSON } from "../utilities/json";
 
-export default define(class Supposition extends Element {
+export default define(class Supposition extends ProofAssertion {
   constructor(context, string, node, statement, procedureCall) {
     super(context, string, node);
 
-    this.statement = statement;
     this.procedureCall = procedureCall;
   }
 
-  getStatement() {
-    return this.statement;
-  }
-
   getProcedureCall() {
     return this.procedureCall;
   }
@@ -32,84 +25,74 @@ export default define(class Supposition extends Element {
 
     context = temporaryContext; ///
 
-    const suppositionString = this.string; ///
+    const node = this.getNode(),
+          suppositionString = this.getString(); ///
 
-    context.trace(`Verifying the '${suppositionString}' supposition...`, this.node);
+    context.trace(`Verifying the '${suppositionString}' supposition...`, node);
 
-    if (false) {
-      ///
-    } else if (this.statement !== null) {
-      const stated = true,
-            assignments = [],
-            statementVerifies = this.statement.verify(assignments, stated, context);
+    const statement = this.getStatement();
 
-      if (statementVerifies) {
-        const assignmentsAssigned = assignAssignments(assignments, context);
+    if ((statement === null) && (this.procedureCall === null)) {
+      context.debug(`Unable to verify the '${suppositionString}' supposition because it is nonsense.`, node);
+    } else {
+      if (statement !== null) {
+        const stated = true,
+              assignments = [],
+              statementValidates = statement.validate(assignments, stated, context);
 
-        if (assignmentsAssigned) {
-          const { Step } = elements,
-                step = Step.fromStatement(this.statement, context),
-                stepOrSubproof = step;  ///
+        if (statementValidates) {
+          const assignmentsAssigned = assignAssignments(assignments, context);
 
-          context.addStepOrSubproof(stepOrSubproof);
+          if (assignmentsAssigned) {
+            const subproofOrProofAssertion = this;  ///
 
-          verifies = true;
+            context.addSubproofOrProofAssertion(subproofOrProofAssertion);
+
+            verifies = true;
+          }
         }
       }
-    } else if (this.procedureCall !== null) {
-      const stated = true,
-            assignments = null,
-            procedureCallVerifies = this.procedureCall.verify(assignments, stated, context);
 
-      if (procedureCallVerifies) {
-        verifies = true;
+      if (this.procedureCall !== null) {
+        const stated = true,
+              assignments = null,
+              procedureCallVerifies = this.procedureCall.verify(assignments, stated, context);
+
+        if (procedureCallVerifies) {
+          verifies = true;
+        }
       }
-    } else {
-      context.debug(`Unable to verify the '${suppositionString}' supposition because it is nonsense.`, this.node);
     }
 
     if (verifies) {
-      this.context = context;
+      this.setContext(context);
 
-      context.debug(`...verified the '${suppositionString}' supposition.`, this.node);
+      context.debug(`...verified the '${suppositionString}' supposition.`, node);
     }
 
     return verifies;
   }
 
-  unifySupposition(supposition, substitutions, generalContext, specificContext) {
-    let suppositionUnifies;
-
-    const context = specificContext,  ///
-          specificSupposition = supposition,  ///
-          generalSuppositionString = this.string, ///
-          specificSuppositionString = specificSupposition.getString();
-
-    context.trace(`Unifying the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition...`, this.node);
+  unifyIndependently(substitutions, context) {
+    let unifiesIndependently = false;
 
-    const statement = specificSupposition.getStatement(),
-          statementUnifies = this.unifyStatement(statement, substitutions, generalContext, specificContext);
+    const node = this.getNode(),
+          suppositionString = this.getString();
 
-    suppositionUnifies = statementUnifies;  ///
+    context.trace(`Unifying the '${suppositionString}' supposition independently...`, node);
 
-    if (suppositionUnifies) {
-      context.debug(`...unified the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition.`, this.node);
-    }
+    const specificContext = context;  ///
 
-    return suppositionUnifies;
-  }
+    context = this.getContext();
 
-  unifyIndependently(substitutions, context) {
-    let unifiesIndependently = false;
+    const generalContext = context; ///
 
-    const suppositionString = this.string,  ///
-          generalContext = this.context,  ///
-          specificContext = context;  ///
+    context = specificContext;  ///
 
-    context.trace(`Unifying the '${suppositionString}' supposition independently...`, this.node);
+    const statement = this.getStatement();
 
-    if (this.statement !== null) {
-      const statementUnifiesIndependently = this.statement.unifyIndependently(substitutions, generalContext, specificContext);
+    if (statement !== null) {
+      const statementUnifiesIndependently = statement.unifyIndependently(substitutions, generalContext, specificContext);
 
       if (statementUnifiesIndependently) {
         unifiesIndependently = true;
@@ -125,57 +108,79 @@ export default define(class Supposition extends Element {
     }
 
     if (unifiesIndependently) {
-      context.debug(`...unified the '${suppositionString}' supposition independenly.`, this.node);
+      context.debug(`...unified the '${suppositionString}' supposition independenly.`, node);
     }
 
     return unifiesIndependently;
   }
 
-  unifyStepOrSubproof(stepOrSubproof, substitutions, context) {
-    let stepOrSubproofUnifies = false;
+  unifySubproofOrProosAssertion(subproofOrProofAssertion, substitutions, context) {
+    let subproofOrProofAssertionUnifies = false;
 
-    const stepOrSubProofStep = stepOrSubproof.isStep(),
-          subproof = stepOrSubProofStep ?
+    const subproofOrProofAssertionProofAssertion = subproofOrProofAssertion.isProofAssertion(),
+          subproof = subproofOrProofAssertionProofAssertion ?
                         null :
-                          stepOrSubproof,
-          step = stepOrSubProofStep ?
-                   stepOrSubproof :
-                     null;
+                          subproofOrProofAssertion,
+          proofAssertion = subproofOrProofAssertionProofAssertion ?
+                             subproofOrProofAssertion :
+                               null;
 
     substitutions.snapshot();
 
     if (subproof !== null) {
       const subproofUnifies = this.unifySubproof(subproof, substitutions, context);
 
-      stepOrSubproofUnifies = subproofUnifies; ///
+      if (subproofUnifies) {
+        subproofOrProofAssertionUnifies = true;
+      }
     }
 
-    if (step !== null) {
-      const statementUnifies = this.unifyStep(step, substitutions, context);
+    if (proofAssertion !== null) {
+      const proofAssertionUnifies = this.unifyProofAssertion(proofAssertion, substitutions, context);
 
-      stepOrSubproofUnifies = statementUnifies;  ///
+      if (proofAssertionUnifies) {
+        subproofOrProofAssertionUnifies = true;
+      }
     }
 
-    if (stepOrSubproofUnifies) {
+    if (subproofOrProofAssertionUnifies) {
       substitutions.resolve(context);
     }
 
-    stepOrSubproofUnifies ?
+    subproofOrProofAssertionUnifies ?
       substitutions.continue() :
         substitutions.rollback(context);
 
-    return stepOrSubproofUnifies;
+    return subproofOrProofAssertionUnifies;
   }
 
-  unifyStep(step, substitutions, context) {
-    let stepUnifies;
+  unifyProofAssertion(proofAssertion, substitutions, context) {
+    let stepUnifies = false;
 
-    context = step.getContext();
+    const node = this.getNode(),
+          suppositionString = this.getString(),
+          proofAssertionString = proofAssertion.getString();
 
-    const statement = step.getStatement(),
-          statementUnifies = this.unifyStatement(statement, substitutions, context);
+    context.trace(`Unifying the '${proofAssertionString}' proof assertion with the '${suppositionString}' supposition...`, node);
 
-    stepUnifies = statementUnifies;  ///
+    const specificContext = context;  ///
+
+    context = this.getContext();
+
+    const generalContext = context; ///
+
+    context = specificContext;  ///
+
+    const statement = proofAssertion.getStatement(),
+          statementUnifies = this.unifyStatement(statement, substitutions, generalContext, specificContext);
+
+    if (statementUnifies) {
+      stepUnifies = true;
+    }
+
+    if (stepUnifies) {
+      context.debug(`...unified the '${proofAssertionString}' proof assertion with the '${suppositionString}' supposition.`, node);
+    }
 
     return stepUnifies;
   }
@@ -183,53 +188,67 @@ export default define(class Supposition extends Element {
   unifySubproof(subproof, substitutions, context) {
     let subproofUnifies = false;
 
-    const supposition = this, ///
+    const node = this.getNode(),
           subproofString = subproof.getString(),
-          suppositionStatement = supposition.getStatement(),
-          suppositionStatementString = suppositionStatement.getString();
+          suppositionString = this.getString();
+
+    context.trace(`Unifying the '${subproofString}' subproof with the '${suppositionString}' supposition...`, node);
+
+    const specificContext = context;  ///
 
-    context.trace(`Unifying the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement...`);
+    context = this.getContext();
 
-    if (this.statement !== null) {
-      const context = generalContext, ///
-            subproofAssertion = subproofAssertionFromStatement(this.statement, context);
+    const generalContext = context; ///
 
-      if (subproofAssertion !== null) {
-        const generalContext = this.context,  ///
-              specificContext = context;  ///
+    context = specificContext;  ///
+
+    const statement = this.getStatement();
+
+    if (statement !== null) {
+      const statementNode = statement.getNode(),
+            subproofAssertionNode = statementNode.getSubproofAssertionNode();
 
-        subproofUnifies = subproofAssertion.unifySubproof(subproof, substitutions, generalContext, specificContext);
+      if (subproofAssertionNode !== null) {
+        const context = generalContext, ///
+              assertionNode = subproofAssertionNode,  ///
+              assertion = context.findAssertionByAssertionNode(assertionNode)
+
+        if (assertion !== null) {
+          const subproofAssertion = assertion;  ///
+
+          subproofUnifies = subproofAssertion.unifySubproof(subproof, substitutions, generalContext, specificContext);
+        }
       }
     }
 
     if (subproofUnifies) {
-      context.debug(`...unified the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement.`);
+      context.debug(`...unified the '${subproofString}' subproof with the '${suppositionString}' supposition.`, node);
     }
 
     return subproofUnifies;
   }
 
-  unifyStatement(statement, substitutions, context) {
-    let statementUnifies;
+  unifySupposition(supposition, substitutions, generalContext, specificContext) {
+    let suppositionUnifies;
 
-    const supposition = this, ///
-          statementString = statement.getString(),
-          suppositionString = supposition.getString();
+    const node = this.getNode(),
+          context = specificContext,  ///
+          specificSupposition = supposition,  ///
+          generalSuppositionString = this.getString(), ///
+          specificSuppositionString = specificSupposition.getString();
 
-    context.trace(`Unifying the '${statementString}' statement with the '${suppositionString}' supposition...`);
+    context.trace(`Unifying the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition...`, node);
 
-    if (this.statement !== null) {
-      const generalContext = this.context,  ///
-            specificContext = context;  ///
+    const statement = specificSupposition.getStatement(),
+          statementUnifies = this.unifyStatement(statement, substitutions, generalContext, specificContext);
 
-      statementUnifies = this.statement.unifyStatement(statement, substitutions, generalContext, specificContext);
-    }
+    suppositionUnifies = statementUnifies;  ///
 
-    if (statementUnifies) {
-      context.debug(`...unified the '${statementString}' statement with the '${suppositionString}' supposition.`);
+    if (suppositionUnifies) {
+      context.debug(`...unified the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition.`, node);
     }
 
-    return statementUnifies;
+    return suppositionUnifies;
   }
 
   toJSON() {