occam-verify-cli 0.0.445 → 0.0.447

package/src/premise.js

@@ -6,10 +6,10 @@ import { nodeAsString } from "./utilities/string";
 import { first, second } from "./utilities/array";
 import { nodeQuery, nodesQuery } from "./utilities/query";
 import { metavariableNameFromMetavariableNode } from "./utilities/query";
-import { METAVARIABLE_RULE_NAME, METASTATEMENT_RULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from "./ruleNames";
+import { metastatementNodeFromMetastatementJSON } from "./utilities/node";
+import { METAVARIABLE_RULE_NAME, METASTATEMENT_RULE_NAME } from "./ruleNames";
 
-const metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement"),
-      metastatementNodesQuery = nodesQuery("/metaSubproofAssertion/metastatement"),
+const metastatementNodesQuery = nodesQuery("/metaSubproofAssertion/metastatement"),
       metaSubproofAssertionNodeQuery = nodeQuery("/metastatement/metaSubproofAssertion!"),
       qualifiedOrUnqualifiedMetastatementMetastatementNodesQuery = nodesQuery("/metaSubproof/qualifiedMetastatement|unqualifiedMetastatement/metastatement!");
 
@@ -29,23 +29,25 @@ export default class Premise {
 
     if (metaSubproofAssertionNode !== null) {
       const metaSubproofAssertionMetastatementNodes = metastatementNodesQuery(metaSubproofAssertionNode),
-            firstMetaSubproofAssertionMetastatementNode = first(metaSubproofAssertionMetastatementNodes),
             qualifiedOrUnqualifiedMetastatementMetastatementNodes = qualifiedOrUnqualifiedMetastatementMetastatementNodesQuery(metaSubproofNode),
-            firstQualifiedOrUnqualifiedMetastatementMetastatementNode = first(qualifiedOrUnqualifiedMetastatementMetastatementNodes);
+            qualifiedOrUnqualifiedMetastatementMetastatementNodesLength = qualifiedOrUnqualifiedMetastatementMetastatementNodes.length;
 
-      const nonTerminalNode = firstQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
-            premiseNonTerminalNode = firstMetaSubproofAssertionMetastatementNode,  ///
-            premiseNonTerminalNodeMatches = matchPremiseNonTerminalNode(premiseNonTerminalNode, nonTerminalNode, metaSubstitutions);
-
-      if (premiseNonTerminalNodeMatches) {
-        const secondMetaSubproofAssertionMetastatementNode = second(metaSubproofAssertionMetastatementNodes),
-              secondQualifiedOrUnqualifiedMetastatementMetastatementNode = second(qualifiedOrUnqualifiedMetastatementMetastatementNodes);
-
-        const nonTerminalNode = secondQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
-              premiseNonTerminalNode = secondMetaSubproofAssertionMetastatementNode, ///
+      if (qualifiedOrUnqualifiedMetastatementMetastatementNodesLength === 2) {
+        const firstMetaSubproofAssertionMetastatementNode = first(metaSubproofAssertionMetastatementNodes),
+              firstQualifiedOrUnqualifiedMetastatementMetastatementNode = first(qualifiedOrUnqualifiedMetastatementMetastatementNodes),
+              nonTerminalNode = firstQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
+              premiseNonTerminalNode = firstMetaSubproofAssertionMetastatementNode,  ///
               premiseNonTerminalNodeMatches = matchPremiseNonTerminalNode(premiseNonTerminalNode, nonTerminalNode, metaSubstitutions);
 
-        metaSubproofNodeMatches = premiseNonTerminalNodeMatches; ///
+        if (premiseNonTerminalNodeMatches) {
+          const secondMetaSubproofAssertionMetastatementNode = second(metaSubproofAssertionMetastatementNodes),
+                secondQualifiedOrUnqualifiedMetastatementMetastatementNode = second(qualifiedOrUnqualifiedMetastatementMetastatementNodes),
+                nonTerminalNode = secondQualifiedOrUnqualifiedMetastatementMetastatementNode, ///
+                premiseNonTerminalNode = secondMetaSubproofAssertionMetastatementNode, ///
+                premiseNonTerminalNodeMatches = matchPremiseNonTerminalNode(premiseNonTerminalNode, nonTerminalNode, metaSubstitutions);
+
+          metaSubproofNodeMatches = premiseNonTerminalNodeMatches; ///
+        }
       }
     }
 
@@ -73,12 +75,8 @@ export default class Premise {
 
   static fromJSON(json, releaseContext) {
     const { metastatement } = json,
-          ruleName = UNQUALIFIED_METASTATEMENT_RULE_NAME,
-          content = `${metastatement}
-`,
-          node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
-          unqualifiedMetastatementNode = node,  ///
-          metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
+          metastatementJSON = metastatement,  ///
+          metastatementNode = metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext),
           premise = new Premise(metastatementNode);
 
     return premise;

package/src/utilities/array.js

@@ -6,7 +6,7 @@ import permutationsMatrix from "../permutationsMatrix";
 
 import { MAXIMUM_INDEXES_LENGTH, MAXIMUM_PERMUTATION_LENGTH } from "../constants";
 
-export const { push, last, prune, first, third, second, filter } = arrayUtilities;
+export const { front, first, second, third, last, push, prune, filter } = arrayUtilities;
 
 export function someSubArray(array, subArrayLength, callback) {
   let found = false;

package/src/utilities/node.js

@@ -0,0 +1,50 @@
+"use strict";
+
+import { nodeQuery } from "../utilities/query";
+import { TERM_RULE_NAME,
+         LABEL_RULE_NAME,
+         UNQUALIFIED_STATEMENT_RULE_NAME,
+         UNQUALIFIED_METASTATEMENT_RULE_NAME } from "../ruleNames";
+
+const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement"),
+      metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement");
+
+export function termNodeFromTermJSON(termJSON, releaseContext) {
+  const ruleName = TERM_RULE_NAME,
+        content = termJSON, ///
+        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+        termNode = node;  ///
+
+  return termNode;
+}
+
+export function labelNodeFromLabelJSON(labelJSON, releaseContext) {
+  const content = labelJSON, ///
+        ruleName = LABEL_RULE_NAME,
+        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+        labelNode = node; ///
+
+  return labelNode;
+}
+
+export function statementNodeFromStatementJSON(statementJSON, releaseContext) {
+  const ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,
+        content = `${statementJSON}
+`,
+        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+        unqualifiedStatementNode = node,  ///
+        statementNode = statementNodeQuery(unqualifiedStatementNode);
+
+  return statementNode;
+}
+
+export function metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext) {
+  const ruleName = UNQUALIFIED_METASTATEMENT_RULE_NAME,
+        content = `${metastatementJSON}
+`,
+        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+        unqualifiedMetastatementNode = node,  ///
+        metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
+
+  return metastatementNode;
+}

package/src/verify/axiom.js

@@ -6,7 +6,7 @@ import ProofContext from "../context/proof";
 import verifyUnqualifiedStatement from "../verify/statement/unqualified";
 import verifyIndicativeConditional from "../verify/indicativeConditional";
 
-import { first, second } from "../utilities/array";
+import { front, last } from "../utilities/array";
 import { nodesAsString } from "../utilities/string";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
@@ -52,11 +52,11 @@ export default function verifyAxiom(axiomNode, fileContext) {
 
       if (indicativeConditionalVerified !== null) {
         const statementNodes = statementNodesQuery(indicativeConditionalNode),
-              firstStatementNode = first(statementNodes),
-              secondStatementNode = second(statementNodes),
-              consequentStatementNode = secondStatementNode,  ///
-              suppositionStatementNode = firstStatementNode,  ///
-              axiom = Axiom.fromLabelsSuppositionStatementNodeConsequentAndStatementNode(labels, suppositionStatementNode, consequentStatementNode);
+              lastStatementNode = last(statementNodes),
+              frontStatementNodes = front(statementNodes),
+              consequentStatementNode = lastStatementNode,  ///
+              suppositionStatementNodes = frontStatementNodes,  ///
+              axiom = Axiom.fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode);
 
         fileContext.addAxiom(axiom);
 

package/src/verify/metaDerivation.js

@@ -5,7 +5,7 @@ import MetaproofContext from "../context/metaproof";
 import verifyQualifiedMetastatement from "../verify/metastatement/qualified";
 import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified";
 
-import { first, second } from "../utilities/array";
+import { front, last } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 import { META_SUBPROOF_RULE_NAME, QUALIFIED_METASTATEMENT_RULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from "../ruleNames";
 
@@ -95,14 +95,22 @@ function verifyMetaSubproof(metaSubproofNode, metaproofContext) {
   metaproofContext = MetaproofContext.fromMetaproofContext(metaproofContext); ///
 
   const qualifiedOrUnqualifiedMetastatementNodes = qualifiedOrUnqualifiedMetastatementNodesQuery(metaSubproofNode),
-        firstQualifiedOrUnqualifiedMetastatementNode = first(qualifiedOrUnqualifiedMetastatementNodes),
-        unqualifiedMetastatementNode = firstQualifiedOrUnqualifiedMetastatementNode,  ///
-        unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
+        frontQualifiedOrUnqualifiedMetastatementNodes = front(qualifiedOrUnqualifiedMetastatementNodes),
+        unqualifiedMetastatementNodes = frontQualifiedOrUnqualifiedMetastatementNodes,  ///
+        unqualifiedMetastatementsVerified = unqualifiedMetastatementNodes.every((unqualifiedMetastatementNode) => {
+          const unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
 
-  if (unqualifiedMetastatementVerified) {
-    const metaAssertion = MetaAssertion.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);
+          if (unqualifiedMetastatementVerified) {
+            return true;
+          }
+        });
+
+  if (unqualifiedMetastatementsVerified) {
+    unqualifiedMetastatementNodes.forEach((unqualifiedMetastatementNode) => {
+      const metaAssertion = MetaAssertion.fromUnqualifiedMetastatementNode(unqualifiedMetastatementNode);
 
-    metaproofContext.addMetaAssertion(metaAssertion);
+      metaproofContext.addMetaAssertion(metaAssertion);
+    });
 
     let metaDerivationVerified = true;
 
@@ -113,8 +121,8 @@ function verifyMetaSubproof(metaSubproofNode, metaproofContext) {
     }
 
     if (metaDerivationVerified) {
-      const secondQualifiedOrUnqualifiedMetastatementNode = second(qualifiedOrUnqualifiedMetastatementNodes),
-            qualifiedOrUnqualifiedMetastatementNode = secondQualifiedOrUnqualifiedMetastatementNode,  ///
+      const lastQualifiedOrUnqualifiedMetastatementNode = last(qualifiedOrUnqualifiedMetastatementNodes),
+            qualifiedOrUnqualifiedMetastatementNode = lastQualifiedOrUnqualifiedMetastatementNode,  ///
             qualifiedMetastatementNode = qualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode),
             unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(qualifiedOrUnqualifiedMetastatementNode);