occam-verify-cli 0.0.1003 → 0.0.1006

package/src/premise.js

@@ -1,73 +1,167 @@
 "use strict";
 
+import ProofStep from "./proofStep";
+import LocalContext from "./context/local";
 import metaLevelUnifier from "./unifier/metaLevel";
+import SubproofAssertion from "./assertion/subproof";
+import UnqualifiedStatement from "./statement/unqualified";
 
-import { match } from "./utilities/array";
-import { nodeAsString } from "./utilities/string";
-import { nodeQuery, nodesQuery } from "./utilities/query";
+import { trim } from "./utilities/string";
+import { nodeQuery } from "./utilities/query";
+import { assignAssignments } from "./utilities/assignments";
 
-const subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion!"),
-      subproofAssertionStatementNodesQuery = nodesQuery("/subproofAssertion/statement"),
-      subproofSuppositionStatementNodesQuery = nodesQuery("/subproof/supposition/unqualifiedStatement/statement!"),
-      subproofLastProofStepStatementNodeQuery = nodeQuery("/subproof/subDerivation/lastProofStep/unqualifiedStatement|qualifiedStatement/statement!");
+const unqualifiedStatementNodeQuery = nodeQuery("/premise/unqualifiedStatement");
 
 export default class Premise {
-  constructor(statementNode) {
-    this.statementNode = statementNode;
+  constructor(fileContext, unqualifiedStatement) {
+    this.fileContext = fileContext;
+    this.unqualifiedStatement = unqualifiedStatement;
   }
 
-  getStatementNode() {
-    return this.statementNode;
+  getFileContext() {
+    return this.fileContext;
   }
 
-  unifyStatement(statementNodeB, substitutions, localContextA, localContextB) {
-    let statementUnified = false;
+  getUnqualifiedStatement() {
+    return this.unqualifiedStatement;
+  }
+
+  getString() { return this.unqualifiedStatement.getString(); }
+
+  getStatement() { return this.unqualifiedStatement.getStatement(); }
 
-    if (this.statementNode !== null) {
-      const nodeA = this.statementNode,  ///
-            nodeB = statementNodeB,  ///
-            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
+  unifyProofStep(proofStep, substitutions, localContext) {
+    let proofStepUnified = false;
 
-      statementUnified = unified; ///
+    const subproof = proofStep.getSubproof(),
+          statement = proofStep.getStatement();
+
+    substitutions.snapshot();
+
+    if (false) {
+      ///
+    } else if (subproof !== null) {
+      proofStepUnified = this.unifySubproof(subproof, substitutions, localContext);
+    } else if (statement !== null) {
+      proofStepUnified = this.unifyStatement(statement, substitutions, localContext);
+    }
+
+    proofStepUnified ?
+      substitutions.continue() :
+        substitutions.rollback(localContext);
+
+    return proofStepUnified;
+  }
+
+  unifyStatement(statement, substitutions, localContext) {
+    let statementUnified;
+
+    const premise = this, ///
+          statementString = statement.getString(),
+          premiseStatement = premise.getStatement(),
+          premiseStatementString = premiseStatement.getString();
+
+    localContext.trace(`Unifying the '${statementString}' statement with the premise's '${premiseStatementString}' statement...`);
+
+    const statementNode = statement.getNode(),
+          premiseStatementNode = premiseStatement.getNode(),
+          nodeA = premiseStatementNode,  ///
+          nodeB = statementNode,  ///
+          fileContextA = this.fileContext,  ///
+          localContextA = LocalContext.fromFileContext(fileContextA),
+          localContextB = localContext, ///
+          unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
+
+    statementUnified = unified; ///
+
+    if (statementUnified) {
+      localContext.debug(`...unified the '${statementString}' statement with the premise's '${premiseStatementString}' statement.`);
     }
 
     return statementUnified;
   }
 
-  unifySubproof(subproofNodeB, substitutions, localContextA, localContextB) {
+  unifySubproof(subproof, substitutions, localContext) {
     let subproofUnified = false;
 
-    if (this.statementNode !== null) {
-      const statementNodeA = this.statementNode,
-            subproofAssertionNodeA = subproofAssertionNodeQuery(statementNodeA);  ///
-
-      if (subproofAssertionNodeA !== null) {
-        const subproofAssertionStatementNodesA = subproofAssertionStatementNodesQuery(subproofAssertionNodeA),  ///
-              subproofSuppositionStatementNodesB = subproofSuppositionStatementNodesQuery(subproofNodeB), ///
-              subproofLastProofStepStatementNodeB = subproofLastProofStepStatementNodeQuery(subproofNodeB), ///
-              subproofStatementNodesB = [
-                ...subproofSuppositionStatementNodesB,
-                subproofLastProofStepStatementNodeB
-              ];
-
-        subproofUnified = match(subproofAssertionStatementNodesA, subproofStatementNodesB, (subproofAssertionStatementNodeA, subproofStatementNodeB) => {
-          const nodeA = subproofAssertionStatementNodeA,  ///
-                nodeB = subproofStatementNodeB, ///
-                unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
-
-          if (unified) {
-            return true;
-          }
-        });
-      }
+    const premise = this, ///
+          subproofString = subproof.getString(),
+          premiseStatement = premise.getStatement(),
+          premiseStatementString = premiseStatement.getString();
+
+    localContext.trace(`Unifying the '${subproofString}' subproof with the premise's '${premiseStatementString}' statement...`);
+
+    const statement = this.unqualifiedStatement.getStatement(),
+          statementNode = statement.getNode(),
+          subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, this.fileContext);
+
+    if (subproofAssertion !== null) {
+      subproofUnified = subproofAssertion.unifySubproof(subproof, substitutions, localContext);
+    }
+
+    if (subproofUnified) {
+      localContext.debug(`...unified the '${subproofString}' subproof with the premise's '${premiseStatementString}' statement.`);
     }
 
     return subproofUnified;
   }
 
-  static fromStatementNode(statementNode) {
-    const premise = new Premise(statementNode);
+  verify(localContext) {
+    let verified = false,
+        premiseString = this.getString(); ///
+
+    premiseString = trim(premiseString);  ///
+
+    if (this.unqualifiedStatement !== null) {
+      localContext.trace(`Verifying the '${premiseString}' premise...`);
+
+      const stated = true,
+            assignments = [],
+            unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);
+
+      if (unqualifiedStatementVerified) {
+        const assignmentsAssigned = assignAssignments(assignments, localContext);
+
+        if (assignmentsAssigned) {
+          const proofStep = ProofStep.fromUnqualifiedStatement(this.unqualifiedStatement);
+
+          localContext.addProofStep(proofStep);
+
+          verified = true;
+        }
+      }
+
+      if (verified) {
+        localContext.debug(`...verified the '${premiseString}' premise.`);
+      }
+    } else {
+      localContext.debug(`The '${premiseString}' premise cannot be verified because it is nonsense.`);
+    }
+
+    return verified;
+  }
+
+  toJSON() {
+    const unqualifiedStatementString = this.unqualifiedStatement.getString(),
+          unqualifiedStatement = unqualifiedStatementString,  ///
+          json = {
+            unqualifiedStatement
+          };
+
+    return json;
+  }
+
+  static fromJSON(json, fileContext) {
+    let premise = null;
 
     return premise;
   }
+
+  static fromPremiseNode(premiseNode, fileContext) {
+    const unqualifiedStatementNode = unqualifiedStatementNodeQuery(premiseNode),
+          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),
+          premise = new Premise(fileContext, unqualifiedStatement);
+
+    return premise
+  }
 }

package/src/proof.js

@@ -0,0 +1,58 @@
+"use strict";
+
+import Derivation from "./derivation";
+import LocalContext from "./context/local";
+
+import { nodeQuery } from "./utilities/query";
+
+const derivationNodeQuery = nodeQuery("/proof/derivation");
+
+export default class Proof {
+  constructor(derivation) {
+    this.derivation = derivation;
+  }
+
+  getDerivation() {
+    return this.derivation;
+  }
+
+  getLastProofStep() { return this.derivation.getLastProofStep(); }
+
+  verify(substitutions, conclusion, localContext) {
+    let verified = false;
+
+    localContext = LocalContext.fromLocalContext(localContext); ///
+
+    const derivationVerified = this.derivation.verify(substitutions, localContext);
+
+    if (derivationVerified) {
+      const lastProofStep = localContext.getLastProofStep();
+
+      if (lastProofStep !== null) {
+        const lastProofStep = this.getLastProofStep(),
+              conclusionStatement = conclusion.getStatement(),
+              lastProofStepStatement = lastProofStep.getStatement(),
+              conclusionStatementEqualToLastProofStepStatement = conclusionStatement.isEqualTo(lastProofStepStatement);
+
+        if (conclusionStatementEqualToLastProofStepStatement) {
+          verified = true;
+        }
+      }
+    }
+
+    return verified;
+  }
+
+  static fromProofNode(proofNode, fileContext) {
+    let proof = null;
+
+    if (proofNode !== null) {
+      const derivationNode = derivationNodeQuery(proofNode),
+            derivation = Derivation.fromDerivationNode(derivationNode, fileContext);
+
+      proof = new Proof(derivation);
+    }
+
+    return proof;
+  }
+}

package/src/proofStep.js

@@ -1,45 +1,115 @@
 "use strict";
 
-import unifyStatementWithStatementGivenEquivalences from "./unify/statementWithSttaemetnGivenEquivalences";
+import shim from "./shim";
+import Subproof from "./subproof";
+import QualifiedStatement from "./statement/qualified";
+import UnqualifiedStatement from "./statement/unqualified";
 
-export default class ProofStep {
-  constructor(subproofNode, statementNode) {
-    this.subproofNode = subproofNode;
-    this.statementNode = statementNode;
+import { nodeQuery } from "./utilities/query";
+
+const subproofNodeQuery = nodeQuery("/proofStep|lastProofStep/subproof"),
+      qualifiedStatementNodeQuery = nodeQuery("/proofStep|lastProofStep/qualifiedStatement"),
+      unqualifiedStatementNodeQuery = nodeQuery("/proofStep|lastProofStep/unqualifiedStatement");
+
+class ProofStep {
+  constructor(subproof, qualifiedStatement, unqualifiedStatement) {
+    this.subproof = subproof;
+    this.qualifiedStatement = qualifiedStatement;
+    this.unqualifiedStatement = unqualifiedStatement;
   }
 
-  getSubproofNode() {
-    return this.subproofNode;
+  getSubproof() {
+    return this.subproof;
   }
 
-  getStatementNode() {
-    return this.statementNode;
+  getQualifiedStatement() {
+    return this.qualifiedStatement;
   }
 
-  unifyStatement(statementNodeB, equivalences, localContextA, localContextB) {
-    let statementUnified = false;
+  getUnqualifiedStatement() {
+    return this.unqualifiedStatement;
+  }
 
-    if (this.statementNode !== null) {
-      const statementNodeA = this.statementNode,  ///
-            statementUnifiedWithStatement = unifyStatementWithStatementGivenEquivalences(statementNodeA, statementNodeB, equivalences, localContextA, localContextB);
+  getStatement() {
+    let statement = null;
+
+    if (this.qualifiedStatement !== null) {
+      statement = this.qualifiedStatement.getStatement();
+    }
 
-      statementUnified = statementUnifiedWithStatement;  ///
+    if (this.unqualifiedStatement !== null) {
+      statement = this.unqualifiedStatement.getStatement();
     }
 
-    return statementUnified;
+    return statement;
   }
 
-  static fromSubproofNode(subproofNode) {
-    const statementNode = null,
-          proofStep = new ProofStep(subproofNode, statementNode);
+  // unifyStatement(statementB, equivalences, localContextA, localContextB) {
+  //   let statementUnified = false;
+  //
+  //   if (this.statement !== null) {
+  //     const statementA = this.statement,  ///
+  //           statementUnifiedWithStatement = unifyStatementWithStatementGivenEquivalences(statementA, statementB, equivalences, localContextA, localContextB);
+  //
+  //     statementUnified = statementUnifiedWithStatement;  ///
+  //   }
+  //
+  //   return statementUnified;
+  // }
+
+  verify(substitutions, localContext) {
+    let verified = false;
+
+    if (false) {
+      ///
+    } else if (this.subproof !== null) {
+      const subproofVerified = this.subproof.verify(substitutions, localContext);
+
+      verified = subproofVerified;  ///
+    } else if (this.qualifiedStatement !== null) {
+      const qualifiedStatementVerified = this.qualifiedStatement.verify(substitutions, localContext);
+
+      verified = qualifiedStatementVerified;  ///
+    } else if (this.unqualifiedStatement !== null) {
+      const stated = true,
+            assignments = [],
+            unqualifiedStatementVerified = this.unqualifiedStatement.verify(stated, assignments, localContext);
+
+      verified = unqualifiedStatementVerified;  ///
+    }
+
+    if (verified) {
+      const proofStep = this; ///
+
+      localContext.addProofStep(proofStep);
+    }
+
+    return verified;
+  }
+
+  static fromProofStepNode(proofStepNode, fileContext) {
+    const subproofNode = subproofNodeQuery(proofStepNode),
+          qualifiedStatementNode = qualifiedStatementNodeQuery(proofStepNode),
+          unqualifiedStatementNode = unqualifiedStatementNodeQuery(proofStepNode),
+          subproof = Subproof.fromSubproofNode(subproofNode, fileContext),
+          qualifiedStatement = QualifiedStatement.fromQualifiedStatementNode(qualifiedStatementNode, fileContext),
+          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),
+          proofStep = new ProofStep(subproof, qualifiedStatement, unqualifiedStatement);
 
     return proofStep;
   }
 
-  static fromStatementNode(statementNode) {
-    const subproofNode = null,
-          proofStep = new ProofStep(subproofNode, statementNode);
+  static fromUnqualifiedStatement(unqualifiedStatement) {
+    const subproof = null,
+          qualifiedStatement = null,
+          proofStep = new ProofStep(subproof, qualifiedStatement, unqualifiedStatement);
 
     return proofStep;
   }
 }
+
+Object.assign(shim, {
+  ProofStep
+});
+
+export default ProofStep;

package/src/reference.js

@@ -1,30 +1,76 @@
 "use strict";
 
-import { nodeAsString } from "./utilities/string";
+import Metavariable from "./metavariable";
+
+import { nodeQuery } from "./utilities/query";
+
+const metavariableNodeQuery = nodeQuery("//reference/metavariable");
 
 export default class Reference {
-  constructor(metavariableNode) {
-    this.metavariableNode = metavariableNode;
+  constructor(metavariable) {
+    this.metavariable = metavariable;
   }
 
+  getMetavariable() {
+    return this.metavariable;
+  }
+
+  getString() { return this.metavariable.getString(); }
+
+  matchMetavariableNode(metavariableNode) { return this.metavariable.matchMetavariableNode(metavariableNode); }
+
   getMetavariableNode() {
-    return this.metavariableNode;
+    const metavariableNode = this.metavariable.getNode();
+
+    return metavariableNode;
   }
 
-  matchMetavariableNode(metavariableNode) {
-    const metavariableNodeMatches = this.metavariableNode.match(metavariableNode);
+  verify(fileContext) {
+    let verified;
+
+    const referenceString = this.getString(); ///
+
+    fileContext.trace(`Verifying the '${referenceString}' reference...`);
+
+    verified = true;
 
-    return metavariableNodeMatches;
+    if (verified) {
+      fileContext.debug(`...verified the '${referenceString}' reference.`);
+    }
+
+    return verified;
   }
 
-  asString(tokens) {
-    const string = nodeAsString(this.metavariableNode, tokens);
+  toJSON() {
+    const metavariableJSON = this.metavariable.toJSON(),
+          metavariable = metavariableJSON,  ///
+          string = this.string,
+          json = {
+            string,
+            metavariable
+          };
+
+    return json;
+  }
+
+  static fromJSON(json, fileContext) {
+    const { string } = json;
+
+    let { metavariable } = json;
 
-    return string;
+    json = metavariable;  ///
+
+    metavariable = Metavariable.fromJSON(json, fileContext);
+
+    const reference = new Reference(string, metavariable);
+
+    return reference;
   }
 
-  static fromMetavariableNode(metavariableNode) {
-    const reference = new Reference(metavariableNode);
+  static fromReferenceNode(referenceNode, fileContext) {
+    const metavariableNode = metavariableNodeQuery(referenceNode),
+          metavariable = Metavariable.fromMetavariableNode(metavariableNode, fileContext),
+          reference = new Reference(metavariable);
 
     return reference;
   }