occam-verify-cli 0.0.264 → 0.0.265

package/bin/verify/conditinalInference.js

@@ -0,0 +1,45 @@
+"use strict";
+
+const verifyMetaproof = require("../../verify/metaproof"),
+      verifyConclusion = require("../../verify/conclusion"),
+      verifyPremiseOrPremises = require("../../verify/premiseOrPremises");
+
+const { nodeQuery } = require("../../utilities/query");
+
+const metaproofNodeQuery = nodeQuery("/rule/metaproof!"),
+      conclusionNodeQuery = nodeQuery("/conditionalInference/conclusion!"),
+      premiseOrPremisesNodeQuery = nodeQuery("/conditionalInference/premise|premises!");
+
+function verifyConditionalInference(ruleNode, premises, conclusions, context) {
+  let conditinalInferenceVerified = false;
+
+  const inferenceConditionalNode = inferenceConditionalNodeQuery(ruleNode);
+
+  if (inferenceConditionalNode !== null) {
+    const premiseOrPremisesNode = premiseOrPremisesNodeQuery(inferenceConditionalNode),
+          premiseOrPremisesVerified = verifyPremiseOrPremises(premiseOrPremisesNode, premises, context);
+
+    if (premiseOrPremisesVerified) {
+      const conclusionNode = conclusionNodeQuery(inferenceConditionalNode),
+            conclusionVerified = verifyConclusion(conclusionNode, conclusions, context);
+
+
+      const metaproofNode = metaproofNodeQuery(ruleNode);
+
+      let metaproofVerified = true;
+
+      if (metaproofNode !== null) {
+        metaproofVerified = verifyMetaproof(metaproofNode, rules, context);
+      }
+
+      if (metaproofVerified) {
+        ruleVerified = true;
+      }
+      conditinalInferenceVerified = conclusionVerified;
+    }
+  }
+
+  return conditinalInferenceVerified;
+}
+
+module.exports = verifyConditionalInference;

package/bin/verify/rule.js

@@ -4,10 +4,9 @@ const { loggingUtilities } = require("necessary");
 
 const Rule = require("../rule"),
       verifyLabels = require("../verify/labels"),
-      verifyMetaproof = require("../verify/metaproof"),
       MetaproofContext = require("../context/metaproof"),
-      verifyInferenceConditionalRule = require("../verify/rule/inferenceConditional"),
-      verifyUnqualifiedMetastatementRule = require("../verify/rule/unqualifiedMetastatement");
+      verifyConditionalInference = require("../verify/conditinalInference"),
+      verifyUnconditionalInference = require("../verify/unconditionalInference");
 
 const { first } = require("../utilities/array"),
       { nodesAsString } = require("../utilities/string"),
@@ -16,7 +15,8 @@ const { first } = require("../utilities/array"),
 const { log } = loggingUtilities;
 
 const labelNodesQuery = nodesQuery("/rule/label"),
-      metaproofNodeQuery = nodeQuery("/rule/metaproof!");
+      conditionalInferenceNodeQuery = nodeQuery("/rule/conditionalInference!"),
+      unconditionalInferenceNodeQuery = nodeQuery("/rule/unconditionalInference!");
 
 function verifyRule(ruleNode, context) {
   let ruleVerified = false;
@@ -30,39 +30,36 @@ function verifyRule(ruleNode, context) {
         labelsVerified = verifyLabels(labelNodes, labels, context);
 
   if (labelsVerified) {
-  }
-
-  const metaproofContext = MetaproofContext.fromContext(context);
-
-  context = metaproofContext; ///
+    const metaproofContext = MetaproofContext.fromContext(context);
 
-  const premises = [],
-        conclusions = [],
-        inferenceConditionalRuleVerified = verifyInferenceConditionalRule(ruleNode, premises, conclusions, context),
-        unqualifiedMetastatementRuleVerified = verifyUnqualifiedMetastatementRule(ruleNode, premises, conclusions, context);
+    context = metaproofContext; ///
 
-  if (inferenceConditionalRuleVerified || unqualifiedMetastatementRuleVerified) {
-    const metaproofNode = metaproofNodeQuery(ruleNode);
+    const premises = [],
+          conclusions = [],
+          conditionalInferenceNode = conditionalInferenceNodeQuery(ruleNode),
+          unconditionalInferenceNode = unconditionalInferenceNodeQuery(ruleNode);
 
-    let metaproofVerified = true;
+    if (conditionalInferenceNode !== null) {
+      const conditionalInferenceVerified = verifyConditionalInference(ruleNode, premises, conclusions, context);
 
-    if (metaproofNode !== null) {
-      metaproofVerified = verifyMetaproof(metaproofNode, rules, context);
+      ruleVerified = conditionalInferenceVerified;  ///
     }
 
-    if (metaproofVerified) {
-      ruleVerified = true;
+    if (unconditionalInferenceNode !== null) {
+      const unconditionalInferenceVerified = verifyUnconditionalInference(ruleNode, premises, conclusions, context);
+
+      ruleVerified = unconditionalInferenceVerified;  ///
     }
-  }
 
-  if (ruleVerified) {
-    const firstConclusion = first(conclusions),
-          conclusion = firstConclusion, ///
-          rule = Rule.fromPremisesConclusionAndLabels(premises, conclusion, labels);
+    if (ruleVerified) {
+      const firstConclusion = first(conclusions),
+            conclusion = firstConclusion, ///
+            rule = Rule.fromPremisesConclusionAndLabels(premises, conclusion, labels);
 
-    context.addRule(rule);
+      context.addRule(rule);
 
-    log.info(`Verified the '${labelsString}' rule.`);
+      log.info(`Verified the '${labelsString}' rule.`);
+    }
   }
 
   return ruleVerified;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.264",
+  "version": "0.0.265",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,10 +12,10 @@
   "dependencies": {
     "argumentative": "^2.0.15",
     "necessary": "^11.0.40",
-    "occam-custom-grammars": "^5.0.345",
+    "occam-custom-grammars": "^5.0.346",
     "occam-dom": "^3.0.171",
     "occam-grammar-utilities": "^7.0.66",
-    "occam-grammars": "^1.0.312",
+    "occam-grammars": "^1.0.313",
     "occam-open-cli": "^5.0.37",
     "occam-parsers": "^16.0.122"
   },

package/bin/verify/rule/inferenceConditional.js

@@ -1,32 +0,0 @@
-"use strict";
-
-const verifyConclusion = require("../../verify/conclusion"),
-      verifyPremiseOrPremises = require("../../verify/premiseOrPremises");
-
-const { nodeQuery } = require("../../utilities/query");
-
-const conclusionNodeQuery = nodeQuery("/inferenceConditional/conclusion!"),
-      premiseOrPremisesNodeQuery = nodeQuery("/inferenceConditional/premise|premises!"),
-      inferenceConditionalNodeQuery = nodeQuery("/rule/inferenceConditional!");
-
-function verifyInferenceConditionalRule(ruleNode, premises, conclusions, context) {
-  let inferenceConditionalRuleVerified = false;
-
-  const inferenceConditionalNode = inferenceConditionalNodeQuery(ruleNode);
-
-  if (inferenceConditionalNode !== null) {
-    const premiseOrPremisesNode = premiseOrPremisesNodeQuery(inferenceConditionalNode),
-          premiseOrPremisesVerified = verifyPremiseOrPremises(premiseOrPremisesNode, premises, context);
-
-    if (premiseOrPremisesVerified) {
-      const conclusionNode = conclusionNodeQuery(inferenceConditionalNode),
-            conclusionVerified = verifyConclusion(conclusionNode, conclusions, context);
-
-      inferenceConditionalRuleVerified = conclusionVerified;
-    }
-  }
-
-  return inferenceConditionalRuleVerified;
-}
-
-module.exports = verifyInferenceConditionalRule;