occam-verify-cli 0.0.265 → 0.0.267

package/bin/verify/conditinalInference.js

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

package/bin/verify/rule.js

@@ -40,13 +40,13 @@ function verifyRule(ruleNode, context) {
           unconditionalInferenceNode = unconditionalInferenceNodeQuery(ruleNode);
 
     if (conditionalInferenceNode !== null) {
-      const conditionalInferenceVerified = verifyConditionalInference(ruleNode, premises, conclusions, context);
+      const conditionalInferenceVerified = verifyConditionalInference(conditionalInferenceNode, premises, conclusions, context);
 
       ruleVerified = conditionalInferenceVerified;  ///
     }
 
     if (unconditionalInferenceNode !== null) {
-      const unconditionalInferenceVerified = verifyUnconditionalInference(ruleNode, premises, conclusions, context);
+      const unconditionalInferenceVerified = verifyUnconditionalInference(unconditionalInferenceNode, premises, conclusions, context);
 
       ruleVerified = unconditionalInferenceVerified;  ///
     }

package/bin/verify/unconditionalInference.js

@@ -8,8 +8,8 @@ const { nodeQuery } = require("../../utilities/query");
 const metastatementNodeQuery = nodeQuery("/*/metastatement"),
       unqualifiedMetastatementNodeQuery = nodeQuery("/rule/unqualifiedMetastatement!");
 
-function verifyUnqualifiedMetastatementRule(ruleNode, premises, conclusions, context) {
-  let unqualifiedMetastatementRuleVerified = false;
+function verifyUnconditionalInference(ruleNode, premises, conclusions, context) {
+  let unconditionalInferenceVerified = false;
 
   const unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(ruleNode);
 
@@ -22,11 +22,11 @@ function verifyUnqualifiedMetastatementRule(ruleNode, premises, conclusions, con
 
       conclusions.push(conclusion);
 
-      unqualifiedMetastatementRuleVerified = true;
+      unconditionalInferenceVerified = true;
     }
   }
 
-  return unqualifiedMetastatementRuleVerified;
+  return unconditionalInferenceVerified;
 }
 
-module.exports = verifyUnqualifiedMetastatementRule;
+module.exports = verifyUnconditionalInference;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.265",
+  "version": "0.0.267",
   "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.346",
+    "occam-custom-grammars": "^5.0.348",
     "occam-dom": "^3.0.171",
     "occam-grammar-utilities": "^7.0.66",
-    "occam-grammars": "^1.0.313",
+    "occam-grammars": "^1.0.315",
     "occam-open-cli": "^5.0.37",
     "occam-parsers": "^16.0.122"
   },