occam-verify-cli 0.0.464 → 0.0.466

package/src/verify/theorem.js

@@ -1,17 +1,20 @@
 "use strict";
 
 import Theorem from "../theorem";
-import verifyLabels from "../verify/labels";
+import verifyProof from "../verify/proof";
 import ProofContext from "../context/proof";
-import verifyUnqualifiedStatement from "../verify/statement/unqualified";
-import verifyIndicativeConditional from "../verify/indicativeConditional";
+import verifyLabels from "../verify/labels";
+import verifyConditionalIndicative from "../verify/conditinalIndicative";
+import verifyUnconditionalIndicative from "../verify/unconditionalIndicative";
 
+import { first } from "../utilities/array";
 import { nodesAsString } from "../utilities/string";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const labelNodesQuery = nodesQuery("/theorem/label"),
-      unqualifiedStatementNodeQuery = nodeQuery("/theorem/unqualifiedStatement!"),
-      indicativeConditionalNodeQuery = nodeQuery("/theorem/indicativeConditional!");
+const proofNodeQuery = nodeQuery("/theorem/proof!"),
+      labelNodesQuery = nodesQuery("/theorem/label"),
+      conditionalIndicativeNodeQuery = nodeQuery("/theorem/conditionalIndicative!"),
+      unconditionalIndicativeNodeQuery = nodeQuery("/theorem/unconditionalIndicative!");
 
 export default function verifyTheorem(theoremNode, fileContext) {
   let theoremVerified = false;
@@ -25,29 +28,38 @@ export default function verifyTheorem(theoremNode, fileContext) {
   fileContext.debug(`Verifying the '${labelsString}' theorem...`);
 
   const labels = [],
-    labelsVerified = verifyLabels(labelNodes, labels, fileContext);
+        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
-    const unqualifiedStatementNode = unqualifiedStatementNodeQuery(theoremNode),
-          indicativeConditionalNode = indicativeConditionalNodeQuery(theoremNode);
+    const antecedents = [],
+          consequents = [],
+          conditionalIndicativeNode = conditionalIndicativeNodeQuery(theoremNode),
+          unconditionalIndicativeNode = unconditionalIndicativeNodeQuery(theoremNode);
 
-    let unqualifiedStatementVerified = false,
-      indicativeConditionalVerified = false;
+    let conditionalIndicativeVerified = false,
+        unconditionalIndicativeVerified = false;
 
-    if (unqualifiedStatementNode !== null) {
-      unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
+    if (conditionalIndicativeNode !== null) {
+      conditionalIndicativeVerified = verifyConditionalIndicative(conditionalIndicativeNode, antecedents, consequents, proofContext);
     }
 
-    if (indicativeConditionalNode !== null) {
-      indicativeConditionalVerified = verifyIndicativeConditional(indicativeConditionalNode, proofContext);
+    if (unconditionalIndicativeNode !== null) {
+      unconditionalIndicativeVerified = verifyUnconditionalIndicative(unconditionalIndicativeNode, consequents, proofContext);
     }
 
-    if (unqualifiedStatementVerified || indicativeConditionalVerified) {
-      const theorem = Theorem.fromLabelsUnqualifiedStatementNodeAndIndicativeConditionalNode(labels, unqualifiedStatementNode, indicativeConditionalNode);
+    if (conditionalIndicativeVerified || unconditionalIndicativeVerified) {
+      const proofNode = proofNodeQuery(theoremNode),
+            firstConsequent = first(consequents),
+            consequent = firstConsequent, ///
+            proofVerified = verifyProof(proofNode, consequent, proofContext);
+
+      if (proofVerified) {
+        const theorem = Theorem.fromLabelsAntecedentsAndConsequent(labels, antecedents, consequent);
 
-      fileContext.addTheorem(theorem);
+        fileContext.addTheorem(theorem);
 
-      theoremVerified = true;
+        theoremVerified = true;
+      }
     }
   }
 
@@ -57,7 +69,7 @@ export default function verifyTheorem(theoremNode, fileContext) {
 
   theoremVerified ?
     fileContext.complete(theoremNode) :
-      fileContext.halt(theoremNode);
+      fileContext.complete(theoremNode);
 
   return theoremVerified;
 }

package/src/verify/unconditionalIndicative.js

@@ -0,0 +1,24 @@
+"use strict";
+
+import verifyConsequent from "../verify/consequent";
+
+import { nodeQuery } from "../utilities/query";
+
+const consequentNodeQuery = nodeQuery("/unconditionalIndicative/consequent!");
+
+export default function verifyUnconditionalIndicative(conditionalIndicativeNode, consequents, proofContext) {
+  let unconditionalIndicativeVerified;
+
+  proofContext.begin(conditionalIndicativeNode);
+
+  const consequentNode = consequentNodeQuery(conditionalIndicativeNode),
+        consequentVerified = verifyConsequent(consequentNode, consequents, proofContext);
+
+  unconditionalIndicativeVerified = consequentVerified;  ///
+
+  unconditionalIndicativeVerified ?
+    proofContext.complete(conditionalIndicativeNode) :
+      proofContext.halt(conditionalIndicativeNode);
+
+  return unconditionalIndicativeVerified;
+}

package/src/verify/indicativeConditional.js

@@ -1,29 +0,0 @@
-"use strict";
-
-import verifyUnqualifiedStatement from "../verify/statement/unqualified";
-
-import { nodesQuery } from "../utilities/query";
-
-const unqualifiedStatementNodesQuery = nodesQuery("/indicativeConditional/unqualifiedStatement");
-
-export default function verifyIndicativeConditional(indicativeConditionalNode, proofContext) {
-  let indicativeConditionalVerified;
-
-  proofContext.begin(indicativeConditionalNode);
-
-  const unqualifiedStatementNodes = unqualifiedStatementNodesQuery(indicativeConditionalNode);
-
-  indicativeConditionalVerified = unqualifiedStatementNodes.every((unqualifiedStatementNode) => {
-    const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
-
-    if (unqualifiedStatementVerified) {
-      return true;
-    }
-  });
-
-  indicativeConditionalVerified ?
-    proofContext.complete(indicativeConditionalNode) :
-      proofContext.halt(indicativeConditionalNode);
-
-  return indicativeConditionalVerified;
-}