occam-verify-cli 0.0.882 → 0.0.884

package/src/verify/label.js

@@ -2,17 +2,22 @@
 
 import Label from "../label";
 
-export default function verifyLabel(metavariableNode, labels, fileContext) {
+import { nodeQuery } from "../utilities/query";
+
+const metavariableNodeQuery = nodeQuery("/label/metavariable!");
+
+export default function verifyLabel(labelNode, labels, fileContext) {
   let labelVerified = false;
 
-  const labelMetavariableString = fileContext.nodeAsString(metavariableNode);
+  const labelString = fileContext.nodeAsString(labelNode);
 
-  fileContext.trace(`Verifying the '${labelMetavariableString}' label...`, metavariableNode);
+  fileContext.trace(`Verifying the '${labelString}' label...`, labelNode);
 
-  const labelPresent = fileContext.isLabelPresentByMetavariableNode(metavariableNode);
+  const metavariableNode = metavariableNodeQuery(labelNode),
+        labelPresent = fileContext.isLabelPresentByMetavariableNode(metavariableNode);
 
   if (labelPresent) {
-    fileContext.debug(`The '${labelMetavariableString}' label is already present.`, metavariableNode);
+    fileContext.debug(`The '${labelString}' label is already present.`, labelNode);
   } else {
     const label = Label.fromMetavariableNode(metavariableNode);
 
@@ -22,7 +27,7 @@ export default function verifyLabel(metavariableNode, labels, fileContext) {
   }
 
   if (labelVerified) {
-    fileContext.debug(`...verified the '${labelMetavariableString}' label.`, metavariableNode);
+    fileContext.debug(`...verified the '${labelString}' label.`, labelNode);
   }
 
   return labelVerified;

package/src/verify/labels.js

@@ -2,27 +2,16 @@
 
 import verifyLabel from "../verify/label";
 
-import { nodesQuery } from "../utilities/query";
-
-const labelsMetavariableNodesQuery = nodesQuery("/labels/metavariable");
-
-export default function verifyLabels(labelsNode, labels, fileContext) {
+export default function verifyLabels(labelNodes, labels, fileContext) {
   let labelsVerified;
 
-  if (labelsNode === null) {
-    labelsVerified = true;
-  } else {
-    const labelsMetavariableNodes = labelsMetavariableNodesQuery(labelsNode),
-          metavariableNodes = labelsMetavariableNodes;  ///
-
-    labelsVerified = metavariableNodes.every((metavariableNode) => {
-      const labelVerified = verifyLabel(metavariableNode, labels, fileContext);
+  labelsVerified = labelNodes.every((labelNode) => {
+    const labelVerified = verifyLabel(labelNode, labels, fileContext);
 
-      if (labelVerified) {
-        return true;
-      }
-    });
-  }
+    if (labelVerified) {
+      return true;
+    }
+  });
 
   return labelsVerified;
 }

package/src/verify/lemma.js

@@ -12,15 +12,15 @@ import { EMPTY_STRING } from "../constants";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const proofNodeQuery = nodeQuery("/lemma/proof!"),
-      labelsNodeQuery = nodeQuery("/lemma/labels!"),
+      labelNodesQuery = nodesQuery("/lemma/label"),
       consequentNodeQuery = nodeQuery("/lemma/consequent!"),
       suppositionsNodeQuery = nodesQuery("/lemma/supposition");
 
 export default function verifyLemma(lemmaNode, fileContext) {
   let lemmaVerified = false;
 
-  const labelsNode = labelsNodeQuery(lemmaNode),
-        labelsString = fileContext.nodeAsString(labelsNode),
+  const labelNodes = labelNodesQuery(lemmaNode),
+        labelsString = fileContext.nodesAsString(labelNodes),
         localContext = LocalContext.fromFileContext(fileContext);
 
   (labelsString === EMPTY_STRING) ?
@@ -28,7 +28,7 @@ export default function verifyLemma(lemmaNode, fileContext) {
       fileContext.trace(`Verifying the '${labelsString}' lemma...`, lemmaNode);
 
   const labels = [],
-        labelsVerified = verifyLabels(labelsNode, labels, fileContext);
+        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
     const suppositions = [],

package/src/verify/metaLemma.js

@@ -11,7 +11,7 @@ import { first } from "../utilities/array";
 import { EMPTY_STRING } from "../constants";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const labelsNodeQuery = nodeQuery("/metaLemma/labels!"),
+const labelNodesQuery = nodesQuery("/metaLemma/label"),
       metaproofNodeQuery = nodeQuery("/metaLemma/metaproof!"),
       metaConsequentNodeQuery = nodeQuery("/metaLemma/metaConsequent!"),
       metaSuppositionsNodeQuery = nodesQuery("/metaLemma/metaSupposition");
@@ -19,8 +19,8 @@ const labelsNodeQuery = nodeQuery("/metaLemma/labels!"),
 export default function verifyMetaLemma(metaLemmaNode, fileContext) {
   let metaLemmaVerified = false;
 
-  const labelsNode = labelsNodeQuery(metaLemmaNode),
-        labelsString = fileContext.nodeAsString(labelsNode),
+  const labelNodes = labelNodesQuery(metaLemmaNode),
+        labelsString = fileContext.nodesAsString(labelNodes),
         localMetaContext = LocalMetaContext.fromFileContext(fileContext);
 
   (labelsString === EMPTY_STRING) ?
@@ -28,7 +28,7 @@ export default function verifyMetaLemma(metaLemmaNode, fileContext) {
       fileContext.trace(`Verifying the '${labelsString}' meta-lLemma...`, metaLemmaNode);
 
   const labels = [],
-        labelsVerified = verifyLabels(labelsNode, labels, fileContext);
+        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
     const substitutions = [],

package/src/verify/metatheorem.js

@@ -10,7 +10,7 @@ import verifyMetaSuppositions from "../verify/metaSuppositions";
 import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const labelsNodeQuery = nodeQuery("/metatheorem/labels!"),
+const labelNodesQuery = nodesQuery("/metatheorem/label"),
       metaproofNodeQuery = nodeQuery("/metatheorem/metaproof!"),
       metaConsequentNodeQuery = nodeQuery("/metatheorem/metaConsequent!"),
       metaSuppositionsNodeQuery = nodesQuery("/metatheorem/metaSupposition");
@@ -18,14 +18,14 @@ const labelsNodeQuery = nodeQuery("/metatheorem/labels!"),
 export default function verifyMetatheorem(metatheoremNode, fileContext) {
   let metatheoremVerified = false;
 
-  const labelsNode = labelsNodeQuery(metatheoremNode),
-        labelsString = fileContext.nodeAsString(labelsNode),
+  const labelNodes = labelNodesQuery(metatheoremNode),
+        labelsString = fileContext.nodesAsString(labelNodes),
         localMetaContext = LocalMetaContext.fromFileContext(fileContext);
 
   fileContext.trace(`Verifying the '${labelsString}' metatheorem...`, metatheoremNode);
 
   const labels = [],
-        labelsVerified = verifyLabels(labelsNode, labels, fileContext);
+        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
     const substitutions = [],

package/src/verify/rule.js

@@ -10,7 +10,7 @@ import verifyConclusion from "../verify/conclusion";
 import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const labelsNodeQuery = nodeQuery("/rule/labels!"),
+const labelNodesQuery = nodesQuery("/rule/label"),
       premisesNodeQuery = nodesQuery("/rule/premise"),
       ruleProofNodeQuery = nodeQuery("/rule/ruleProof!"),
       conclusionNodeQuery = nodeQuery("/rule/conclusion!");
@@ -18,14 +18,14 @@ const labelsNodeQuery = nodeQuery("/rule/labels!"),
 export default function verifyRule(ruleNode, fileContext) {
   let ruleVerified = false;
 
-  const labelsNode = labelsNodeQuery(ruleNode),
-        labelsString = fileContext.nodeAsString(labelsNode),
+  const labelNodes = labelNodesQuery(ruleNode),
+        labelsString = fileContext.nodesAsString(labelNodes),
         localMetaContext = LocalMetaContext.fromFileContext(fileContext);
 
   fileContext.trace(`Verifying the '${labelsString}' rule...`, ruleNode);
 
   const labels = [],
-        labelsVerified = verifyLabels(labelsNode, labels, fileContext);
+        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
     const premises = [],

package/src/verify/theorem.js

@@ -11,21 +11,21 @@ import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const proofNodeQuery = nodeQuery("/theorem/proof!"),
-      labelsNodeQuery = nodeQuery("/theorem/labels!"),
+      labelNodesQuery = nodesQuery("/theorem/label"),
       consequentNodeQuery = nodeQuery("/theorem/consequent!"),
       suppositionsNodeQuery = nodesQuery("/theorem/supposition");
 
 export default function verifyTheorem(theoremNode, fileContext) {
   let theoremVerified = false;
 
-  const labelsNode = labelsNodeQuery(theoremNode),
-        labelsString = fileContext.nodeAsString(labelsNode),
+  const labelNodes = labelNodesQuery(theoremNode),
+        labelsString = fileContext.nodesAsString(labelNodes),
         localContext = LocalContext.fromFileContext(fileContext);
 
   fileContext.trace(`Verifying the '${labelsString}' theorem...`, theoremNode);
 
   const labels = [],
-        labelsVerified = verifyLabels(labelsNode, labels, fileContext);
+        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
     const suppositions = [],