occam-verify-cli 0.0.968 → 0.0.971

package/src/verify/statement/qualified.js

@@ -1,35 +1,35 @@
 "use strict";
 
 import verifyStatement from "../../verify/statement";
+import unifyQualifiedStatement from "../../unify/statement/qualified";
 
 import { nodeQuery } from "../../utilities/query";
+import { assignAssignments } from "../../utilities/assignments";
 
-const statementNodeQuery = nodeQuery("/qualifiedStatement/statement!"),
-      metavariableNodeQuery = nodeQuery("/qualifiedStatement/reference/metavariable!");
+const statementNodeQuery = nodeQuery("/qualifiedStatement/statement!");
 
-const unifyDerivedQualifiedStatementFunctions = [
-  unifyDerivedQualifiedStatementAWithRule,
-  unifyDerivedQualifiedStatementAWithAxiom,
-  unifyDerivedQualifiedStatementAWithLemma,
-  unifyDerivedQualifiedStatementAWithTheorem,
-  unifyDerivedQualifiedStatementAWithConjecture,
-  unifyDerivedQualifiedStatementAWithReference
-];
-
-export default function verifyQualifiedStatement(qualifiedStatementNode, substitutions, assignments, derived, localContext) {
-  let qualifiedStatementVerified;
+export default function verifyQualifiedStatement(qualifiedStatementNode, substitutions, localContext) {
+  let qualifiedStatementVerified = false;
 
   const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
 
   localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement...`, qualifiedStatementNode);
 
-  const statementNode = statementNodeQuery(qualifiedStatementNode),
-        statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
+  if (!qualifiedStatementVerified) {
+    const stated = true,
+          assignments = [],
+          statementNode = statementNodeQuery(qualifiedStatementNode),
+          statementVerified = verifyStatement(statementNode, assignments, stated, localContext);
+
+    if (statementVerified) {
+      const qualifiedStatementUnified = unifyQualifiedStatement(qualifiedStatementNode, substitutions, localContext);
 
-  if (statementVerified) {
-    const derivedQualifiedStatementUnified = unifyDerivedQualifiedStatement(qualifiedStatementNode, substitutions, localContext);
+      if (qualifiedStatementUnified) {
+        const assignmentsAssigned = assignAssignments(assignments, localContext);
 
-    qualifiedStatementVerified = derivedQualifiedStatementUnified; ///
+        qualifiedStatementVerified = assignmentsAssigned; ///
+      }
+    }
   }
 
   if (qualifiedStatementVerified) {
@@ -38,184 +38,3 @@ export default function verifyQualifiedStatement(qualifiedStatementNode, substit
 
   return qualifiedStatementVerified;
 }
-
-function unifyDerivedQualifiedStatement(qualifiedStatementNode, substitutions, localContext) {
-  let derivedQualifiedStatementUnified;
-
-  const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-
-  localContext.trace(`Unifying the '${qualifiedStatementString}' derived qualified statement...`, qualifiedStatementNode);
-
-  derivedQualifiedStatementUnified = unifyDerivedQualifiedStatementFunctions.some((unifyDerivedQualifiedStatementFunction) => {
-    const derivedQualifiedStatementUnified = unifyDerivedQualifiedStatementFunction(qualifiedStatementNode, substitutions, localContext);
-
-    return derivedQualifiedStatementUnified;
-  });
-
-  if (derivedQualifiedStatementUnified) {
-    localContext.debug(`...unified the '${qualifiedStatementString}' derived qualified statement.`, qualifiedStatementNode);
-  }
-
-  return derivedQualifiedStatementUnified;
-}
-
-function unifyDerivedQualifiedStatementAWithRule(qualifiedStatementNode, substitutions, localContext) {
-  let derivedQualifiedStatementUnifiedWithRule = false;
-
-  const metavariableNode = metavariableNodeQuery(qualifiedStatementNode),
-        rule = localContext.findRuleByMetavariableNode(metavariableNode);
-
-  if (rule !== null) {
-    const statementNode = statementNodeQuery(qualifiedStatementNode),
-          metavariableString = localContext.nodeAsString(metavariableNode),
-          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-
-    localContext.trace(`Unifying the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' rule...`, qualifiedStatementNode);
-
-    const statementUnified = rule.unifyStatement(statementNode, localContext);
-
-    derivedQualifiedStatementUnifiedWithRule = statementUnified;  ///
-
-    if (derivedQualifiedStatementUnifiedWithRule) {
-      localContext.debug(`...unified the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' rule.`, qualifiedStatementNode);
-    }
-  }
-
-  return derivedQualifiedStatementUnifiedWithRule;
-}
-
-function unifyDerivedQualifiedStatementAWithAxiom(qualifiedStatementNode, substitutions, localContext) {
-  let derivedQualifiedStatementUnifiedWithAxiom = false;
-
-  const metavariableNode = metavariableNodeQuery(qualifiedStatementNode),
-        axiom = localContext.findAxiomByMetavariableNode(metavariableNode);
-
-  if (axiom !== null) {
-    const statementNode = statementNodeQuery(qualifiedStatementNode),
-          metavariableString = localContext.nodeAsString(metavariableNode),
-          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-
-    localContext.trace(`Unifying the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' axiom...`, qualifiedStatementNode);
-
-    const statementUnified = axiom.unifyStatement(statementNode, localContext);
-
-    derivedQualifiedStatementUnifiedWithAxiom = statementUnified; ///
-
-    if (derivedQualifiedStatementUnifiedWithAxiom) {
-      localContext.debug(`...unified the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' axiom.`, qualifiedStatementNode);
-    }
-  }
-
-  return derivedQualifiedStatementUnifiedWithAxiom;
-}
-
-function unifyDerivedQualifiedStatementAWithLemma(qualifiedStatementNode, substitutions, localContext) {
-  let derivedQualifiedStatementUnifiedWithLemma = false;
-
-  const metavariableNode = metavariableNodeQuery(qualifiedStatementNode),
-        lemma = localContext.findLemmaByMetavariableNode(metavariableNode);
-
-  if (lemma !== null) {
-    const statementNode = statementNodeQuery(qualifiedStatementNode),
-          metavariableString = localContext.nodeAsString(metavariableNode),
-          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-
-    localContext.trace(`Unifying the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' lemma...`, qualifiedStatementNode);
-
-    const statementUnified = lemma.unifyStatement(statementNode, localContext);
-
-    derivedQualifiedStatementUnifiedWithLemma = statementUnified; ///
-
-    if (derivedQualifiedStatementUnifiedWithLemma) {
-      localContext.debug(`...unified the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' lemma.`, qualifiedStatementNode);
-    }
-  }
-
-  return derivedQualifiedStatementUnifiedWithLemma;
-}
-
-function unifyDerivedQualifiedStatementAWithTheorem(qualifiedStatementNode, substitutions, localContext) {
-  let derivedQualifiedStatementUnifiedWithTheorem = false;
-
-  const metavariableNode = metavariableNodeQuery(qualifiedStatementNode),
-        theorem = localContext.findTheoremByMetavariableNode(metavariableNode);
-
-  if (theorem !== null) {
-    const statementNode = statementNodeQuery(qualifiedStatementNode),
-          metavariableString = localContext.nodeAsString(metavariableNode),
-          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-
-    localContext.trace(`Unifying the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' theorem...`, qualifiedStatementNode);
-
-    const statementUnified = theorem.unifyStatement(statementNode, localContext);
-
-    derivedQualifiedStatementUnifiedWithTheorem = statementUnified; ///
-
-    if (derivedQualifiedStatementUnifiedWithTheorem) {
-      localContext.debug(`...unified the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' theorem.`, qualifiedStatementNode);
-    }
-  }
-
-  return derivedQualifiedStatementUnifiedWithTheorem;
-}
-
-function unifyDerivedQualifiedStatementAWithConjecture(qualifiedStatementNode, substitutions, localContext) {
-  let derivedQualifiedStatementUnifiedWithConjecture = false;
-
-  const metavariableNode = metavariableNodeQuery(qualifiedStatementNode),
-        conjecture = localContext.findConjectureByMetavariableNode(metavariableNode);
-
-  if (conjecture !== null) {
-    const statementNode = statementNodeQuery(qualifiedStatementNode),
-          metavariableString = localContext.nodeAsString(metavariableNode),
-          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-
-    localContext.trace(`Unifying the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' conjecture...`, qualifiedStatementNode);
-
-    const statementUnified = conjecture.unifyStatement(statementNode, localContext);
-
-    derivedQualifiedStatementUnifiedWithConjecture = statementUnified; ///
-
-    if (derivedQualifiedStatementUnifiedWithConjecture) {
-      localContext.debug(`...unified the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' conjecture.`, qualifiedStatementNode);
-    }
-  }
-
-  return derivedQualifiedStatementUnifiedWithConjecture;
-}
-
-function unifyDerivedQualifiedStatementAWithReference(qualifiedStatementNode, substitutions, localContext) {
-  let derivedQualifiedStatementUnifiedWithReference = false;
-
-  const metavariableNode = metavariableNodeQuery(qualifiedStatementNode),
-        metavariableString = localContext.nodeAsString(metavariableNode),
-        metavariablePresent = localContext.isMetavariablePresentByMetavariableNode(metavariableNode),
-        qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-
-  localContext.trace(`Unifying the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' reference...`, qualifiedStatementNode);
-
-  if (metavariablePresent) {
-
-    debugger
-
-    // const statementNode = statementNodeQuery(qualifiedStatementNode),
-    //       localContextA = null,
-    //       localContextB = localContext, ///
-    //       statementNodeB = statementNode, ///
-    //       substitutionNodeA = null,
-    //       metavariableNodeA = metavariableNode, ///
-    //       metavariableUnifiedWithStatement = unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB, () => {
-    //         const verifiedAhead = true;
-    //
-    //         return verifiedAhead;
-    //       });
-    //
-    // derivedQualifiedStatementUnifiedWithReference = metavariableUnifiedWithStatement; ///
-  }
-
-  if (derivedQualifiedStatementUnifiedWithReference) {
-    localContext.debug(`...unified the '${qualifiedStatementString}' derived qualified statement with the '${metavariableString}' reference.`, qualifiedStatementNode);
-  }
-
-  return derivedQualifiedStatementUnifiedWithReference;
-}

package/src/verify/statement/unqualified.js

@@ -1,35 +1,48 @@
 "use strict";
 
 import verifyStatement from "../../verify/statement";
+import unifyUnqualifiedStatement from "../../unify/statement/unqualified";
 
 import { nodeQuery } from "../../utilities/query";
+import { assignAssignments } from "../../utilities/assignments";
 import { verifyStatementTrivially } from "../../verify/statement";
 
 const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!");
 
-export default function verifyUnqualifiedStatement(unqualifiedStatementNode, assignments, derived, localContext) {
-  let unqualifiedStatementVerified;
+export default function verifyUnqualifiedStatement(unqualifiedStatementNode, localContext) {
+  let unqualifiedStatementVerified = false;
 
   const unqualifiedStatementString = localContext.nodeAsString(unqualifiedStatementNode);
 
   localContext.trace(`Verifying the '${unqualifiedStatementString}' unqualified statement...`, unqualifiedStatementNode);
 
-  const statementNode = statementNodeQuery(unqualifiedStatementNode),
-        statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
+  if (!unqualifiedStatementVerified) {
+    const stated = true,
+          assignments = [],
+          statementNode = statementNodeQuery(unqualifiedStatementNode),
+          statementVerified = verifyStatement(statementNode, assignments, stated, localContext);
 
-  if (statementVerified) {
-    if (derived) {
+    if (statementVerified) {
+      const unqualifiedStatementUnified = unifyUnqualifiedStatement(unqualifiedStatementNode, localContext);
+
+      unqualifiedStatementVerified = unqualifiedStatementUnified; ///
+    }
+  }
+
+  if (!unqualifiedStatementVerified) {
+    const stated = false,
+          assignments = [],
+          statementNode = statementNodeQuery(unqualifiedStatementNode),
+          statementVerified = verifyStatement(statementNode, assignments, stated, localContext);
+
+    if (statementVerified) {
       const statementVerifiedTrivially = verifyStatementTrivially(statementNode, localContext);
 
       if (statementVerifiedTrivially) {
-        unqualifiedStatementVerified = true;
-      } else {
-        const derivedUnqualifiedStatementUnified = unifyDerivedUnqualifiedStatement(unqualifiedStatementNode, localContext);
+        const assignmentsAssigned = assignAssignments(assignments, localContext);
 
-        unqualifiedStatementVerified = derivedUnqualifiedStatementUnified; ///
+        unqualifiedStatementVerified = assignmentsAssigned;  ///
       }
-    } else {
-      unqualifiedStatementVerified = true;
     }
   }
 
@@ -39,22 +52,3 @@ export default function verifyUnqualifiedStatement(unqualifiedStatementNode, ass
 
   return unqualifiedStatementVerified;
 }
-
-function unifyDerivedUnqualifiedStatement(unqualifiedStatementNode, localContext) {
-  let derivedUnqualifiedStatementUnified;
-
-  const unqualifiedStatementString = localContext.nodeAsString(unqualifiedStatementNode);
-
-  localContext.trace(`Unifying the '${unqualifiedStatementString}' derived unqualified statement...`, unqualifiedStatementNode);
-
-  const statementNode = statementNodeQuery(unqualifiedStatementNode),
-        statementUnified = localContext.unifyStatement(statementNode, localContext);
-
-  derivedUnqualifiedStatementUnified = statementUnified;  ///
-
-  if (derivedUnqualifiedStatementUnified) {
-    localContext.debug(`...unified the '${unqualifiedStatementString}' derived unqualified statement.`, unqualifiedStatementNode);
-  }
-
-  return derivedUnqualifiedStatementUnified;
-}

package/src/verify/statement.js

@@ -41,7 +41,7 @@ const unifyStatementFunctions = [
         verifyStatementAsContainedAssertion
       ];
 
-function verifyStatement(statementNode, assignments, derived, localContext) {
+function verifyStatement(statementNode, assignments, stated, localContext) {
   let statementVerified = false;
 
   const statementString = localContext.nodeAsString(statementNode);
@@ -49,14 +49,14 @@ function verifyStatement(statementNode, assignments, derived, localContext) {
   localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);
 
   if (!statementVerified) {
-    const statementVerifiedAsMetavariable = verifyStatementAsMetavariable(statementNode, assignments, derived, localContext);
+    const statementVerifiedAsMetavariable = verifyStatementAsMetavariable(statementNode, assignments, stated, localContext);
 
     statementVerified = statementVerifiedAsMetavariable;  ///
   }
 
   if (!statementVerified) {
     const statementUnified = unifyStatementFunctions.some((unifyStatementFunction) => {
-      const statementUnified = unifyStatementFunction(statementNode, assignments, derived, localContext);
+      const statementUnified = unifyStatementFunction(statementNode, assignments, stated, localContext);
 
       if (statementUnified) {
         return true;
@@ -68,7 +68,7 @@ function verifyStatement(statementNode, assignments, derived, localContext) {
 
   if (!statementVerified) {
     statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {
-      const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);
+      const statementVerified = verifyStatementFunction(statementNode, assignments, stated, localContext);
 
       if (statementVerified) {
         return true;
@@ -113,7 +113,7 @@ export function verifyStatementTrivially(statementNode, localContext) {
   return statementVerifiedTrivially;
 }
 
-function verifyStatementAsMetavariable(statementNode, assignments, derived, localContext) {
+function verifyStatementAsMetavariable(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsMetavariable = false;
 
   const metavariableNode = metavariableNodeQuery(statementNode);
@@ -135,7 +135,7 @@ function verifyStatementAsMetavariable(statementNode, assignments, derived, loca
   return statementVerifiedAsMetavariable;
 }
 
-function verifyStatementAsEquality(statementNode, assignments, derived, localContext) {
+function verifyStatementAsEquality(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsEquality = false;
 
   const equalityNode = equalityNodeQuery(statementNode);
@@ -145,7 +145,7 @@ function verifyStatementAsEquality(statementNode, assignments, derived, localCon
 
     localContext.trace(`Verifying the '${statementString}' statement as an equality...`, statementNode);
 
-    const equalityVerified = verifyEquality(equalityNode, assignments, derived, localContext);
+    const equalityVerified = verifyEquality(equalityNode, assignments, stated, localContext);
 
     statementVerifiedAsEquality = equalityVerified; ///
 
@@ -157,7 +157,7 @@ function verifyStatementAsEquality(statementNode, assignments, derived, localCon
   return statementVerifiedAsEquality;
 }
 
-function verifyStatementAsFrame(statementNode, assignments, derived, localContext) {
+function verifyStatementAsFrame(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsFrame = false;
 
   const frameNode = frameNodeQuery(statementNode);
@@ -167,7 +167,7 @@ function verifyStatementAsFrame(statementNode, assignments, derived, localContex
 
     localContext.trace(`Verifying the '${statementString}' statement as a frame...`, statementNode);
 
-    const frameVerified = verifyFrame(frameNode, assignments, derived, localContext);
+    const frameVerified = verifyFrame(frameNode, assignments, stated, localContext);
 
     statementVerifiedAsFrame = frameVerified; ///
 
@@ -179,7 +179,7 @@ function verifyStatementAsFrame(statementNode, assignments, derived, localContex
   return statementVerifiedAsFrame;
 }
 
-function verifyStatementAsJudgement(statementNode, assignments, derived, localContext) {
+function verifyStatementAsJudgement(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsJudgement = false;
 
   const judgementNode = judgementNodeQuery(statementNode);
@@ -189,7 +189,7 @@ function verifyStatementAsJudgement(statementNode, assignments, derived, localCo
 
     localContext.trace(`Verifying the '${statementString}' statement as a judgement...`, statementNode);
 
-    const judgementVerified = verifyJudgement(judgementNode, assignments, derived, localContext);
+    const judgementVerified = verifyJudgement(judgementNode, assignments, stated, localContext);
 
     statementVerifiedAsJudgement = judgementVerified;  ///
 
@@ -201,7 +201,7 @@ function verifyStatementAsJudgement(statementNode, assignments, derived, localCo
   return statementVerifiedAsJudgement;
 }
 
-function verifyStatementAsDeclaration(statementNode, assignments, derived, localContext) {
+function verifyStatementAsDeclaration(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsDeclaration = false;
 
   const declarationNode = declarationNodeQuery(statementNode);
@@ -211,7 +211,7 @@ function verifyStatementAsDeclaration(statementNode, assignments, derived, local
 
     localContext.trace(`Verifying the '${statementString}' statement as a declaration...`, statementNode);
 
-    const declarationVerified = verifyDeclaration(declarationNode, assignments, derived, localContext);
+    const declarationVerified = verifyDeclaration(declarationNode, assignments, stated, localContext);
 
     statementVerifiedAsDeclaration = declarationVerified; ///
 
@@ -223,7 +223,7 @@ function verifyStatementAsDeclaration(statementNode, assignments, derived, local
   return statementVerifiedAsDeclaration;
 }
 
-function verifyStatementAsSubstitution(statementNode, assignments, derived, localContext) {
+function verifyStatementAsSubstitution(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsSubstitution = false;
 
   const substitutionNode = substitutionNodeQuery(statementNode);
@@ -233,7 +233,7 @@ function verifyStatementAsSubstitution(statementNode, assignments, derived, loca
 
     localContext.trace(`Verifying the '${statementString}' statement as a substitution...`, statementNode);
 
-    const substitutionVerified = verifySubstitution(substitutionNode, assignments, derived, localContext);
+    const substitutionVerified = verifySubstitution(substitutionNode, assignments, stated, localContext);
 
     statementVerifiedAsSubstitution = substitutionVerified; ///
 
@@ -245,7 +245,7 @@ function verifyStatementAsSubstitution(statementNode, assignments, derived, loca
   return statementVerifiedAsSubstitution;
 }
 
-function verifyStatementAsTypeAssertion(statementNode, assignments, derived, localContext) {
+function verifyStatementAsTypeAssertion(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsTypeAssertion = false;
 
   const typeAssertionNode = typeAssertionNodeQuery(statementNode);
@@ -255,7 +255,7 @@ function verifyStatementAsTypeAssertion(statementNode, assignments, derived, loc
 
     localContext.trace(`Verifying the '${statementString}' statement as a type assertion...`, statementNode);
 
-    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext);
+    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, stated, localContext);
 
     statementVerifiedAsTypeAssertion = typeAssertionVerified; ///
 
@@ -267,7 +267,7 @@ function verifyStatementAsTypeAssertion(statementNode, assignments, derived, loc
   return statementVerifiedAsTypeAssertion;
 }
 
-function verifyStatementAsDefinedAssertion(statementNode, assignments, derived, localContext) {
+function verifyStatementAsDefinedAssertion(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsDefinedAssertion = false;
 
   const definedAssertionNode = definedAssertionNodeQuery(statementNode);
@@ -277,7 +277,7 @@ function verifyStatementAsDefinedAssertion(statementNode, assignments, derived,
 
     localContext.trace(`Verifying the '${statementString}' statement as a defined assertion...`, statementNode);
 
-    const definedAssertionVerified = verifyDefinedAssertion(definedAssertionNode, assignments, derived, localContext);
+    const definedAssertionVerified = verifyDefinedAssertion(definedAssertionNode, assignments, stated, localContext);
 
     statementVerifiedAsDefinedAssertion = definedAssertionVerified; ///
 
@@ -289,7 +289,7 @@ function verifyStatementAsDefinedAssertion(statementNode, assignments, derived,
   return statementVerifiedAsDefinedAssertion;
 }
 
-function verifyStatementAsSubproofAssertion(statementNode, assignments, derived, localContext) {
+function verifyStatementAsSubproofAssertion(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsSubproofAssertion = false;
 
   const subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
@@ -299,7 +299,7 @@ function verifyStatementAsSubproofAssertion(statementNode, assignments, derived,
 
     localContext.trace(`Verifying the '${statementString}' statement as a subproof assertion...`, statementNode);
 
-    const subproofAssertionVerified = verifySubproofAssertion(subproofAssertionNode, assignments, derived, localContext);
+    const subproofAssertionVerified = verifySubproofAssertion(subproofAssertionNode, assignments, stated, localContext);
 
     statementVerifiedAsSubproofAssertion = subproofAssertionVerified; ///
 
@@ -311,7 +311,7 @@ function verifyStatementAsSubproofAssertion(statementNode, assignments, derived,
   return statementVerifiedAsSubproofAssertion;
 }
 
-function verifyStatementAsContainedAssertion(statementNode, assignments, derived, localContext) {
+function verifyStatementAsContainedAssertion(statementNode, assignments, stated, localContext) {
   let statementVerifiedAsContainedAssertion = false;
 
   const containedAssertionNode = containedAssertionNodeQuery(statementNode);
@@ -321,7 +321,7 @@ function verifyStatementAsContainedAssertion(statementNode, assignments, derived
 
     localContext.trace(`Verifying the '${statementString}' statement as a contained assertion...`, statementNode);
 
-    const containedAssertionVerified = verifyContainedAssertion(containedAssertionNode, assignments, derived, localContext);
+    const containedAssertionVerified = verifyContainedAssertion(containedAssertionNode, assignments, stated, localContext);
 
     statementVerifiedAsContainedAssertion = containedAssertionVerified; ///
 

package/src/verify/statementGivenMetaType.js

@@ -7,7 +7,7 @@ import { FRAME_META_TYPE_NAME, REFERENCE_META_TYPE_NAME, STATEMENT_META_TYPE_NAM
 
 const metavariableNodeQuery = nodeQuery("/statement/metavariable!");
 
-export default function verifyStatementGivenMetaType(statementNode, metaType, assignments, derived, localContext) {
+export default function verifyStatementGivenMetaType(statementNode, metaType, assignments, stated, localContext) {
   let statementVerifiedGivenMetaType;
 
   const metaTypeName = metaType.getName();
@@ -36,7 +36,7 @@ export default function verifyStatementGivenMetaType(statementNode, metaType, as
 
     case STATEMENT_META_TYPE_NAME: {
       const { verifyStatement } = shim,
-            statementVerified = verifyStatement(statementNode, assignments, derived, localContext)
+            statementVerified = verifyStatement(statementNode, assignments, stated, localContext)
 
       statementVerifiedGivenMetaType = statementVerified; ///
 

package/src/verify/supposition.js

@@ -2,7 +2,7 @@
 
 import ProofStep from "../proofStep";
 import Supposition from "../supposition";
-import verifyUnqualifiedStatement from "../verify/statement/unqualified";
+import verifyStatement from "../verify/statement";
 
 import { nodeQuery } from "../utilities/query";
 import { assignAssignments } from "../utilities/assignments";
@@ -20,16 +20,16 @@ export default function verifySupposition(suppositionNode, suppositions, localCo
   const unqualifiedStatementNode = unqualifiedStatementNodeQuery(suppositionNode);
 
   if (unqualifiedStatementNode !== null) {
-    const derived = false,
+    const stated = true,
           assignments = [],
-          unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, assignments, derived, localContext);
+          statementNode = statementNodeQuery(unqualifiedStatementNode),
+          statementVerified = verifyStatement(statementNode, assignments, stated, localContext);
 
-    if (unqualifiedStatementVerified) {
+    if (statementVerified) {
       const assignmentsAssigned = assignAssignments(assignments, localContext);
 
       if (assignmentsAssigned) {
-        const statementNode = statementNodeQuery(unqualifiedStatementNode),
-              supposition = Supposition.fromStatementNode(statementNode),
+        const supposition = Supposition.fromStatementNode(statementNode),
               proofStep = ProofStep.fromStatementNode(statementNode);
 
         suppositions.push(supposition);

package/lib/unify/statementAtainstStatement.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return unifyStatementWithStatement;
-    }
-});
-var _substitutions = /*#__PURE__*/ _interop_require_default(require("../substitutions"));
-var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../unifier/metaLevel"));
-var _termForVariable = /*#__PURE__*/ _interop_require_default(require("../substitution/termForVariable"));
-var _array = require("../utilities/array");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function unifyStatementWithStatement(statementNodeA, statementNodeB, substitution, substitutions, localContextA, localContextB) {
-    var statementUnifiedWithStatement = false;
-    var transformedSubstitutions = _substitutions.default.fromNothing(), transformedSubstitution = substitution.transformed(substitutions);
-    if (transformedSubstitution !== null) {
-        transformedSubstitutions.addSubstitution(transformedSubstitution, localContextA, localContextB);
-    }
-    var nodeA = statementNodeA, nodeB = statementNodeB, unified = _metaLevel.default.unify(nodeA, nodeB, transformedSubstitutions, localContextA, localContextB);
-    if (unified) {
-        if (transformedSubstitution === null) {
-            debugger;
-            var substitutionB = termForVariableSubstitution, substitutionsB = [
-                substitutionB
-            ];
-            substitutionsA = transformSubstitutions(substitutionsA, substitutionsB);
-            (0, _array.push)(substitutions, substitutionsA);
-        }
-        statementUnifiedWithStatement = true;
-    }
-    return statementUnifiedWithStatement;
-}
-function transformSubstitutions(substitutionsA1, substitutionsB) {
-    substitutionsA1 = substitutionsA1.map(function(substitutionA) {
-        var substitution = substitutionA, substitutions = substitutionsB, termForVariableSubstitution1 = _termForVariable.default.fromSubstitutionAndSubstitutions(substitution, substitutions);
-        substitutionA = termForVariableSubstitution1; ///
-        return substitutionA;
-    });
-    return substitutionsA1;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9zdGF0ZW1lbnRBdGFpbnN0U3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgU3Vic3RpdHV0aW9ucyBmcm9tIFwiLi4vc3Vic3RpdHV0aW9uc1wiO1xuaW1wb3J0IG1ldGFMZXZlbFVuaWZpZXIgZnJvbSBcIi4uL3VuaWZpZXIvbWV0YUxldmVsXCI7XG5pbXBvcnQgVGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uIGZyb20gXCIuLi9zdWJzdGl0dXRpb24vdGVybUZvclZhcmlhYmxlXCI7XG5cbmltcG9ydCB7IHB1c2ggfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVuaWZ5U3RhdGVtZW50V2l0aFN0YXRlbWVudChzdGF0ZW1lbnROb2RlQSwgc3RhdGVtZW50Tm9kZUIsIHN1YnN0aXR1dGlvbiwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0QSwgbG9jYWxDb250ZXh0Qikge1xuICBsZXQgc3RhdGVtZW50VW5pZmllZFdpdGhTdGF0ZW1lbnQgPSBmYWxzZTtcblxuICBjb25zdCB0cmFuc2Zvcm1lZFN1YnN0aXR1dGlvbnMgPSBTdWJzdGl0dXRpb25zLmZyb21Ob3RoaW5nKCksXG4gICAgICAgIHRyYW5zZm9ybWVkU3Vic3RpdHV0aW9uID0gc3Vic3RpdHV0aW9uLnRyYW5zZm9ybWVkKHN1YnN0aXR1dGlvbnMpO1xuXG4gIGlmICh0cmFuc2Zvcm1lZFN1YnN0aXR1dGlvbiAhPT0gbnVsbCkge1xuICAgIHRyYW5zZm9ybWVkU3Vic3RpdHV0aW9ucy5hZGRTdWJzdGl0dXRpb24odHJhbnNmb3JtZWRTdWJzdGl0dXRpb24sIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpO1xuICB9XG5cbiAgY29uc3Qgbm9kZUEgPSBzdGF0ZW1lbnROb2RlQSwgIC8vL1xuICAgICAgICBub2RlQiA9IHN0YXRlbWVudE5vZGVCLCAgLy8vXG4gICAgICAgIHVuaWZpZWQgPSBtZXRhTGV2ZWxVbmlmaWVyLnVuaWZ5KG5vZGVBLCBub2RlQiwgdHJhbnNmb3JtZWRTdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKTtcblxuICBpZiAodW5pZmllZCkge1xuICAgIGlmICh0cmFuc2Zvcm1lZFN1YnN0aXR1dGlvbiA9PT0gbnVsbCkge1xuXG4gICAgICBkZWJ1Z2dlclxuXG4gICAgICBjb25zdCBzdWJzdGl0dXRpb25CID0gdGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uLCAgLy8vXG4gICAgICAgICAgICBzdWJzdGl0dXRpb25zQiA9IFtcbiAgICAgICAgICAgICAgc3Vic3RpdHV0aW9uQlxuICAgICAgICAgICAgXTtcblxuICAgICAgc3Vic3RpdHV0aW9uc0EgPSB0cmFuc2Zvcm1TdWJzdGl0dXRpb25zKHN1YnN0aXR1dGlvbnNBLCBzdWJzdGl0dXRpb25zQik7XG5cbiAgICAgIHB1c2goc3Vic3RpdHV0aW9ucywgc3Vic3RpdHV0aW9uc0EpO1xuICAgIH1cblxuICAgIHN0YXRlbWVudFVuaWZpZWRXaXRoU3RhdGVtZW50ID0gdHJ1ZTtcbiAgfVxuXG4gIHJldHVybiBzdGF0ZW1lbnRVbmlmaWVkV2l0aFN0YXRlbWVudDtcbn1cblxuZnVuY3Rpb24gdHJhbnNmb3JtU3Vic3RpdHV0aW9ucyhzdWJzdGl0dXRpb25zQSwgc3Vic3RpdHV0aW9uc0IpIHtcbiAgc3Vic3RpdHV0aW9uc0EgPSBzdWJzdGl0dXRpb25zQS5tYXAoKHN1YnN0aXR1dGlvbkEpID0+IHtcbiAgICBjb25zdCBzdWJzdGl0dXRpb24gPSBzdWJzdGl0dXRpb25BLCAgLy8vXG4gICAgICAgICAgc3Vic3RpdHV0aW9ucyA9IHN1YnN0aXR1dGlvbnNCLFxuICAgICAgICAgIHRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbiA9IFRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbi5mcm9tU3Vic3RpdHV0aW9uQW5kU3Vic3RpdHV0aW9ucyhzdWJzdGl0dXRpb24sIHN1YnN0aXR1dGlvbnMpO1xuXG4gICAgc3Vic3RpdHV0aW9uQSA9IHRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbjsgLy8vXG5cbiAgICByZXR1cm4gc3Vic3RpdHV0aW9uQTtcbiAgfSk7XG5cbiAgcmV0dXJuIHN1YnN0aXR1dGlvbnNBO1xufVxuIl0sIm5hbWVzIjpbInVuaWZ5U3RhdGVtZW50V2l0aFN0YXRlbWVudCIsInN0YXRlbWVudE5vZGVBIiwic3RhdGVtZW50Tm9kZUIiLCJzdWJzdGl0dXRpb24iLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0QSIsImxvY2FsQ29udGV4dEIiLCJzdGF0ZW1lbnRVbmlmaWVkV2l0aFN0YXRlbWVudCIsInRyYW5zZm9ybWVkU3Vic3RpdHV0aW9ucyIsIlN1YnN0aXR1dGlvbnMiLCJmcm9tTm90aGluZyIsInRyYW5zZm9ybWVkU3Vic3RpdHV0aW9uIiwidHJhbnNmb3JtZWQiLCJhZGRTdWJzdGl0dXRpb24iLCJub2RlQSIsIm5vZGVCIiwidW5pZmllZCIsIm1ldGFMZXZlbFVuaWZpZXIiLCJ1bmlmeSIsInN1YnN0aXR1dGlvbkIiLCJ0ZXJtRm9yVmFyaWFibGVTdWJzdGl0dXRpb24iLCJzdWJzdGl0dXRpb25zQiIsInN1YnN0aXR1dGlvbnNBIiwidHJhbnNmb3JtU3Vic3RpdHV0aW9ucyIsInB1c2giLCJtYXAiLCJzdWJzdGl0dXRpb25BIiwiVGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uIiwiZnJvbVN1YnN0aXR1dGlvbkFuZFN1YnN0aXR1dGlvbnMiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFBOzs7ZUFBd0JBOzs7b0VBTkU7Z0VBQ0c7c0VBQ1c7cUJBRW5COzs7Ozs7QUFFTixTQUFTQSw0QkFBNEJDLGNBQWMsRUFBRUMsY0FBYyxFQUFFQyxZQUFZLEVBQUVDLGFBQWEsRUFBRUMsYUFBYSxFQUFFQyxhQUFhO0lBQzNJLElBQUlDLGdDQUFnQztJQUVwQyxJQUFNQywyQkFBMkJDLHNCQUFhLENBQUNDLFdBQVcsSUFDcERDLDBCQUEwQlIsYUFBYVMsV0FBVyxDQUFDUjtJQUV6RCxJQUFJTyw0QkFBNEIsTUFBTTtRQUNwQ0gseUJBQXlCSyxlQUFlLENBQUNGLHlCQUF5Qk4sZUFBZUM7SUFDbkY7SUFFQSxJQUFNUSxRQUFRYixnQkFDUmMsUUFBUWIsZ0JBQ1JjLFVBQVVDLGtCQUFnQixDQUFDQyxLQUFLLENBQUNKLE9BQU9DLE9BQU9QLDBCQUEwQkgsZUFBZUM7SUFFOUYsSUFBSVUsU0FBUztRQUNYLElBQUlMLDRCQUE0QixNQUFNO1lBRXBDLFFBQVE7WUFFUixJQUFNUSxnQkFBZ0JDLDZCQUNoQkMsaUJBQWlCO2dCQUNmRjthQUNEO1lBRVBHLGlCQUFpQkMsdUJBQXVCRCxnQkFBZ0JEO1lBRXhERyxJQUFBQSxXQUFJLEVBQUNwQixlQUFla0I7UUFDdEI7UUFFQWYsZ0NBQWdDO0lBQ2xDO0lBRUEsT0FBT0E7QUFDVDtBQUVBLFNBQVNnQix1QkFBdUJELGVBQWMsRUFBRUQsY0FBYztJQUM1REMsa0JBQWlCQSxnQkFBZUcsR0FBRyxDQUFDLFNBQUNDO1FBQ25DLElBQU12QixlQUFldUIsZUFDZnRCLGdCQUFnQmlCLGdCQUNoQkQsK0JBQThCTyx3QkFBMkIsQ0FBQ0MsZ0NBQWdDLENBQUN6QixjQUFjQztRQUUvR3NCLGdCQUFnQk4sOEJBQTZCLEdBQUc7UUFFaEQsT0FBT007SUFDVDtJQUVBLE9BQU9KO0FBQ1QifQ==