occam-verify-cli 0.0.271 → 0.0.272

package/bin/axiom.js

@@ -3,9 +3,9 @@
 const { labelsAsString } = require("./utilities/string");
 
 class Axiom {
-  constructor(labels, antecedent, consequent, statementNode) {
+  constructor(labels, supposition, consequent, statementNode) {
     this.labels = labels;
-    this.antecedent = antecedent;
+    this.supposition = supposition;
     this.consequent = consequent;
     this.statementNode = statementNode;
   }
@@ -14,8 +14,8 @@ class Axiom {
     return this.labels;
   }
 
-  getAntecedent() {
-    return this.antecedent;
+  getSupposition() {
+    return this.supposition;
   }
 
   getConsequent() {
@@ -33,16 +33,16 @@ class Axiom {
   }
 
   static fromStatementNodeAndLabels(statementNode, labels) {
-    const antecedent = null,
+    const supposition = null,
           consequent = null,
-          axiom = new Axiom(labels, antecedent, consequent, statementNode);
+          axiom = new Axiom(labels, supposition, consequent, statementNode);
 
     return axiom;
   }
 
-  static fromAntecedentConsequentAndLabels(antecedent, consequent, labels) {
+  static fromSuppositionConsequentAndLabels(supposition, consequent, labels) {
     const statementNode = null,
-          axiom = new Axiom(labels, antecedent, consequent, statementNode);
+          axiom = new Axiom(labels, supposition, consequent, statementNode);
 
     return axiom;
   }

package/bin/verify/axiom/IndicativeConditional.js

@@ -2,7 +2,7 @@
 
 const Axiom = require("../../axiom"),
       verifyLabels = require("../../verify/labels"),
-      verifyAntecedent = require("../../verify/antecedent"),
+      verifySupposition = require("../../verify/antecedent"),
       verifyConsequent = require("../../verify/consequent");
 
 const { first } = require("../../utilities/array"),
@@ -26,7 +26,7 @@ function verifyIndicativeConditionalAxiom(axiomNode, context) {
     if (labelsVerified) {
       const antecedents = [],
             antecedentNode = antecedentNodeQuery(indicativeConditionalNode),
-            antecedentVerified = verifyAntecedent(antecedentNode, antecedents, context);
+            antecedentVerified = verifySupposition(antecedentNode, antecedents, context);
 
       if (antecedentVerified) {
         const consequents = [],
@@ -34,11 +34,11 @@ function verifyIndicativeConditionalAxiom(axiomNode, context) {
               consequentVerified = verifyConsequent(consequentNode, consequents, context);
 
         if (consequentVerified) {
-          const firstAntecedent = first(antecedents),
+          const firstSupposition = first(antecedents),
                 firstConsequent = first(consequents),
-                antecedent = firstAntecedent, ///
+                antecedent = firstSupposition, ///
                 consequent = firstConsequent, ///
-                axiom = Axiom.fromAntecedentConsequentAndLabels(antecedent, consequent, labels);
+                axiom = Axiom.fromSuppositionConsequentAndLabels(antecedent, consequent, labels);
 
           context.addAxiom(axiom);
 

package/bin/verify/metaDerivation.js

@@ -2,14 +2,14 @@
 
 const MetaAssertion = require("../metaAssertion"),
       MetaproofContext = require("../context/metaproof"),
-      verifyMetaAntecedent = require("../verify/metaAntecedent"),
+      verifyMetaSupposition = require("../verify/metaSupposition"),
       verifyQualifiedMetastatement = require("../verify/metastatement/qualified"),
       verifyUnqualifiedMetastatement = require("../verify/metastatement/unqualified");
 
 const { nodeQuery, nodesQuery } = require("../utilities/query"),
       { META_SUBPROOF_RULE_NAME, QUALIFIED_METASTATEMENT_RULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } = require("../ruleNames");
 
-const metaAntecedentNodeQuery = nodeQuery("/metaSubproof/metaAntecedent!"),
+const metaSuppositionNodeQuery = nodeQuery("/metaSubproof/metaSupposition!"),
       metaDerivationNodeQuery = nodeQuery("/metaSubproof/metaDerivation!"),
       metaDerivationChildNodesQuery = nodesQuery("/metaDerivation/*"),
       qualifiedMetastatementNodeQuery = nodeQuery("/metaSubproof/qualifiedMetastatement!"),
@@ -89,10 +89,10 @@ function verifyMetaSubproof(metaSubproofNode, context) {
 
   context = metaproofContext; ///
 
-  const metaAntecedentNode = metaAntecedentNodeQuery(metaSubproofNode),
-        metaAntecedentVerified = verifyMetaAntecedent(metaAntecedentNode, context);
+  const metaSuppositionNode = metaSuppositionNodeQuery(metaSubproofNode),
+        metaSuppositionVerified = verifyMetaSupposition(metaSuppositionNode, context);
 
-  if (metaAntecedentVerified) {
+  if (metaSuppositionVerified) {
     let metaDerivationVerified = true;
 
     const metaDerivationNode = metaDerivationNodeQuery(metaSubproofNode);

package/bin/verify/{metaAntecedent.js → metaSupposition.js}

@@ -5,20 +5,20 @@ const MetaAssertion = require("../metaAssertion"),
 
 const { nodeQuery } = require("../utilities/query");
 
-const unqualifiedMetastatementNodeQuery = nodeQuery("/metaAntecedent/unqualifiedMetastatement!");
+const unqualifiedMetastatementNodeQuery = nodeQuery("/metaSupposition/unqualifiedMetastatement!");
 
-function verifyMetaAntecedent(metaAntecedentNode, context) {
-  const unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(metaAntecedentNode),
+function verifyMetaSupposition(metaSuppositionNode, context) {
+  const unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(metaSuppositionNode),
         unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, context),
-        metaAntecedentVerified = unqualifiedMetastatementVerified;  ///
+        metaSuppositionVerified = unqualifiedMetastatementVerified;  ///
 
-  if (metaAntecedentVerified) {
+  if (metaSuppositionVerified) {
     const metaAssertion = MetaAssertion.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);
 
     context.addMetaAssertion(metaAssertion);
   }
 
-  return metaAntecedentVerified;
+  return metaSuppositionVerified;
 }
 
-module.exports = verifyMetaAntecedent;
+module.exports = verifyMetaSupposition;

package/bin/verify/supposition.js

@@ -0,0 +1,24 @@
+"use strict";
+
+const Assertion = require("../assertion"),
+      verifyUnqualifiedStatement = require("../verify/statement/unqualified");
+
+const { nodeQuery } = require("../utilities/query");
+
+const unqualifiedStatementNodeQuery = nodeQuery("/supposition/unqualifiedStatement!");
+
+function verifySupposition(suppositionNode, suppositions, context) {
+  const unqualifiedStatementNode = unqualifiedStatementNodeQuery(suppositionNode),
+        unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, context),
+        suppositionVerified = unqualifiedStatementVerified;
+
+  if (suppositionVerified) {
+    const supposition = Assertion.fromUnqualifiedStatementNode(unqualifiedStatementNode);
+
+    suppositions.push(supposition);
+  }
+
+  return suppositionVerified;
+}
+
+module.exports = verifySupposition;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.271",
+  "version": "0.0.272",
   "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.352",
+    "occam-custom-grammars": "^5.0.353",
     "occam-dom": "^3.0.171",
     "occam-grammar-utilities": "^7.0.66",
-    "occam-grammars": "^1.0.319",
+    "occam-grammars": "^1.0.320",
     "occam-open-cli": "^5.0.37",
     "occam-parsers": "^16.0.122"
   },

package/bin/verify/antecedent.js

@@ -1,24 +0,0 @@
-"use strict";
-
-const Assertion = require("../assertion"),
-      verifyUnqualifiedStatement = require("../verify/statement/unqualified");
-
-const { nodeQuery } = require("../utilities/query");
-
-const unqualifiedStatementNodeQuery = nodeQuery("/antecedent/unqualifiedStatement!");
-
-function verifyAntecedent(antecedentNode, antecedents, context) {
-  const unqualifiedStatementNode = unqualifiedStatementNodeQuery(antecedentNode),
-        unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, context),
-        antecedentVerified = unqualifiedStatementVerified;
-
-  if (antecedentVerified) {
-    const antecedent = Assertion.fromUnqualifiedStatementNode(unqualifiedStatementNode);
-
-    antecedents.push(antecedent);
-  }
-
-  return antecedentVerified;
-}
-
-module.exports = verifyAntecedent;