occam-verify-cli 1.0.809 → 1.0.814

package/src/element/proofAssertion/supposition.js

@@ -158,6 +158,47 @@ export default define(class Supposition extends ProofAssertion {
     return suppositionUnifies;
   }
 
+  async unifyIndependently(context) {
+    let unifiesIndependently = false;
+
+    const suppositionString = this.getString(); ///
+
+    context.trace(`Unifying the '${suppositionString}' supposition independently...`);
+
+    const statement = this.getStatement(),
+          procedureCall = this.getProcedureCall();
+
+    if (statement !== null) {
+      const specificContext = context;  ///
+
+      context = this.getContext();
+
+      const generalContext = context; ///
+
+      context = specificContext;  ///
+
+      const statementUnifiesIndependently = statement.unifyIndependently(generalContext, specificContext);
+
+      if (statementUnifiesIndependently) {
+        unifiesIndependently = true;
+      }
+    }
+
+    if (procedureCall !== null) {
+      const procedureCallResolvedIndependently = await procedureCall.unifyIndependently(context);
+
+      if (procedureCallResolvedIndependently) {
+        unifiesIndependently = true;
+      }
+    }
+
+    if (unifiesIndependently) {
+      context.debug(`...unified the '${suppositionString}' supposition independenly.`);
+    }
+
+    return unifiesIndependently;
+  }
+
   unifySubproofOrProofAssertion(subproofOrProofAssertion, context) {
     let subproofOrProofAssertionUnifies;
 
@@ -265,47 +306,6 @@ export default define(class Supposition extends ProofAssertion {
     return subproofUnifies;
   }
 
-  async unifyIndependently(context) {
-    let unifiesIndependently = false;
-
-    const suppositionString = this.getString(); ///
-
-    context.trace(`Unifying the '${suppositionString}' supposition independently...`);
-
-    const statement = this.getStatement(),
-          procedureCall = this.getProcedureCall();
-
-    if (statement !== null) {
-      const specificContext = context;  ///
-
-      context = this.getContext();
-
-      const generalContext = context; ///
-
-      context = specificContext;  ///
-
-      const statementUnifiesIndependently = statement.unifyIndependently(generalContext, specificContext);
-
-      if (statementUnifiesIndependently) {
-        unifiesIndependently = true;
-      }
-    }
-
-    if (procedureCall !== null) {
-      const procedureCallResolvedIndependently = await procedureCall.unifyIndependently(context);
-
-      if (procedureCallResolvedIndependently) {
-        unifiesIndependently = true;
-      }
-    }
-
-    if (unifiesIndependently) {
-      context.debug(`...unified the '${suppositionString}' supposition independenly.`);
-    }
-
-    return unifiesIndependently;
-  }
-
   toJSON() {
     const context = this.getContext();
 

package/src/element/proofAssertion.js

@@ -28,27 +28,28 @@ export default class ProofAssertion extends Element {
     return proofAssertion;
   }
 
-  compareStatement(statement, context) {
-    let comparesToStatement = false;
+  compareStep(step, context) {
+    let comparesToStep = false;
 
-    const statementString = statement.getString(),
+    const stepString = step.getString(),
           proofAssertionString = this.getString();  ///
 
-    context.trace(`Comparing the '${statementString}' statement to the '${proofAssertionString}' proof assertion...`);
+    context.trace(`Comparing the '${stepString}' step to the '${proofAssertionString}' proof assertion...`);
 
-    const leftStatement = statement,  ///
+    const statement = step.getStatement(),
+          leftStatement = statement,  ///
           rightStatement = this.statement,  ///
           statementsEquate = equateStatements(leftStatement, rightStatement, context);
 
     if (statementsEquate) {
-      comparesToStatement = true;
+      comparesToStep = true;
     }
 
-    if (comparesToStatement) {
-      context.debug(`...compared the '${statementString}' statement to the '${proofAssertionString}' proof assertion.`);
+    if (comparesToStep) {
+      context.debug(`...compared the '${stepString}' step to the '${proofAssertionString}' proof assertion.`);
     }
 
-    return comparesToStatement;
+    return comparesToStep;
   }
 
   unifyStatement(statement, generalContext, specificContext) {

package/src/element/reference.js

@@ -32,12 +32,6 @@ export default define(class Reference extends Element {
     return referenceNode;
   }
 
-  getMetavariableName() {
-    const metavariableName = this.metavariable.getName();
-
-    return metavariableName;
-  }
-
   getMetavariableNode() {
     const metavariableNode = this.metavariable.getNode();
 
@@ -65,13 +59,17 @@ export default define(class Reference extends Element {
   compareParameter(parameter) {
     let comparesToParamter = false;
 
-    const parameterName = parameter.getName();
+    const singular = this.isSingular();
 
-    if (parameterName !== null) {
-      const metavariableName = this.getMetavariableName();
+    if (singular) {
+      const parameterName = parameter.getName();
 
-      if (parameterName === metavariableName) {
-        comparesToParamter = true;
+      if (parameterName !== null) {
+        const metavariableName = this.getMetavariableName();
+
+        if (parameterName === metavariableName) {
+          comparesToParamter = true;
+        }
       }
     }
 
@@ -98,8 +96,6 @@ export default define(class Reference extends Element {
     return comparesToMetavariable;
   }
 
-  compareMetavariableName(metavariableName) { return this.metavariable.compareMetavariableName(metavariableName); }
-
   compareTopLevelMetaAssertion(topLevelMetaAssertion) {
     let topLevelMetaAssertionCompares = false;
 

package/src/element/rule.js

@@ -7,8 +7,8 @@ import { define } from "../elements";
 import { enclose } from "../utilities/context";
 import { labelsFromJSON, premisesFromJSON, conclusionFromJSON, labelsToLabelsJSON, premisesToPremisesJSON, conclusionToConclusionJSON } from "../utilities/json";
 
-const { reverse, extract } = arrayUtilities,
-      { asyncForwardsEvery, asyncBackwardsEvery } = asynchronousUtilities;
+const { reverse } = arrayUtilities,
+      { asyncExtract, asyncForwardsEvery, asyncBackwardsEvery } = asynchronousUtilities;
 
 export default define(class Rule extends Element {
   constructor(context, string, node, proof, labels, premises, conclusion) {
@@ -43,38 +43,16 @@ export default define(class Rule extends Element {
     return ruleNode;
   }
 
-  compareMetavariableName(metavariableName) {
-    const comparesToMetavariableName = this.labels.some((label) => {
-      const labelComparesToMetavariableName = label.compareMetavariableName(metavariableName);
+  matchMetavariableNode(metavariableNode) {
+    const metavariableNodeMatches = this.labels.some((label) => {
+      const metavariableNodeMatches = label.matchMetavariableNode(metavariableNode);
 
-      if (labelComparesToMetavariableName) {
+      if (metavariableNodeMatches) {
         return true;
       }
     });
 
-    return comparesToMetavariableName;
-  }
-
-  unifyStatementWithConclusion(statement, context) {
-    let statementUnifiesWithConclusion = false;
-
-    const ruleString = this.getString(),
-          statementString = statement.getString(),
-          conclusionString = this.conclusion.getString();
-
-    context.trace(`Unifying the '${statementString}' statement with the '${ruleString}' rule's '${conclusionString}' conclusion...`);
-
-    const statementUnifies = this.conclusion.unifyStatement(statement, context);
-
-    if (statementUnifies) {
-      statementUnifiesWithConclusion = true;
-    }
-
-    if (statementUnifiesWithConclusion) {
-      context.debug(`...unified the '${statementString}' statement with the '${ruleString}' rule's '${conclusionString}' conclusion.`);
-    }
-
-    return statementUnifiesWithConclusion;
+    return metavariableNodeMatches;
   }
 
   async verify() {
@@ -246,59 +224,61 @@ export default define(class Rule extends Element {
     return conclusionVerifies;
   }
 
-  async unifyStatementAndSubproofOrProofAssertions(statement, subproofOrProofAssertions, context) {
-    let statementAndSubproofOrProofAssertionsUnify = false;
+  async unifyStepWithConclusion(step, context) {
+    let stepUnifiesWithConclusion = false;
 
-    const statementUnifiesWithConclusion = this.unifyStatementWithConclusion(statement, context);
+    await this.break(context);
 
-    if (statementUnifiesWithConclusion) {
-      const subproofOrProofAssertionsUnifiesWithPremises = await this.unifySubproofOrProofAssertionsWithPremises(subproofOrProofAssertions, context);
+    const ruleString = this.getString(),
+          stepString = step.getString(),
+          conclusionString = this.conclusion.getString();
 
-      if (subproofOrProofAssertionsUnifiesWithPremises) {
-        const substitutionsResolved = context.areSubstitutionsResolved();
+    context.trace(`Unifying the '${stepString}' step with the '${ruleString}' rule's '${conclusionString}' conclusion...`);
 
-        if (substitutionsResolved) {
-          statementAndSubproofOrProofAssertionsUnify = true;
-        }
-      }
+    const stepUnifies = this.conclusion.unifyStep(step, context);
+
+    if (stepUnifies) {
+      stepUnifiesWithConclusion = true;
     }
 
-    return statementAndSubproofOrProofAssertionsUnify;
+    if (stepUnifiesWithConclusion) {
+      context.debug(`...unified the '${stepString}' step with the '${ruleString}' rule's '${conclusionString}' conclusion.`);
+    }
+
+    return stepUnifiesWithConclusion;
   }
 
-  async unifySubproofOrProofAssertionsWithPremises(subproofOrProofAssertions, context) {
-    let subproofOrProofAssertionsUnifiesWithPremises;
+  async unifyStepAndSubproofOrProofAssertions(step, subproofOrProofAssertions, context) {
+    let stepAndSubproofOrProofAssertionsUnify = false;
 
-    subproofOrProofAssertions = reverse(subproofOrProofAssertions); ///
+    const statementUnifiesWithConclusion = await this.unifyStepWithConclusion(step, context);
 
-    subproofOrProofAssertionsUnifiesWithPremises = asyncBackwardsEvery(this.premises, async (premise) => {
-      const stepUnifiesWithPremise = await this.unifySubproofOrProofAssertionsWithPremise(subproofOrProofAssertions, premise, context);
+    if (statementUnifiesWithConclusion) {
+      const subproofOrProofAssertionsUnifiesWithPremises = await this.unifySubproofOrProofAssertionsWithPremises(subproofOrProofAssertions, context);
 
-      if (stepUnifiesWithPremise) {
-        return true;
+      if (subproofOrProofAssertionsUnifiesWithPremises) {
+        const substitutionsResolved = context.areSubstitutionsResolved();
+
+        if (substitutionsResolved) {
+          stepAndSubproofOrProofAssertionsUnify = true;
+        }
       }
-    });
+    }
 
-    return subproofOrProofAssertionsUnifiesWithPremises;
+    return stepAndSubproofOrProofAssertionsUnify;
   }
 
   async unifySubproofOrProofAssertionsWithPremise(subproofOrProofAssertions, premise, context) {
     let subproofOrProofAssertionsUnifiesWithPremise = false;
 
+    await this.break(context);
+
     if (!subproofOrProofAssertionsUnifiesWithPremise) {
-      const subproofOrProofAssertion = extract(subproofOrProofAssertions, (subproofOrProofAssertion) => {
-        const subproofOrProofAssertionUnifies = premise.unifySubproofOrProofAssertion(subproofOrProofAssertion, context);
+      const subproofOrProofAssertion = await asyncExtract(subproofOrProofAssertions, async (subproofOrProofAssertion) => {
+        const subproofOrProofAssertionUnifies = await premise.unifySubproofOrProofAssertion(subproofOrProofAssertion, context);
 
         if (subproofOrProofAssertionUnifies) {
-          const specificContext = context;  ///
-
-          context = this.getContext();
-
-          const generalContext = context; ///
-
-          context = specificContext;  ///
-
-          context.resolveSubstitutions(generalContext, specificContext);
+          context.resolveSubstitutions();
 
           return true;
         }
@@ -320,6 +300,22 @@ export default define(class Rule extends Element {
     return subproofOrProofAssertionsUnifiesWithPremise;
   }
 
+  async unifySubproofOrProofAssertionsWithPremises(subproofOrProofAssertions, context) {
+    let subproofOrProofAssertionsUnifiesWithPremises;
+
+    subproofOrProofAssertions = reverse(subproofOrProofAssertions); ///
+
+    subproofOrProofAssertionsUnifiesWithPremises = await asyncBackwardsEvery(this.premises, async (premise) => {
+      const stepUnifiesWithPremise = await this.unifySubproofOrProofAssertionsWithPremise(subproofOrProofAssertions, premise, context);
+
+      if (stepUnifiesWithPremise) {
+        return true;
+      }
+    });
+
+    return subproofOrProofAssertionsUnifiesWithPremises;
+  }
+
   toJSON() {
     const labelsJSON = labelsToLabelsJSON(this.labels),
           premisesJSON = premisesToPremisesJSON(this.premises),

package/src/element/signature.js

@@ -122,7 +122,7 @@ export default define(class Signature extends Element {
     return termsValidate
   }
 
-  compare(signature, substitutions, generalContext, specificContext) {
+  compareSignature(signature, substitutions, generalContext, specificContext) {
     const terms = signature.getTerms(),
           termsA = this.terms,  ///
           termsB = terms, ///
@@ -153,9 +153,9 @@ export default define(class Signature extends Element {
               }
             }
           }),
-          compares = matches; ///
+          comparesToSignature = matches; ///
 
-    return compares;
+    return comparesToSignature;
   }
 
   compareSubstitutions(substitutions, context) {

package/src/element/statement.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import { Element } from "occam-languages";
-import { arrayUtilities } from "necessary";
 
 import { define } from "../elements";
 import { unifyStatement } from "../process/unify";
@@ -9,8 +8,6 @@ import { validateStatements } from "../utilities/validation";
 import { instantiateStatement } from "../process/instantiate";
 import { join, reconcile, instantiate } from "../utilities/context";
 
-const { backwardsSome } = arrayUtilities;
-
 export default define(class Statement extends Element {
   getStatementNode() {
     const node = this.getNode(),
@@ -19,13 +16,6 @@ export default define(class Statement extends Element {
     return statementNode;
   }
 
-  getMetavariableName() {
-    const sttaementNode = this.getStatementNode(),
-          metavariableName = sttaementNode.getMetavariableName();
-
-    return metavariableName;
-  }
-
   getTermSubstitutionNode() {
     const statementNode = this.getNode(),
           termSubstitutionNode = statementNode.getTermSubstitutionNode();
@@ -40,11 +30,33 @@ export default define(class Statement extends Element {
     return frameSubstitutionNode;
   }
 
-  isSingular() {
-    const statementNode = this.getStatementNode(),
-          singular = statementNode.isSingular();
+  getMetavariableNode() {
+    let metavariableNode = null;
 
-    return singular;
+    const singular = this.isSingular();
+
+    if (singular) {
+      const statementNode = this.getStatementNode();
+
+      metavariableNode = statementNode.getMetavariableNode();
+    }
+
+    return metavariableNode;
+  }
+
+  getMetavariableName() {
+    let metavariableName = null;
+
+    const singular = this.isSingular();
+
+    if (singular) {
+      const statementNode = this.getStatementNode(),
+            metavariableNode = statementNode.getMetavariableNode();
+
+      metavariableName = metavariableNode.getMetavariableName();
+    }
+
+    return metavariableName;
   }
 
   isEqualTo(statement) {
@@ -55,6 +67,13 @@ export default define(class Statement extends Element {
     return equalTo;
   }
 
+  isSingular() {
+    const statementNode = this.getStatementNode(),
+          singular = statementNode.isSingular();
+
+    return singular;
+  }
+
   matchStatementNode(statementNode) {
     const node = statementNode, ///
           nodeMatches = this.matchNode(node),
@@ -63,79 +82,46 @@ export default define(class Statement extends Element {
     return statementNodeMatches;
   }
 
-  compareParameter(parameter) {
-    let comparesToParamter = false;
+  matchMetavariableNode(metavariableNode) {
+    let metavariableNodeMatches = false;
 
     const singular = this.isSingular();
 
     if (singular) {
-      const parameterName = parameter.getName();
+      const metavariableNodeA = metavariableNode, ///
+            statementNode = this.getStatementNode();
 
-      if (parameterName !== null) {
-        const metavariableName = this.getMetavariableName();
-
-        if (parameterName === metavariableName) {
-          comparesToParamter = true;
-        }
-      }
-    }
-
-    return comparesToParamter;
-  }
+      metavariableNode = statementNode.getMetavariableNode();
 
-  compareMetavariable(metavariable) {
-    let comparesToMetavariableName;
+      const metavariableNodeB = metavariableNode, ///
+            metavariableNodeAMatchesMetavariableNodeB = metavariableNodeA.match(metavariableNodeB);
 
-    const singular = this.isSingular();
-
-    if (singular) {
-      let metavariableName;
-
-      metavariableName = metavariable.getName();
-
-      const metavariableNameA = metavariableName; ///
-
-      metavariableName = this.getMetavariableName();
-
-      const metavariableNameB = metavariableName; ///
-
-      comparesToMetavariableName = (metavariableNameA === metavariableNameB);
+      if (metavariableNodeAMatchesMetavariableNodeB) {
+        metavariableNodeMatches = true;
+      }
     }
 
-    return comparesToMetavariableName;
+    return metavariableNodeMatches;
   }
 
-  compareMetavariableName(metavariableName) {
-    let comparesToMetavariableName = false;
+  compareParameter(parameter) {
+    let comparesToParamter = false;
 
     const singular = this.isSingular();
 
     if (singular) {
-      const metavariableNameA = metavariableName ///
-
-      metavariableName = this.getMetavariableName();
-
-      const metavariableNameB = metavariableName; ///
-
-      comparesToMetavariableName = (metavariableNameA === metavariableNameB);
-    }
-
-    return comparesToMetavariableName;
-  }
-
-  compareSubproofOrProofAssertions(subproofOrProofAssertions, context) {
-    let comparesToSubproofOrProofAssertions;
+      const parameterName = parameter.getName();
 
-    comparesToSubproofOrProofAssertions = backwardsSome(subproofOrProofAssertions, (subproofOrProofAssertion) => {
-      const statement = this, ///
-            subproofOrProofAssertionComparesToStatement = subproofOrProofAssertion.compareStatement(statement, context);
+      if (parameterName !== null) {
+        const metavariableName = this.getMetavariableName();
 
-      if (subproofOrProofAssertionComparesToStatement) {
-        return true;
+        if (parameterName === metavariableName) {
+          comparesToParamter = true;
+        }
       }
-    });
+    }
 
-    return comparesToSubproofOrProofAssertions;
+    return comparesToParamter;
   }
 
   findValidStatment(context) {

package/src/element/subproof.js

@@ -54,10 +54,10 @@ export default define(class Subproof extends Element {
     return proofAssertion;
   }
 
-  compareStatement(statement, context) {
-    const statementUnifies = false;
+  compareStep(step, context) {
+    const comparesToStep = false;
 
-    return statementUnifies;
+    return comparesToStep;
   }
 
   async verify(context) {

package/src/element/substitution/frame.js

@@ -9,8 +9,8 @@ import { join, ablate, descend, attempt, instantiate } from "../../utilities/con
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
 
 export default define(class FrameSubstitution extends Substitution {
-  constructor(context, string, node, targetFrame, replacementFrame) {
-    super(context, string, node);
+  constructor(context, string, node, generalContext, targetFrame, replacementFrame) {
+    super(context, string, node, generalContext);
 
     this.targetFrame = targetFrame;
     this.replacementFrame = replacementFrame;
@@ -31,6 +31,8 @@ export default define(class FrameSubstitution extends Substitution {
     return frameSubstitutionNode;
   }
 
+  getMetavariableNode() { return this.targetFrame.getMetavariableNode(); }
+
   getTargetNode() {
     const targetFrameNode = this.targetFrame.getNode(),
           tergetNode = targetFrameNode; ///
@@ -45,10 +47,6 @@ export default define(class FrameSubstitution extends Substitution {
     return replacementNode;
   }
 
-  compareMetavariableName(metavariableName) { return this.targetFrame.compareMetavariableName(metavariableName); }
-
-  getMetavariableName() { return this.targetFrame.getMetavariableName(); }
-
   isTrivial() {
     const targetFrameEqualToReplacementFrame = this.targetFrame.isEqualTo(this.replacementFrame),
           trivial = targetFrameEqualToReplacementFrame; ///
@@ -56,6 +54,8 @@ export default define(class FrameSubstitution extends Substitution {
     return trivial;
   }
 
+  matchMetavariableNode(metavariableNode) { return this.targetFrame.matchMetavariableNode(metavariableNode); }
+
   compareFrame(frame, context) {
     const frameEqualToReplacementFrame = this.replacementFrame.isEqualTo(frame),
           comparedToFrame = frameEqualToReplacementFrame; ///
@@ -116,6 +116,8 @@ export default define(class FrameSubstitution extends Substitution {
 
       context.addSubstitution(substitution);
 
+      this.setGeneralContext(generalContext);
+
       context.debug(`...validated the '${frameSubstitutionString}' frame substitution.`);
     }
 
@@ -191,11 +193,12 @@ export default define(class FrameSubstitution extends Substitution {
       instantiate((context) => {
         const { string } = json,
               frameSubstitutionNode = instantiateFrameSubstitution(string, context),
-              node = frameSubstitutionNode,  ///
+              node = frameSubstitutionNode, ///
+              generalContext = generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context),
               targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
               replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
 
-        frameSubstitutionn = new FrameSubstitution(context, string, node, targetFrame, replacementFrame);
+        frameSubstitutionn = new FrameSubstitution(context, string, node, generalContext, targetFrame, replacementFrame);
       }, context);
     }
 
@@ -246,3 +249,10 @@ function replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, contex
 
   return replacementFrame;
 }
+
+function generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context) {
+  const generalContext = context; ///
+
+  return generalContext;
+}
+