occam-verify-cli 0.0.1247 → 0.0.1248

package/src/dom/metatheorem.js

@@ -1,28 +1,18 @@
 "use strict";
 
-import LocalContext from "../context/local";
-import TopLevelAssertion from "./topLevelAssertion";
+import TopLevelMetaAssertion from "./topLevelMetaAssertion";
 
 import { domAssigned } from "../dom";
-import { stringFromLabels } from "./topLevelAssertion";
-import { labelsFromJSON,
-         labelsToLabelsJSON,
-         consequentFromJSON,
-         suppositionsFromJSON,
-         substitutionsFromJSON,
-         consequentToConsequentJSON,
-         suppositionsToSuppositionsJSON,
-         substitutionsToSubstitutionsJSON } from "../utilities/json";
 
-export default domAssigned(class Metatheorem extends TopLevelAssertion {
+export default domAssigned(class Metatheorem extends TopLevelMetaAssertion {
   verify() {
     let verified;
 
-    const metatheorem = this, ///
+    const metaLemma = this, ///
           fileContext = this.getFileContext(),
-          metatheoremString = metatheorem.getString();
+          metaLemmaString = metaLemma.getString();
 
-    fileContext.trace(`Verifying the '${metatheoremString}' metatheorem...`);
+    fileContext.trace(`Verifying the '${metaLemmaString}' metatheorem...`);
 
     verified = super.verify();
 
@@ -31,86 +21,15 @@ export default domAssigned(class Metatheorem extends TopLevelAssertion {
 
       fileContext.addMetatheorem(metaTheorem);
 
-      fileContext.debug(`...verified the '${metatheoremString}' metatheorem.`);
+      fileContext.debug(`...verified the '${metaLemmaString}' metatheorem.`);
     }
 
     return verified;
   }
 
-  verifyLabels() {
-    const labelsVerified = this.labels.every((label) => {
-      const nameOnly = false,
-            labelVerified = label.verify(nameOnly);
-
-      if (labelVerified) {
-        return true;
-      }
-    });
-
-    return labelsVerified;
-  }
-
-  unifyStatement(statement, substitutions, context) {
-    let statementUnified;
-
-    const metatheorem = this, ///
-          statementString = statement.getString(),
-          metatheoremString = metatheorem.getString();
-
-    context.trace(`Unifying the '${statementString}' statement with the '${metatheoremString}' metatheorem...`);
-
-    const suppositions = this.getSuppositions(),
-          suppositionsLength = suppositions.length;
-
-    if (suppositionsLength === 0) {
-      const fileContext = this.getFileContext(),
-            localContext = LocalContext.fromFileContext(fileContext),
-            generalContext = localContext,  ///
-            specificContext = context,  ///
-            statementUnifiedWithConsequent = this.unifyStatementWithConsequent(statement, substitutions, generalContext, specificContext);
-
-      statementUnified = statementUnifiedWithConsequent;  ///
-    }
-
-    if (statementUnified) {
-      context.debug(`...unified the '${statementString}' statement with the '${metatheoremString}' metatheorem.`);
-    }
-
-    return statementUnified;
-  }
-
-  toJSON() {
-    const labelsJSON = labelsToLabelsJSON(this.labels),
-          consequentJSON = consequentToConsequentJSON(this.consequent),
-          suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
-          substitutionsJSON = substitutionsToSubstitutionsJSON(this.substitutions),
-          labels = labelsJSON,  ///
-          consequent = consequentJSON,  ///
-          suppositions = suppositionsJSON,  ///
-          substitutions = substitutionsJSON,  ///
-          json = {
-            labels,
-            consequent,
-            suppositions,
-            substitutions
-          };
-
-    return json;
-  }
-
   static name = "Metatheorem";
 
-  static fromJSON(json, fileContext) {
-    const labels = labelsFromJSON(json, fileContext),
-          consequent = consequentFromJSON(json, fileContext),
-          suppositions = suppositionsFromJSON(json, fileContext),
-          substitutions = substitutionsFromJSON(json, fileContext),
-          string = stringFromLabels(labels),
-          proof = null,
-          topLevelAssertion = new Metatheorem(fileContext, string, labels, substitutions, suppositions, consequent, proof);
-
-    return topLevelAssertion;
-  }
+  static fromJSON(json, fileContext) { return TopLevelMetaAssertion.fromJSON(Metatheorem, json, fileContext); }
 
-  static fromMetatheoremNode(metatheoremNode, fileContext) { return TopLevelAssertion.fromNode(Metatheorem, metatheoremNode, fileContext); }
+  static fromMetatheoremNode(axiomNode, fileContext) { return TopLevelMetaAssertion.fromNode(Metatheorem, axiomNode, fileContext); }
 });

package/src/dom/reference.js

@@ -80,7 +80,7 @@ export default domAssigned(class Reference {
     return metavariableVerified;
   }
 
-  unifyLabel(label, substitutions, context) {
+  unifyLabel(label, context) {
     let labelUnified;
 
     const reference = this, ///
@@ -89,7 +89,7 @@ export default domAssigned(class Reference {
 
     context.trace(`Unifying the '${labelString}' label with the '${referenceString}' reference...`);
 
-    const labelUnifiedWithReference = unifyLabelWithReference(label, reference, substitutions,  context);
+    const labelUnifiedWithReference = unifyLabelWithReference(label, reference,  context);
 
     labelUnified = labelUnifiedWithReference; ///
 
@@ -100,6 +100,48 @@ export default domAssigned(class Reference {
     return labelUnified;
   }
 
+  unifyMetaLemma(metaLemma, context) {
+    let metaLemmaUnified;
+
+    const reference = this, ///
+          referenceString = reference.getString(),
+          metaLemmaString = metaLemma.getString();
+
+    context.trace(`Unifying the '${metaLemmaString}' meta-lemma with the '${referenceString}' reference...`);
+
+    const label = metaLemma.getLabel(),
+          labelUnified = this.unifyLabel(label, context);
+
+    metaLemmaUnified = labelUnified;  ///
+
+    if (metaLemmaUnified) {
+      context.trace(`...unified the '${metaLemmaString}' meta-lemma with the '${referenceString}' reference.`);
+    }
+
+    return metaLemmaUnified;
+  }
+
+  unifyMetatheorem(metatheorem, context) {
+    let metatheoremUnified;
+
+    const reference = this, ///
+          referenceString = reference.getString(),
+          metatheoremString = metatheorem.getString();
+
+    context.trace(`Unifying the '${metatheoremString}' metatheorem with the '${referenceString}' reference...`);
+
+    const label = metatheorem.getLabel(),
+          labelUnified = this.unifyLabel(label, context);
+
+    metatheoremUnified = labelUnified;  ///
+
+    if (metatheoremUnified) {
+      context.trace(`...unified the '${metatheoremString}' metatheorem with the '${referenceString}' reference.`);
+    }
+
+    return metatheoremUnified;
+  }
+
   unifyMetavariable(metavariable, context) {
     let metavariableUnified;
 

package/src/dom/rule.js

@@ -7,8 +7,8 @@ import LocalContext from "../context/local";
 import Substitutions from "../substitutions";
 
 import { domAssigned } from "../dom";
-import { stringFromLabels } from "./topLevelAssertion";
 import { nodeQuery, nodesQuery } from "../utilities/query";
+import { labelsStringFromLabels } from "./topLevelAssertion";
 import { labelsFromJSON,
          premisesFromJSON,
          conclusionFromJSON,
@@ -230,7 +230,8 @@ export default domAssigned(class Rule {
           labels = labelsFromJSON(json, fileContext),
           premises = premisesFromJSON(json, fileContext),
           conclusion = conclusionFromJSON(json, fileContext),
-          string = stringFromLabels(labels);
+          labelsString = labelsStringFromLabels(labels),
+          string = labelsString;  ///
 
     rule = new Rule(fileContext, string, labels, premises, conclusion, proof);
 
@@ -242,7 +243,8 @@ export default domAssigned(class Rule {
           premises = premisesFromRuleNode(ruleNode, fileContext),
           conclusion = conclusionFromRuleNode(ruleNode, fileContext),
           proof = proofFromRuleNode(ruleNode, fileContext),
-          string = stringFromLabels(labels),
+          labelsString = labelsStringFromLabels(labels),
+          string = labelsString,  ///
           rule = new Rule(fileContext, string, labels, premises, conclusion, proof);
 
     return rule;

package/src/dom/topLevelAssertion.js

@@ -6,7 +6,6 @@ import dom from "../dom";
 import LocalContext from "../context/local";
 import Substitutions from "../substitutions";
 
-import { EMPTY_STRING } from "../constants";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 import { labelsFromJSON,
          labelsToLabelsJSON,
@@ -25,11 +24,10 @@ const proofNodeQuery = nodeQuery("/*/proof"),
       suppositionNodesQuery = nodesQuery("/*/supposition");
 
 export default class TopLevelAssertion {
-  constructor(fileContext, string, labels, substitutions, suppositions, consequent, proof) {
+  constructor(fileContext, string, labels, suppositions, consequent, proof) {
     this.fileContext = fileContext;
     this.string = string;
     this.labels = labels;
-    this.substitutions = substitutions;
     this.suppositions = suppositions;
     this.consequent = consequent;
     this.proof = proof;
@@ -47,10 +45,6 @@ export default class TopLevelAssertion {
     return this.labels;
   }
 
-  getSubstitutions() {
-    return this.substitutions;
-  }
-
   getSuppositions() {
     return this.suppositions;
   }
@@ -84,14 +78,14 @@ export default class TopLevelAssertion {
 
     if (labelsVerified) {
       const localContext = LocalContext.fromFileContext(this.fileContext),
-        context = localContext, ///
-        suppositionsVerified = this.suppositions.every((supposition) => {
-          const suppositionVerified = supposition.verify(context);
+            context = localContext, ///
+            suppositionsVerified = this.suppositions.every((supposition) => {
+              const suppositionVerified = supposition.verify(context);
 
-          if (suppositionVerified) {
-            return true;
-          }
-        });
+              if (suppositionVerified) {
+                return true;
+              }
+            });
 
       if (suppositionsVerified) {
         const consequentVerified = this.consequent.verify(context);
@@ -100,7 +94,8 @@ export default class TopLevelAssertion {
           if (this.proof === null) {
             verified = true;
           } else {
-            const proofVerified = this.proof.verify(this.substitutions, this.consequent, context);
+            const substitutions = Substitutions.fromNothing(),
+                  proofVerified = this.proof.verify(substitutions, this.consequent, context);
 
             verified = proofVerified; ///
           }
@@ -114,7 +109,7 @@ export default class TopLevelAssertion {
   verifyLabels() {
     const labelsVerified = this.labels.every((label) => {
       const nameOnly = true,
-        labelVerified = label.verify(nameOnly);
+            labelVerified = label.verify(nameOnly);
 
       if (labelVerified) {
         return true;
@@ -229,16 +224,13 @@ export default class TopLevelAssertion {
     const labelsJSON = labelsToLabelsJSON(this.labels),
           consequentJSON = consequentToConsequentJSON(this.consequent),
           suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
-          substitutionsJSON = substitutionsToSubstitutionsJSON(this.substitutions),
           labels = labelsJSON,  ///
           consequent = consequentJSON,  ///
           suppositions = suppositionsJSON,  ///
-          substitutions = substitutionsJSON,  ///
           json = {
             labels,
             consequent,
-            suppositions,
-            substitutions
+            suppositions
           };
 
     return json;
@@ -246,51 +238,29 @@ export default class TopLevelAssertion {
 
   static fromJSON(Class, json, fileContext) {
     const labels = labelsFromJSON(json, fileContext),
-          consequent = consequentFromJSON(json, fileContext),
+          labelsString = labelsStringFromLabels(labels),
           suppositions = suppositionsFromJSON(json, fileContext),
-          substitutions = substitutionsFromJSON(json, fileContext),
-          string = stringFromLabels(labels),
+          consequent = consequentFromJSON(json, fileContext),
           proof = null,
-          topLevelAssertion = new Class(fileContext, string, labels, substitutions, suppositions, consequent, proof);
+          string = labelsString,  ///
+          topLevelAssertion = new Class(fileContext, string, labels, suppositions, consequent, proof);
 
     return topLevelAssertion;
   }
 
   static fromNode(Class, node, fileContext) {
     const labels = labelsFromNode(node, fileContext),
-          substitutions = Substitutions.fromNothing(),
+          labelsString = labelsStringFromLabels(labels),
           suppositions = suppositionsFromNode(node, fileContext),
           consequent = consequentFromNode(node, fileContext),
           proof = proofFromNode(node, fileContext),
-          string = stringFromLabels(labels),
-          metaLemma = new Class(fileContext, string, labels, substitutions, suppositions, consequent, proof);
+          string = labelsString,  ///
+          metaLemma = new Class(fileContext, string, labels, suppositions, consequent, proof);
 
     return metaLemma;
   }
 }
 
-export function stringFromLabels(labels) {
-  const string = labels.reduce((string, label) => {
-    const labelString = label.getString();
-
-    string = (string === EMPTY_STRING) ?
-               labelString: ///
-                 `${string},${labelString}`;
-
-    return string;
-  }, EMPTY_STRING);
-
-  return string;
-}
-
-function proofFromNode(node, fileContext) {
-  const { Proof } = dom,
-        proofNode = proofNodeQuery(node),
-        proof = Proof.fromProofNode(proofNode, fileContext);
-
-  return proof;
-}
-
 function labelsFromNode(node, fileContext) {
   const { Label } = dom,
         labelNodes = labelNodesQuery(node),
@@ -303,7 +273,15 @@ function labelsFromNode(node, fileContext) {
   return labels;
 }
 
-function consequentFromNode(node, fileContext) {
+export function proofFromNode(node, fileContext) {
+  const { Proof } = dom,
+        proofNode = proofNodeQuery(node),
+        proof = Proof.fromProofNode(proofNode, fileContext);
+
+  return proof;
+}
+
+export function consequentFromNode(node, fileContext) {
   const { Consequent } = dom,
         consequentNode = consequentNodeQuery(node),
         consequent = Consequent.fromConsequentNode(consequentNode, fileContext);
@@ -311,7 +289,7 @@ function consequentFromNode(node, fileContext) {
   return consequent;
 }
 
-function suppositionsFromNode(node, fileContext) {
+export function suppositionsFromNode(node, fileContext) {
   const { Supposition } = dom,
         suppositionNodes = suppositionNodesQuery(node),
         suppositions = suppositionNodes.map((suppositionNode) => {
@@ -323,3 +301,16 @@ function suppositionsFromNode(node, fileContext) {
   return suppositions;
 }
 
+export function labelsStringFromLabels(labels) {
+  const labelsString = labels.reduce((labelsString, label) => {
+    const labelString = label.getString();
+
+    labelsString = (labelsString === null) ?
+                      labelString: ///
+                        `${labelsString},${labelString}`;
+
+    return labelsString;
+  }, null);
+
+  return labelsString;
+}

package/src/dom/topLevelMetaAssertion.js

@@ -0,0 +1,154 @@
+"use strict";
+
+import { arrayUtilities } from "necessary";
+
+import dom from "../dom";
+import LocalContext from "../context/local";
+import Substitutions from "../substitutions";
+import TopLevelAssertion from "./topLevelAssertion";
+
+import { nodeQuery } from "../utilities/query";
+import { proofFromNode, consequentFromNode, suppositionsFromNode, labelsStringFromLabels } from "./topLevelAssertion";
+import { labelsFromJSON,
+         labelsToLabelsJSON,
+         consequentFromJSON,
+         suppositionsFromJSON,
+         substitutionsFromJSON,
+         consequentToConsequentJSON,
+         suppositionsToSuppositionsJSON,
+         substitutionsToSubstitutionsJSON } from "../utilities/json";
+
+const { first } = arrayUtilities;
+
+const labelNodeQuery = nodeQuery("/metatheorem/label");
+
+export default class TopLevelMetaAssertion extends TopLevelAssertion {
+  constructor(fileContext, string, labels, suppositions, consequent, proof, substitutions) {
+    super(fileContext, string, labels, suppositions, consequent, proof);
+
+    this.substitutions = substitutions;
+  }
+
+  getSubstitutions() {
+    return this.substitutions;
+  }
+
+  getLabel() {
+    const labels = this.getLabels(),
+          firstLabel = first(labels),
+          label = firstLabel; ///
+
+    return label;
+  }
+
+  verify() {
+    let verified = false;
+
+    const labelsVerified = this.verifyLabels();
+
+    if (labelsVerified) {
+      const localContext = LocalContext.fromFileContext(this.fileContext),
+            context = localContext, ///
+            suppositionsVerified = this.suppositions.every((supposition) => {
+              const suppositionVerified = supposition.verify(context);
+
+              if (suppositionVerified) {
+                return true;
+              }
+            });
+
+      if (suppositionsVerified) {
+        const consequentVerified = this.consequent.verify(context);
+
+        if (consequentVerified) {
+          if (this.proof === null) {
+            verified = true;
+          } else {
+            const proofVerified = this.proof.verify(this.substitutions, this.consequent, context);
+
+            verified = proofVerified; ///
+          }
+        }
+      }
+    }
+
+    return verified;
+  }
+
+  verifyLabels() {
+    const labelsVerified = this.labels.every((label) => {
+      const nameOnly = false,
+            labelVerified = label.verify(nameOnly);
+
+      if (labelVerified) {
+        return true;
+      }
+    });
+
+    return labelsVerified;
+  }
+
+  verifyWhenStated(statement, reference, context) {
+    let verifiedWhenStated;
+
+    debugger
+
+    return verifiedWhenStated;
+  }
+
+  toJSON() {
+    const labelsJSON = labelsToLabelsJSON(this.labels),
+          consequentJSON = consequentToConsequentJSON(this.consequent),
+          suppositionsJSON = suppositionsToSuppositionsJSON(this.suppositions),
+          substitutionsJSON = substitutionsToSubstitutionsJSON(this.substitutions),
+          labels = labelsJSON,  ///
+          consequent = consequentJSON,  ///
+          suppositions = suppositionsJSON,  ///
+          substitutions = substitutionsJSON,  ///
+          json = {
+            labels,
+            consequent,
+            suppositions,
+            substitutions
+          };
+
+    return json;
+  }
+
+  static fromJSON(Class, json, fileContext) {
+    const labels = labelsFromJSON(json, fileContext),
+          substitutions = substitutionsFromJSON(json, fileContext),
+          labelsString = labelsStringFromLabels(labels),
+          suppositions = suppositionsFromJSON(json, fileContext),
+          consequent = consequentFromJSON(json, fileContext),
+          proof = null,
+          string = labelsString,  ///
+          topLevelAssertion = new Class(fileContext, string, labels, suppositions, consequent, proof, substitutions);
+
+    return topLevelAssertion;
+  }
+
+  static fromNode(Class, node, fileContext) {
+    const labels = labelsFromNode(node, fileContext),
+          substitutions = Substitutions.fromNothing(),
+          labelsString = labelsStringFromLabels(labels),
+          suppositions = suppositionsFromNode(node, fileContext),
+          consequent = consequentFromNode(node, fileContext),
+          proof = proofFromNode(node, fileContext),
+          string = labelsString,  ///
+          metaLemma = new Class(fileContext, string, labels, suppositions, consequent, proof, substitutions);
+
+    return metaLemma;
+  }
+}
+
+function labelsFromNode(node, fileContext) {
+  const { Label } = dom,
+        labelNode = labelNodeQuery(node),
+        label = Label.fromLabelNode(labelNode, fileContext),
+        labels = [
+          label
+        ];
+
+  return labels;
+}

package/src/utilities/string.js

@@ -18,12 +18,12 @@ export function nodesAsString(nodes, tokens) {
   const string = nodes.reduce((string, node) => {
     const nodeString = nodeAsString(node, tokens);
 
-    string = (string === EMPTY_STRING) ?
+    string = (string === null) ?
                nodeString :
                 `${string},${nodeString}`;
 
     return string;
-  }, EMPTY_STRING);
+  }, null);
 
   return string;
 }

package/src/utilities/unification.js

@@ -82,7 +82,7 @@ export function unifyMetavariable(generalMetavariable, specificMetavariable, gen
   return metavariableUnified;
 }
 
-export function unifyLabelWithReference(label, reference, substitutions, context) {
+export function unifyLabelWithReference(label, reference, context) {
   let labelUnifiedWithReference;
 
   let generalContext,
@@ -104,7 +104,8 @@ export function unifyLabelWithReference(label, reference, substitutions, context
 
   specificContext = contextFromTokens(referenceMetavariableTokens, specificContext);  ///
 
-  const referenceUnified = referenceUnifier.unify(labelMetavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);
+  const substitutions = Substitutions.fromNothing(),
+        referenceUnified = referenceUnifier.unify(labelMetavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);
 
   labelUnifiedWithReference = referenceUnified; ///