occam-verify-cli 0.0.484 → 0.0.486

package/src/verify/conclusion.js

@@ -1,31 +1,29 @@
 "use strict";
 
 import Conclusion from "../conclusion";
-import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified";
 
 import { nodeQuery } from "../utilities/query";
+import {nodeAsString} from "../utilities/string";
 
-const metastatementNodeQuery = nodeQuery("/*/metastatement!"),
-      unqualifiedMetastatementNodeQuery = nodeQuery("/conclusion/unqualifiedMetastatement!");
+const metastatementNodeQuery = nodeQuery("/conclusion/unqualifiedMetastatement!/metastatement!");
 
 export default function verifyConclusion(conclusionNode, conclusions, metaproofContext) {
   let conclusionVerified = false;
 
   metaproofContext.begin(conclusionNode);
 
-  const unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(conclusionNode);
+  const conclusionString = nodeAsString(conclusionNode);
 
-  if (unqualifiedMetastatementNode !== null) {
-    const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
+  metaproofContext.debug(`Verifying the '${conclusionString}' conclusion...`);
 
-    if (unqualifiedMetastatementVerified) {
-      const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
-            conclusion = Conclusion.fromMetastatementNode(metastatementNode);
+  const metastatementNode = metastatementNodeQuery(conclusionNode);
 
-      conclusions.push(conclusion);
+  if (metastatementNode !== null) {
+    const conclusion = Conclusion.fromMetastatementNode(metastatementNode);
 
-      conclusionVerified = true;
-    }
+    conclusions.push(conclusion);
+
+    conclusionVerified = true;
   }
 
   conclusionVerified ?

package/src/verify/conditionalIndicative.js

@@ -1,25 +1,33 @@
 "use strict";
 
-import verifyUnqualifiedStatement from "../verify/statement/unqualified";
+import verifyConsequent from "../verify/consequent";
+import verifyAntecedent from "../verify/antecedent";
 
-import { nodesQuery } from "../utilities/query";
+import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const unqualifiedStatementNodesQuery = nodesQuery("/conditionalIndicative/unqualifiedStatement");
+const consequentNodeQuery = nodeQuery("/conditionalIndicative/consequent!"),
+      antecedentsNodeQuery = nodesQuery("/conditionalIndicative/antecedent");
 
-export default function verifyConditionalIndicative(conditionalIndicativeNode, proofContext) {
-  let conditionalIndicativeVerified;
+export default function verifyConditionalIndicative(conditionalIndicativeNode, antecedents, consequents, proofContext) {
+  let conditionalIndicativeVerified = false;
 
   proofContext.begin(conditionalIndicativeNode);
 
-  const unqualifiedStatementNodes = unqualifiedStatementNodesQuery(conditionalIndicativeNode);
+  const consequentNode = consequentNodeQuery(conditionalIndicativeNode),
+        antecedentNodes = antecedentsNodeQuery(conditionalIndicativeNode),
+        antecedentsVerified = antecedentNodes.every((antecedentNode) => {
+          const antecedentVerified = verifyAntecedent(antecedentNode, antecedents, proofContext);
 
-  conditionalIndicativeVerified = unqualifiedStatementNodes.every((unqualifiedStatementNode) => {
-    const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
+          if (antecedentVerified) {
+            return true;
+          }
+        });
 
-    if (unqualifiedStatementVerified) {
-      return true;
-    }
-  });
+  if (antecedentsVerified) {
+    const consequentVerified = verifyConsequent(consequentNode, consequents, proofContext);
+
+    conditionalIndicativeVerified = consequentVerified;  ///
+  }
 
   conditionalIndicativeVerified ?
     proofContext.complete(conditionalIndicativeNode) :

package/src/verify/consequent.js

@@ -1,31 +1,29 @@
 "use strict";
 
 import Consequent from "../consequent";
-import verifyUnqualifiedStatement from "../verify/statement/unqualified";
 
 import { nodeQuery } from "../utilities/query";
+import { nodeAsString } from "../utilities/string";
 
-const statementNodeQuery = nodeQuery("/*/statement!"),
-      unqualifiedStatementNodeQuery = nodeQuery("/consequent/unqualifiedStatement!");
+const statementNodeQuery = nodeQuery("/consequent/unqualifiedStatement!/statement!");
 
 export default function verifyConsequent(consequentNode, consequents, proofContext) {
   let consequentVerified = false;
 
   proofContext.begin(consequentNode);
 
-  const unqualifiedStatementNode = unqualifiedStatementNodeQuery(consequentNode);
+  const consequentString = nodeAsString(consequentNode);
 
-  if (unqualifiedStatementNode !== null) {
-    const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
+  proofContext.debug(`Verifying the ${consequentString} consequent...`);
 
-    if (unqualifiedStatementVerified) {
-      const statementNode = statementNodeQuery(unqualifiedStatementNode),
-            consequent = Consequent.fromStatementNode(statementNode);
+  const statementNode = statementNodeQuery(consequentNode);
 
-      consequents.push(consequent);
+  if (statementNode !== null) {
+    const consequent = Consequent.fromStatementNode(statementNode);
 
-      consequentVerified = true;
-    }
+    consequents.push(consequent);
+
+    consequentVerified = true;
   }
 
   consequentVerified ?

package/src/verify/derivation.js

@@ -8,10 +8,10 @@ import verifyUnqualifiedStatement from "../verify/statement/unqualified";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 import { SUBPROOF_RULE_NAME, QUALIFIED_STATEMENT_RULE_NAME, UNQUALIFIED_STATEMENT_RULE_NAME } from "../ruleNames";
 
-const statementNodeQuery = nodeQuery("/qualifiedStatement|unqualifiedStatement/statement!"),
-      derivationNodeQuery = nodeQuery("/subproof/derivation|abridgedDerivation!"),  ///
-      derivationChildNodesQuery = nodesQuery("/derivation|abridgedDerivation/*"),
-      unqualifiedStatementNodesQuery = nodesQuery("/subproof/unqualifiedStatement")
+const childNodesQuery = nodesQuery("/derivation|subDerivation/*"),
+      statementNodeQuery = nodeQuery("/qualifiedStatement|unqualifiedStatement/statement!"),
+      subDerivationNodeQuery = nodeQuery("/subproof/subDerivation"),
+      unqualifiedStatementNodesQuery = nodesQuery("/subproof/unqualifiedStatement");
 
 export default function verifyDerivation(derivationNode, proofContext) {
   let derivationVerified;
@@ -20,17 +20,17 @@ export default function verifyDerivation(derivationNode, proofContext) {
 
   proofContext.setDerived();
 
-  const derivationChildNodes = derivationChildNodesQuery(derivationNode);
+  const childNodes = childNodesQuery(derivationNode);
 
-  derivationVerified = derivationChildNodes.every((derivationChildNode) => {  ///
-    const derivationChildVerified = verifyDerivationChild(derivationChildNode, proofContext);
+  derivationVerified = childNodes.every((childNode) => {  ///
+    const childVerified = verifyChild(childNode, proofContext);
 
-    if (derivationChildVerified) {
+    if (childVerified) {
       return true;
     }
   });
 
-  proofContext.setDerived();
+  proofContext.resetDerived();
 
   derivationVerified ?
     proofContext.complete(derivationNode) :
@@ -39,14 +39,73 @@ export default function verifyDerivation(derivationNode, proofContext) {
   return derivationVerified;
 }
 
-function verifyDerivationChild(derivationChildNode, proofContext) {
-  let derivationChildVerified;
+function verifySubDerivation(subDerivationNode, proofContext) {
+  let derivationVerified;
+
+  proofContext.begin(subDerivationNode);
+
+  proofContext.setDerived();
+
+  const childNodes = childNodesQuery(subDerivationNode);
+
+  derivationVerified = childNodes.every((childNode) => {  ///
+    const childVerified = verifyChild(childNode, proofContext);
+
+    if (childVerified) {
+      return true;
+    }
+  });
+
+  proofContext.resetDerived();
+
+  derivationVerified ?
+    proofContext.complete(subDerivationNode) :
+      proofContext.halt(subDerivationNode);
+
+  return derivationVerified;
+}
+
+function verifySubproof(subproofNode, proofContext) {
+  let subproofVerified = false;
+
+  proofContext = ProofContext.fromProofContext(proofContext); ///
+
+  const unqualifiedStatementNodes = unqualifiedStatementNodesQuery(subproofNode),
+        unqualifiedStatementsVerified = unqualifiedStatementNodes.every((unqualifiedStatementNode) => {
+          const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
+
+          if (unqualifiedStatementVerified) {
+            return true;
+          }
+        });
+
+  if (unqualifiedStatementsVerified) {
+    unqualifiedStatementNodes.forEach((unqualifiedStatementNode) => {
+      const statementNode = statementNodeQuery(unqualifiedStatementNode),
+            proofStep = ProofStep.fromStatementNode(statementNode);
+
+      proofContext.addProofStep(proofStep);
+    });
+
+    const subDerivationNode = subDerivationNodeQuery(subproofNode),
+          subDerivationVerified = verifySubDerivation(subDerivationNode, proofContext);
+
+    if (subDerivationVerified) {
+      subproofVerified = true;
+    }
+  }
+
+  return subproofVerified;
+}
+
+function verifyChild(childNode, proofContext) {
+  let childVerified;
 
-  const ruleName = derivationChildNode.getRuleName();
+  const childNodeRuleName = childNode.getRuleName();
 
-  switch (ruleName) {
+  switch (childNodeRuleName) {
     case SUBPROOF_RULE_NAME: {
-      const subproofNode = derivationChildNode,  ///
+      const subproofNode = childNode,  ///
             subproofVerified = verifySubproof(subproofNode, proofContext);
 
       if (subproofVerified) {
@@ -54,14 +113,14 @@ function verifyDerivationChild(derivationChildNode, proofContext) {
 
         proofContext.addProofStep(proofStep);
 
-        derivationChildVerified = true;
+        childVerified = true;
       }
 
       break;
     }
 
     case QUALIFIED_STATEMENT_RULE_NAME: {
-      const qualifiedStatementNode = derivationChildNode,  ///
+      const qualifiedStatementNode = childNode,  ///
             qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, proofContext);
 
       if (qualifiedStatementVerified) {
@@ -70,14 +129,14 @@ function verifyDerivationChild(derivationChildNode, proofContext) {
 
         proofContext.addProofStep(proofStep);
 
-        derivationChildVerified = qualifiedStatementVerified; ///
+        childVerified = qualifiedStatementVerified; ///
       }
 
       break;
     }
 
     case UNQUALIFIED_STATEMENT_RULE_NAME: {
-      const unqualifiedStatementNode = derivationChildNode,  ///
+      const unqualifiedStatementNode = childNode,  ///
             unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
 
       if (unqualifiedStatementVerified) {
@@ -86,45 +145,12 @@ function verifyDerivationChild(derivationChildNode, proofContext) {
 
         proofContext.addProofStep(proofStep);
 
-        derivationChildVerified = true;
+        childVerified = true;
       }
 
       break;
     }
   }
 
-  return derivationChildVerified;
-}
-
-function verifySubproof(subproofNode, proofContext) {
-  let subproofVerified = false;
-
-  proofContext = ProofContext.fromProofContext(proofContext); ///
-
-  const unqualifiedStatementNodes = unqualifiedStatementNodesQuery(subproofNode),
-        unqualifiedStatementsVerified = unqualifiedStatementNodes.every((unqualifiedStatementNode) => {
-          const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
-
-          if (unqualifiedStatementVerified) {
-            return true;
-          }
-        });
-
-  if (unqualifiedStatementsVerified) {
-    unqualifiedStatementNodes.forEach((unqualifiedStatementNode) => {
-      const statementNode = statementNodeQuery(unqualifiedStatementNode),
-            proofStep = ProofStep.fromStatementNode(statementNode);
-
-      proofContext.addProofStep(proofStep);
-    });
-
-    const derivationNode = derivationNodeQuery(subproofNode),
-          derivationVerified = verifyDerivation(derivationNode, proofContext);
-
-    if (derivationVerified) {
-      subproofVerified = true;
-    }
-  }
-
-  return subproofVerified;
+  return childVerified;
 }

package/src/verify/metaDerivation.js

@@ -8,10 +8,10 @@ import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified"
 import { nodeQuery, nodesQuery } from "../utilities/query";
 import { META_SUBPROOF_RULE_NAME, QUALIFIED_METASTATEMENT_RULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from "../ruleNames";
 
-const metastatementNodeQuery = nodeQuery("/qualifiedMetastatement|unqualifiedMetastatement/metastatement!"),
-      metaDerivationNodeQuery = nodeQuery("/metaSubproof/metaDerivation|abridgedMetaDerivation!"),  ///
-      metaDerivationChildNodesQuery = nodesQuery("/metaDerivation|abridgedMetaDerivation/*"),
-      unqualifiedMetastatementNodesQuery = nodesQuery("/metaSubproof/unqualifiedMetastatement")
+const childNodesQuery = nodesQuery("/metaDerivation|metaSubDerivation/*"),
+      metastatementNodeQuery = nodeQuery("/qualifiedMetastatement|unqualifiedMetastatement/metastatement!"),
+      metaSubDerivationNodeQuery = nodeQuery("/metaSubproof/metaSubDerivation"),
+      unqualifiedMetastatementNodesQuery = nodesQuery("/metaSubproof/unqualifiedMetastatement");
 
 export default function verifyMetaDerivation(metaDerivationNode, metaproofContext) {
   let metaDerivationVerified;
@@ -20,12 +20,12 @@ export default function verifyMetaDerivation(metaDerivationNode, metaproofContex
 
   metaproofContext.setDerived();
 
-  const metaDerivationChildNodes = metaDerivationChildNodesQuery(metaDerivationNode);
+  const childNodes = childNodesQuery(metaDerivationNode);
 
-  metaDerivationVerified = metaDerivationChildNodes.every((metaDerivationChildNode) => {  ///
-    const metaDerivationChildVerified = verifyMetaDerivationChild(metaDerivationChildNode, metaproofContext);
+  metaDerivationVerified = childNodes.every((childNode) => {  ///
+    const childVerified = verifyChild(childNode, metaproofContext);
 
-    if (metaDerivationChildVerified) {
+    if (childVerified) {
       return true;
     }
   });
@@ -39,14 +39,73 @@ export default function verifyMetaDerivation(metaDerivationNode, metaproofContex
   return metaDerivationVerified;
 }
 
-function verifyMetaDerivationChild(metaDerivationChildNode, metaproofContext) {
-  let metaDerivationChildVerified;
+function verifyMetaSubDerivation(metaSubDerivationNode, metaproofContext) {
+  let metaDerivationVerified;
+
+  metaproofContext.begin(metaSubDerivationNode);
+
+  metaproofContext.setDerived();
+
+  const childNodes = childNodesQuery(metaSubDerivationNode);
+
+  metaDerivationVerified = childNodes.every((childNode) => {  ///
+    const childVerified = verifyChild(childNode, metaproofContext);
+
+    if (childVerified) {
+      return true;
+    }
+  });
+
+  metaproofContext.resetDerived();
+
+  metaDerivationVerified ?
+    metaproofContext.complete(metaSubDerivationNode) :
+      metaproofContext.halt(metaSubDerivationNode);
 
-  const ruleName = metaDerivationChildNode.getRuleName();
+  return metaDerivationVerified;
+}
+
+function verifyMetaSubproof(metaSubproofNode, metaproofContext) {
+  let metaSubproofVerified = false;
+
+  metaproofContext = MetaproofContext.fromMetaproofContext(metaproofContext); ///
+
+  const unqualifiedMetastatementNodes = unqualifiedMetastatementNodesQuery(metaSubproofNode),
+        unqualifiedMetastatementsVerified = unqualifiedMetastatementNodes.every((unqualifiedMetastatementNode) => {
+      const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
+
+      if (unqualifiedMetastatementVerified) {
+        return true;
+      }
+    });
+
+  if (unqualifiedMetastatementsVerified) {
+    unqualifiedMetastatementNodes.forEach((unqualifiedMetastatementNode) => {
+      const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
+        metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
+
+      metaproofContext.addMetaproofStep(metaproofStep);
+    });
 
-  switch (ruleName) {
+    const metaSubDerivationNode = metaSubDerivationNodeQuery(metaSubproofNode),
+          metaSubDerivationVerified = verifyMetaSubDerivation(metaSubDerivationNode, metaproofContext);
+
+    if (metaSubDerivationVerified) {
+      metaSubproofVerified = true;
+    }
+  }
+
+  return metaSubproofVerified;
+}
+
+function verifyChild(childNode, metaproofContext) {
+  let childVerified;
+
+  const childNodeRuleName = childNode.getRuleName();
+
+  switch (childNodeRuleName) {
     case META_SUBPROOF_RULE_NAME: {
-      const metaSubproofNode = metaDerivationChildNode,  ///
+      const metaSubproofNode = childNode,  ///
             metaSubproofVerified = verifyMetaSubproof(metaSubproofNode, metaproofContext);
 
       if (metaSubproofVerified) {
@@ -54,14 +113,14 @@ function verifyMetaDerivationChild(metaDerivationChildNode, metaproofContext) {
 
         metaproofContext.addMetaproofStep(metaproofStep);
 
-        metaDerivationChildVerified = true;
+        childVerified = true;
       }
 
       break;
     }
 
     case QUALIFIED_METASTATEMENT_RULE_NAME: {
-      const qualifiedMetastatementNode = metaDerivationChildNode,  ///
+      const qualifiedMetastatementNode = childNode,  ///
             qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, metaproofContext);
 
       if (qualifiedMetastatementVerified) {
@@ -70,14 +129,14 @@ function verifyMetaDerivationChild(metaDerivationChildNode, metaproofContext) {
 
         metaproofContext.addMetaproofStep(metaproofStep);
 
-        metaDerivationChildVerified = qualifiedMetastatementVerified; ///
+        childVerified = qualifiedMetastatementVerified; ///
       }
 
       break;
     }
 
     case UNQUALIFIED_METASTATEMENT_RULE_NAME: {
-      const unqualifiedMetastatementNode = metaDerivationChildNode,  ///
+      const unqualifiedMetastatementNode = childNode,  ///
             unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
 
       if (unqualifiedMetastatementVerified) {
@@ -86,45 +145,12 @@ function verifyMetaDerivationChild(metaDerivationChildNode, metaproofContext) {
 
         metaproofContext.addMetaproofStep(metaproofStep);
 
-        metaDerivationChildVerified = true;
+        childVerified = true;
       }
 
       break;
     }
   }
 
-  return metaDerivationChildVerified;
-}
-
-function verifyMetaSubproof(metaSubproofNode, metaproofContext) {
-  let metaSubproofVerified = false;
-
-  metaproofContext = MetaproofContext.fromMetaproofContext(metaproofContext); ///
-
-  const unqualifiedMetastatementNodes = unqualifiedMetastatementNodesQuery(metaSubproofNode),
-        unqualifiedMetastatementsVerified = unqualifiedMetastatementNodes.every((unqualifiedMetastatementNode) => {
-          const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
-
-          if (unqualifiedMetastatementVerified) {
-            return true;
-          }
-        });
-
-  if (unqualifiedMetastatementsVerified) {
-    unqualifiedMetastatementNodes.forEach((unqualifiedMetastatementNode) => {
-      const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
-            metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
-
-      metaproofContext.addMetaproofStep(metaproofStep);
-    });
-
-    const metaDerivationNode = metaDerivationNodeQuery(metaSubproofNode),
-          metaDerivationVerified = verifyMetaDerivation(metaDerivationNode, metaproofContext);
-
-    if (metaDerivationVerified) {
-      metaSubproofVerified = true;
-    }
-  }
-
-  return metaSubproofVerified;
+  return childVerified;
 }

package/src/verify/metastatement/unqualified.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import verifyMetastatement from "../../verify/metastatement";
-
 import { nodeQuery } from "../../utilities/query";
 import { nodeAsString } from "../../utilities/string";
 
@@ -19,18 +17,14 @@ export default function verifyUnqualifiedMetastatement(unqualifiedMetastatementN
 
     metaproofContext.debug(`Verifying the ${metastatementString} unqualified metastatement...`);
 
-    const metastatementVerified = verifyMetastatement(metastatementNode, metaproofContext);
-
-    if (metastatementVerified) {
-      const derived = metaproofContext.isDerived();
+    const derived = metaproofContext.isDerived();
 
-      if (derived) {
-        const metaAssertionMatches = metaproofContext.matchMetastatement(metastatementNode);
+    if (derived) {
+      const metaAssertionMatches = metaproofContext.matchMetastatement(metastatementNode);
 
-        unqualifiedMetastatementVerified = metaAssertionMatches;  ///
-      } else {
-        unqualifiedMetastatementVerified = true;
-      }
+      unqualifiedMetastatementVerified = metaAssertionMatches;  ///
+    } else {
+      unqualifiedMetastatementVerified = true;
     }
   }
 

package/src/verify/premiseOrPremises.js

@@ -6,17 +6,16 @@ import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified"
 
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement"),
-      unqualifiedMetastatementNodesQuery = nodesQuery("/premise|premises/unqualifiedMetastatement");
+const metastatementNodesQuery = nodesQuery("/premise|premises/unqualifiedMetastatement/metastatement");
 
 export default function verifyPremiseOrPremises(premiseOrPremisesNode, premises, metaproofContext) {
   let premiseOrPremisesVerified;
 
   metaproofContext.begin(premiseOrPremisesNode);
 
-  const unqualifiedMetastatementNodes = unqualifiedMetastatementNodesQuery(premiseOrPremisesNode);
+  const metastatementNodes = metastatementNodesQuery(premiseOrPremisesNode);
 
-  premiseOrPremisesVerified = unqualifiedMetastatementNodes.every((unqualifiedMetastatementNode) => {
+  premiseOrPremisesVerified = metastatementNodes.every((unqualifiedMetastatementNode) => {
     const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
 
     if (unqualifiedMetastatementVerified) {

package/src/verify/statement/unqualified.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import verifyStatement from "../../verify/statement";
-
 import { nodeQuery } from "../../utilities/query";
 import { nodeAsString } from "../../utilities/string";
 
@@ -19,18 +17,14 @@ export default function verifyUnqualifiedStatement(unqualifiedStatementNode, pro
 
     proofContext.debug(`Verifying the ${statementString} unqualified statement...`);
 
-    const statementVerified = verifyStatement(statementNode, proofContext);
-
-    if (statementVerified) {
-      const derived = proofContext.isDerived();
+    const derived = proofContext.isDerived();
 
-      if (derived) {
-        const assertionMatches = proofContext.matchStatement(statementNode);
+    if (derived) {
+      const assertionMatches = proofContext.matchStatement(statementNode);
 
-        unqualifiedStatementVerified = assertionMatches;  ///
-      } else {
-        unqualifiedStatementVerified = true;
-      }
+      unqualifiedStatementVerified = assertionMatches;  ///
+    } else {
+      unqualifiedStatementVerified = true;
     }
   }
 

package/lib/verify/conditinalIndicative.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifyConditionalIndicative;
-    }
-});
-var _consequent = /*#__PURE__*/ _interopRequireDefault(require("../verify/consequent"));
-var _antecedent = /*#__PURE__*/ _interopRequireDefault(require("../verify/antecedent"));
-var _query = require("../utilities/query");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var consequentNodeQuery = (0, _query.nodeQuery)("/conditionalIndicative/consequent!"), antecedentsNodeQuery = (0, _query.nodesQuery)("/conditionalIndicative/antecedent");
-function verifyConditionalIndicative(conditionalIndicativeNode, antecedents, consequents, proofContext) {
-    var conditionalIndicativeVerified = false;
-    proofContext.begin(conditionalIndicativeNode);
-    var consequentNode = consequentNodeQuery(conditionalIndicativeNode), antecedentNodes = antecedentsNodeQuery(conditionalIndicativeNode), antecedentsVerified = antecedentNodes.every(function(antecedentNode) {
-        var antecedentVerified = (0, _antecedent.default)(antecedentNode, antecedents, proofContext);
-        if (antecedentVerified) {
-            return true;
-        }
-    });
-    if (antecedentsVerified) {
-        var consequentVerified = (0, _consequent.default)(consequentNode, consequents, proofContext);
-        conditionalIndicativeVerified = consequentVerified; ///
-    }
-    conditionalIndicativeVerified ? proofContext.complete(conditionalIndicativeNode) : proofContext.halt(conditionalIndicativeNode);
-    return conditionalIndicativeVerified;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvY29uZGl0aW5hbEluZGljYXRpdmUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlDb25zZXF1ZW50IGZyb20gXCIuLi92ZXJpZnkvY29uc2VxdWVudFwiO1xuaW1wb3J0IHZlcmlmeUFudGVjZWRlbnQgZnJvbSBcIi4uL3ZlcmlmeS9hbnRlY2VkZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgY29uc2VxdWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb25kaXRpb25hbEluZGljYXRpdmUvY29uc2VxdWVudCFcIiksXG4gICAgICBhbnRlY2VkZW50c05vZGVRdWVyeSA9IG5vZGVzUXVlcnkoXCIvY29uZGl0aW9uYWxJbmRpY2F0aXZlL2FudGVjZWRlbnRcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeUNvbmRpdGlvbmFsSW5kaWNhdGl2ZShjb25kaXRpb25hbEluZGljYXRpdmVOb2RlLCBhbnRlY2VkZW50cywgY29uc2VxdWVudHMsIHByb29mQ29udGV4dCkge1xuICBsZXQgY29uZGl0aW9uYWxJbmRpY2F0aXZlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBwcm9vZkNvbnRleHQuYmVnaW4oY29uZGl0aW9uYWxJbmRpY2F0aXZlTm9kZSk7XG5cbiAgY29uc3QgY29uc2VxdWVudE5vZGUgPSBjb25zZXF1ZW50Tm9kZVF1ZXJ5KGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUpLFxuICAgICAgICBhbnRlY2VkZW50Tm9kZXMgPSBhbnRlY2VkZW50c05vZGVRdWVyeShjb25kaXRpb25hbEluZGljYXRpdmVOb2RlKSxcbiAgICAgICAgYW50ZWNlZGVudHNWZXJpZmllZCA9IGFudGVjZWRlbnROb2Rlcy5ldmVyeSgoYW50ZWNlZGVudE5vZGUpID0+IHtcbiAgICAgICAgICBjb25zdCBhbnRlY2VkZW50VmVyaWZpZWQgPSB2ZXJpZnlBbnRlY2VkZW50KGFudGVjZWRlbnROb2RlLCBhbnRlY2VkZW50cywgcHJvb2ZDb250ZXh0KTtcblxuICAgICAgICAgIGlmIChhbnRlY2VkZW50VmVyaWZpZWQpIHtcbiAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICAgIH1cbiAgICAgICAgfSk7XG5cbiAgaWYgKGFudGVjZWRlbnRzVmVyaWZpZWQpIHtcbiAgICBjb25zdCBjb25zZXF1ZW50VmVyaWZpZWQgPSB2ZXJpZnlDb25zZXF1ZW50KGNvbnNlcXVlbnROb2RlLCBjb25zZXF1ZW50cywgcHJvb2ZDb250ZXh0KTtcblxuICAgIGNvbmRpdGlvbmFsSW5kaWNhdGl2ZVZlcmlmaWVkID0gY29uc2VxdWVudFZlcmlmaWVkOyAgLy8vXG4gIH1cblxuICBjb25kaXRpb25hbEluZGljYXRpdmVWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUpIDpcbiAgICAgIHByb29mQ29udGV4dC5oYWx0KGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUpO1xuXG4gIHJldHVybiBjb25kaXRpb25hbEluZGljYXRpdmVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlDb25kaXRpb25hbEluZGljYXRpdmUiLCJjb25zZXF1ZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiYW50ZWNlZGVudHNOb2RlUXVlcnkiLCJub2Rlc1F1ZXJ5IiwiY29uZGl0aW9uYWxJbmRpY2F0aXZlTm9kZSIsImFudGVjZWRlbnRzIiwiY29uc2VxdWVudHMiLCJwcm9vZkNvbnRleHQiLCJjb25kaXRpb25hbEluZGljYXRpdmVWZXJpZmllZCIsImJlZ2luIiwiY29uc2VxdWVudE5vZGUiLCJhbnRlY2VkZW50Tm9kZXMiLCJhbnRlY2VkZW50c1ZlcmlmaWVkIiwiZXZlcnkiLCJhbnRlY2VkZW50Tm9kZSIsImFudGVjZWRlbnRWZXJpZmllZCIsInZlcmlmeUFudGVjZWRlbnQiLCJjb25zZXF1ZW50VmVyaWZpZWQiLCJ2ZXJpZnlDb25zZXF1ZW50IiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFVQTs7O2VBQXdCQTs7OytEQVJLOytEQUNBO3FCQUVTOzs7Ozs7QUFFdEMsSUFBTUMsc0JBQXNCQyxJQUFBQSxnQkFBUyxFQUFDLHVDQUNoQ0MsdUJBQXVCQyxJQUFBQSxpQkFBVSxFQUFDO0FBRXpCLFNBQVNKLDRCQUE0QksseUJBQXlCLEVBQUVDLFdBQVcsRUFBRUMsV0FBVyxFQUFFQyxZQUFZLEVBQUU7SUFDckgsSUFBSUMsZ0NBQWdDLEtBQUs7SUFFekNELGFBQWFFLEtBQUssQ0FBQ0w7SUFFbkIsSUFBTU0saUJBQWlCVixvQkFBb0JJLDRCQUNyQ08sa0JBQWtCVCxxQkFBcUJFLDRCQUN2Q1Esc0JBQXNCRCxnQkFBZ0JFLEtBQUssQ0FBQyxTQUFDQyxnQkFBbUI7UUFDOUQsSUFBTUMscUJBQXFCQyxJQUFBQSxtQkFBZ0IsRUFBQ0YsZ0JBQWdCVCxhQUFhRTtRQUV6RSxJQUFJUSxvQkFBb0I7WUFDdEIsT0FBTyxJQUFJO1FBQ2IsQ0FBQztJQUNIO0lBRU4sSUFBSUgscUJBQXFCO1FBQ3ZCLElBQU1LLHFCQUFxQkMsSUFBQUEsbUJBQWdCLEVBQUNSLGdCQUFnQkosYUFBYUM7UUFFekVDLGdDQUFnQ1Msb0JBQXFCLEdBQUc7SUFDMUQsQ0FBQztJQUVEVCxnQ0FDRUQsYUFBYVksUUFBUSxDQUFDZiw2QkFDcEJHLGFBQWFhLElBQUksQ0FBQ2hCLDBCQUEwQjtJQUVoRCxPQUFPSTtBQUNUIn0=