occam-verify-cli 0.0.524 → 0.0.526

package/src/constructor.js

@@ -20,16 +20,16 @@ export default class Constructor {
     return this.type;
   }
 
-  asString() {
+  asString(tokens) {
     let string;
 
-    const termString = nodeAsString(this.termNode);
+    const termString = nodeAsString(this.termNode, tokens);
 
     if (this.type === null) {
       string = `${termString}`;
     } else {
       const noSuperType = true,
-            typeString = this.type.asString(noSuperType);
+            typeString = this.type.asString(tokens, noSuperType);
 
       string = `${termString}:${typeString}`;
     }
@@ -37,11 +37,11 @@ export default class Constructor {
     return string;
   }
 
-  toJSON() {
-    const termString = nodeAsString(this.termNode),
+  toJSON(tokens) {
+    const termString = nodeAsString(this.termNode, tokens),
           typeJSON = (this.type === null) ?
                         null :
-                          this.type.toJSON(),
+                          this.type.toJSON(tokens),
           kind = CONSTRUCTOR_KIND,
           term = termString,  ///
           type = typeJSON,  ///

package/src/context/file.js

@@ -3,6 +3,7 @@
 import { rewriteNodes } from "occam-grammar-utilities";
 
 import { push } from "../utilities/array";
+import { nodeAsString, nodesAsString } from "../utilities/string";
 import { leastLineIndexFromNodeAndTokens, greatestLineIndexFromNodeAndTokens } from "../utilities/tokens";
 
 export default class FileContext {
@@ -343,6 +344,18 @@ export default class FileContext {
     this.constructors.push(constructor);
   }
 
+  nodeAsString(node) {
+    const string = nodeAsString(node, this.tokens);
+
+    return string;
+  }
+
+  nodesAsString(node) {
+    const string = nodesAsString(node, this.tokens);
+
+    return string;
+  }
+
   trace(message) { this.releaseContext.trace(message); }
 
   debug(message) { this.releaseContext.debug(message); }
@@ -380,43 +393,43 @@ export default class FileContext {
     const json = [];
 
     this.types.forEach((type) => {
-      const typeJSON = type.toJSON();
+      const typeJSON = type.toJSON(this.tokens);
 
       json.push(typeJSON);
     });
 
     this.rules.forEach((rule) => {
-      const ruleJSON = rule.toJSON();
+      const ruleJSON = rule.toJSON(this.tokens);
 
       json.push(ruleJSON);
     });
 
     this.axioms.forEach((axiom) => {
-      const axiomJSON = axiom.toJSON();
+      const axiomJSON = axiom.toJSON(this.tokens);
 
       json.push(axiomJSON);
     });
 
     this.lemmas.forEach((lemma) => {
-      const lemmaJSON = lemma.toJSON();
+      const lemmaJSON = lemma.toJSON(this.tokens);
 
       json.push(lemmaJSON);
     });
 
     this.theorems.forEach((theorem) => {
-      const theoremJSON = theorem.toJSON();
+      const theoremJSON = theorem.toJSON(this.tokens);
 
       json.push(theoremJSON);
     });
 
     this.combinators.forEach((combinator) => {
-      const combinatorJSON = combinator.toJSON();
+      const combinatorJSON = combinator.toJSON(this.tokens);
 
       json.push(combinatorJSON);
     });
 
     this.constructors.forEach((constructor) => {
-      const constructorJSON = constructor.toJSON();
+      const constructorJSON = constructor.toJSON(this.tokens);
 
       json.push(constructorJSON)
     });

package/src/context/metaproof.js

@@ -61,6 +61,10 @@ class MetaproofContext {
     return metastatementMatches;
   }
 
+  nodeAsString(node) { return this.context.nodeAsString(node); }
+
+  nodesAsString(node) { return this.context.nodesAsString(node); }
+
   static fromFileContext(fileContext) {
     const context = fileContext,  ///
           metaproofSteps = [],

package/src/context/proof.js

@@ -121,6 +121,10 @@ class ProofContext {
 
   isTypePresentByTypeName(typeName) { return this.context.isTypePresentByTypeName(typeName); }
 
+  nodeAsString(node) { return this.context.nodeAsString(node); }
+
+  nodesAsString(node) { return this.context.nodesAsString(node); }
+
   static fromFileContext(fileContext) {
     const context = fileContext,  ///
           variables = [],

package/src/equality.js

@@ -1,9 +1,10 @@
 "use strict";
 
 import { nodeQuery } from "./utilities/query";
+import { TERM_RULE_NAME } from "./ruleNames";
 
-const leftTermNodeQuery = nodeQuery("/statement/term[0]"),
-      rightTermNodeQuery = nodeQuery("/statement/term[1]");
+const leftTermNodeQuery = nodeQuery("/statement/argument[0]/term!"),
+      rightTermNodeQuery = nodeQuery("/statement/argument[1]/term!");
 
 export default class Equality {
   constructor(leftTermNode, rightTermNode) {
@@ -11,7 +12,7 @@ export default class Equality {
     this.rightTermNode = rightTermNode;
   }
 
-  getLdftTermNode() {
+  getLeftTermNode() {
     return this.leftTermNode;
   }
 
@@ -19,8 +20,79 @@ export default class Equality {
     return this.rightTermNode;
   }
 
-  assert(proofContext) {
-    debugger
+  match(equality, equalities) {
+    let matches = false;
+
+    const leftTermNode = equality.getLeftTermNode(),
+          rightTermNode = equality.getRightTermNode();
+
+    if (!matches) {
+      const reversed = false,
+            leftTermNodeAndRightTermNodeMatch = this.matchLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode, reversed, equalities);
+
+      matches = leftTermNodeAndRightTermNodeMatch;  ///
+    }
+
+    if (!matches) {
+      const reversed = true,
+            leftTermNodeAndRightTermNodeMatch = this.matchLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode, reversed, equalities);
+
+      matches = leftTermNodeAndRightTermNodeMatch;  ///
+    }
+
+    return matches;
+  }
+
+  matchLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode, reversed, equalities) {
+    let leftTermNodeAndRightTermNodeMatch = true;
+
+    if (leftTermNodeAndRightTermNodeMatch) {
+      const leftNonTerminalNode = reversed ?
+                                    this.rightTermNode :
+                                      this.leftTermNode,  ///
+            rightNonTerminalNode = leftTermNode,  ///
+            nonTerminalNodeEquates = equateNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities);
+
+      leftTermNodeAndRightTermNodeMatch = nonTerminalNodeEquates; ///
+    }
+
+    if (leftTermNodeAndRightTermNodeMatch) {
+      const leftNonTerminalNode = reversed ?
+                                    this.leftTermNode :
+                                      this.rightTermNode,  ///
+            rightNonTerminalNode = rightTermNode,  ///
+            nonTerminalNodeEquates = equateNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities);
+
+      leftTermNodeAndRightTermNodeMatch = nonTerminalNodeEquates; ///
+    }
+
+    return leftTermNodeAndRightTermNodeMatch;
+  }
+
+  equate(equalities) {
+    const leftNonTerminalNode = this.leftTermNode,  ///
+          rightNonTerminalNode = this.rightTermNode,  ///
+          nonTerminalNodeEquates = equateNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities),
+          equates = nonTerminalNodeEquates; ///
+
+    return equates;
+  }
+
+  static fromProofStep(proofStep) {
+    let equality = null;
+
+    const statementNode = proofStep.getStatementNode();
+
+    if (statementNode !== null) {
+      const leftTermNode = leftTermNodeQuery(statementNode),
+            rightTermNode = rightTermNodeQuery(statementNode);
+
+      if ((leftTermNode !== null) && (rightTermNode !== null)) {
+        equality = new Equality(leftTermNode, rightTermNode);
+      }
+    }
+
+    return equality;
   }
 
   static fromStatementNode(statementNode) {
@@ -30,4 +102,129 @@ export default class Equality {
 
     return equality;
   }
+
+  static fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode) {
+    const equality = new Equality(leftTermNode, rightTermNode);
+
+    return equality;
+  }
+}
+
+function equateNode(nodeA, nodeB, equalities) {
+  let nodeEquates = false;
+
+  const nodeATerminalNode = nodeA.isTerminalNode(),
+        nodeBTerminalNode = nodeB.isTerminalNode();
+
+  if (nodeATerminalNode === nodeBTerminalNode) {
+    if (nodeATerminalNode) {
+      const terminalNodeA = nodeA,  ///
+            terminalNodeB = nodeB,  ///
+            terminalNodeEquates = equateTerminalNode(terminalNodeA, terminalNodeB, equalities);
+
+      nodeEquates = terminalNodeEquates;  ///
+    } else {
+      const nonTerminalNodeA = nodeA,  ///
+            nonTerminalNodeB = nodeB, ///
+            nonTerminalNodeEquates = equateNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, equalities);
+
+      nodeEquates = nonTerminalNodeEquates; ///
+    }
+  }
+
+  return nodeEquates;
+}
+
+function equateNodes(leftNodes, rightNodes, equalities) {
+  let nodesEquate = false;
+
+  const leftNodesLength = leftNodes.length,
+        rightNodesLength = rightNodes.length;
+
+  if (leftNodesLength === rightNodesLength) {
+    nodesEquate = leftNodes.every((LeftNode, index) => {
+      const rightNode = rightNodes[index],
+            nodeEquates = equateNode(LeftNode, rightNode, equalities);
+
+      if (nodeEquates) {
+        return true;
+      }
+    });
+  }
+
+  return nodesEquate;
+}
+
+function equateTerminalNode(terminalNodeA, terminalNodeB, equalities) {
+  const matches = terminalNodeA.match(terminalNodeB),
+        terminalNodeEquates = matches;  ///
+
+  return terminalNodeEquates;
+}
+
+function equateNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities) {
+  let nonTerminalNodeEquates = false;
+
+  const leftNonTerminalNodeRuleName = leftNonTerminalNode.getRuleName(),
+        rightNonTerminalNodeRuleName = rightNonTerminalNode.getRuleName();
+
+  if (leftNonTerminalNodeRuleName === rightNonTerminalNodeRuleName) {
+    const ruleName = leftNonTerminalNodeRuleName, ///
+          ruleNameTermRuleName = (ruleName === TERM_RULE_NAME);
+
+    if (ruleNameTermRuleName) {
+      const leftTermNode = leftNonTerminalNode, ///
+            rightTermNode = rightNonTerminalNode, ///
+            termNodeEquates = equateTermNode(leftTermNode, rightTermNode, equalities);
+
+      nonTerminalNodeEquates = termNodeEquates;  ///
+    }
+
+    if (!nonTerminalNodeEquates) {
+      const leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(),
+            rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(),
+            leftNodes = leftNonTerminalNodeChildNodes, ///
+            rightNodes = rightNonTerminalNodeChildNodes, ///
+            nodesEquate = equateNodes(leftNodes, rightNodes, equalities);
+
+      nonTerminalNodeEquates = nodesEquate; ///
+    }
+  }
+
+  return nonTerminalNodeEquates;
+}
+
+function equateTermNode(leftTermNode, rightTermNode, equalities) {
+  const equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode),
+        equalityA = equality, ///
+        equalityMatches = equalities.some((equality) => { ///
+          let equalitiesB = equalities; ///
+
+          const equalityB = equality; ///
+
+          equalitiesB = filterEqualities(equalitiesB, equalityB);  ///
+
+          const equalityAMatchesEqualityB = equalityA.match(equalityB, equalitiesB);
+
+          if (equalityAMatchesEqualityB) {
+            return true;
+          }
+        }),
+        termNodeEquates = equalityMatches;  ///
+
+  return termNodeEquates;
+}
+
+function filterEqualities(equalities, equality) {
+  const equalityA = equality; ///
+
+  equalities = equalities.filter((equality) => {
+    const equalityB = equality; ///
+
+    if (equalityA !== equalityB) {
+      return true;
+    }
+  });
+
+  return equalities;
 }

package/src/label.js

@@ -21,14 +21,14 @@ export default class Label {
     return matchesName;
   }
 
-  asString() {
-    const string = nodeAsString(this.node);
+  asString(tokens) {
+    const string = nodeAsString(this.node, tokens);
 
     return string;
   }
 
-  toJSON() {
-    const string = nodeAsString(this.node),
+  toJSON(tokens) {
+    const string = nodeAsString(this.node, tokens),
           json = string;  ///
 
     return json;

package/src/premise.js

@@ -106,8 +106,8 @@ export default class Premise {
     return metastatementNodeMatches;
   }
 
-  toJSON() {
-    const metastatementString = nodeAsString(this.metastatementNode),
+  toJSON(tokens) {
+    const metastatementString = nodeAsString(this.metastatementNode, tokens),
           metastatement = metastatementString, ///
           json = {
             metastatement

package/src/rule.js

@@ -108,18 +108,18 @@ export default class Rule {
     return metastatementNatches;
   }
 
-  toJSON() {
+  toJSON(tokens) {
     const labelsJSON = this.labels.map((label) => {
-            const labelJSON = label.toJSON();
+            const labelJSON = label.toJSON(tokens);
 
             return labelJSON;
           }),
           premisesJSON = this.premises.map((premise) => {
-            const premiseJSON = premise.toJSON();
+            const premiseJSON = premise.toJSON(tokens);
 
             return premiseJSON;
           }),
-          conclusionJSON = this.conclusion.toJSON(),
+          conclusionJSON = this.conclusion.toJSON(tokens),
           kind = RULE_KIND,
           labels = labelsJSON,  ///
           premises = premisesJSON,  ///

package/src/supposition.js

@@ -61,8 +61,8 @@ export default class Supposition {
     return statementNodeMatches;
   }
 
-  toJSON() {
-    const statementString = nodeAsString(this.statementNode),
+  toJSON(tokens) {
+    const statementString = nodeAsString(this.statementNode, tokens),
           statement = statementString, ///
           json = {
             statement

package/src/type.js

@@ -96,7 +96,7 @@ export default class Type {
     return matchesTypeName;
   }
 
-  asString(noSuperType) {
+  asString(tokens, noSuperType) {
     let string;
 
     if (noSuperType) {
@@ -110,8 +110,8 @@ export default class Type {
     return string;
   }
 
-  toJSON() {
-    const superTypeJSON = this.superType.toJSON(),
+  toJSON(tokens) {
+    const superTypeJSON = this.superType.toJSON(tokens),
           kind = TYPE_KIND,
           name = this.name,
           superType = superTypeJSON,  ///
@@ -157,7 +157,7 @@ export default class Type {
 }
 
 class ObjectType extends Type {
-  toJSON() {
+  toJSON(tokens) {
     const kind = TYPE_KIND,
           name = this.name,
           superType = null,  ///

package/src/utilities/string.js

@@ -1,17 +1,14 @@
 "use strict";
 
-import { COMMA } from "../constants";
 import { nodeQuery } from "../utilities/query";
-import { LABEL_RULE_NAME,
-         UNQUALIFIED_STATEMENT_RULE_NAME,
-         CONSTRUCTOR_DECLARATIONRULE_NAME,
-         UNQUALIFIED_METASTATEMENT_RULE_NAME } from "../ruleNames";
+import { COMMA, EMPTY_STRING } from "../constants";
+import { LABEL_RULE_NAME, UNQUALIFIED_STATEMENT_RULE_NAME, CONSTRUCTOR_DECLARATIONRULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from "../ruleNames";
 
 const termNodeQuery = nodeQuery("/constructorDeclaration/term!"),
       statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!"),
       metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement!");
 
-export function nodeAsString(node) {
+export function nodeAsString(node, tokens) {
   let string = null;
 
   if (node !== null) {
@@ -24,24 +21,35 @@ export function nodeAsString(node) {
       string = content; ///
     } else {
       const nonTerminalNode = node, ///
-            childNodes = nonTerminalNode.getChildNodes();
+            firstSignificantToken = nonTerminalNode.getFirstSignificantToken(),
+            lastSignificantToken = nonTerminalNode.getLastSignificantToken(),
+            firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken),
+            lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken),
+            start = firstSignificantTokenIndex, ///
+            end = lastSignificantTokenIndex + 1;
 
-      childNodes.forEach((childNode) => {
-        const nodeString = nodeAsString(childNode);
+      tokens = tokens.slice(start, end);  ///
 
-        string = (string === null) ?
-                   nodeString : ///
-                    `${string}${nodeString}`;
-      });
+      string = tokens.reduce((string, token) => {
+        const content = token.getContent();
+
+        string = `${string}${content}`;
+
+        return string;
+      }, EMPTY_STRING);
     }
   }
 
+  if (string !== null) {
+    string = string.replace(/[\r\n]/, EMPTY_STRING)
+  }
+
   return string;
 }
 
-export function nodesAsString(nodes) {
+export function nodesAsString(nodes, tokens) {
   const string = nodes.reduce((string, node) => {
-    const nodeString = nodeAsString(node);
+    const nodeString = nodeAsString(node, tokens);
 
     if (string === null) {
       string = nodeString;  ///

package/src/variable.js

@@ -45,7 +45,7 @@ export default class Variable {
     return equalTo;
   }
 
-  asString() {
+  asString(tokens) {
     let string;
 
     if (this.type === null) {

package/src/verify/assertion/type.js

@@ -15,7 +15,7 @@ export default function verifyTypeAssertion(typeAssertionNode, assertions, proof
 
   proofContext.begin(typeAssertionNode);
 
-  const typeAssertionString = nodeAsString(typeAssertionNode);
+  const typeAssertionString = proofContext.nodeAsString(typeAssertionNode);
 
   proofContext.debug(`Verifying the '${typeAssertionString}' type assertion...`);
 
@@ -110,7 +110,7 @@ function verifyTermTypeAssertion(typeAssertionNode, assertions, proofContext) {
             assertedType = proofContext.findTypeByTypeName(assertedTypeName),
             firstType = first(types),
             termType = firstType,
-            termString = nodeAsString(termNode),
+            termString = proofContext.nodeAsString(termNode),
             assertedTypeEqualToTermType = (termType === null) ?
                                              true : ///
                                                assertedType.isEqualTo(termType);

package/src/verify/axiom.js

@@ -20,7 +20,7 @@ export default function verifyAxiom(axiomNode, fileContext) {
   fileContext.begin(axiomNode);
 
   const labelNodes = labelNodesQuery(axiomNode),
-        labelsString = nodesAsString(labelNodes),
+        labelsString = fileContext.nodesAsString(labelNodes),
         proofContext = ProofContext.fromFileContext(fileContext);
 
   fileContext.debug(`Verifying the '${labelsString}' axiom...`);

package/src/verify/conclusion.js

@@ -4,7 +4,6 @@ import Conclusion from "../conclusion";
 import verifyUnqualifiedMetastatement from "./metastatement/unqualified";
 
 import { nodeQuery } from "../utilities/query";
-import { nodeAsString } from "../utilities/string";
 
 const metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement!"),
       unqualifiedMetastatementNodeQuery = nodeQuery("/conclusion/unqualifiedMetastatement!");
@@ -14,7 +13,7 @@ export default function verifyConclusion(conclusionNode, conclusions, metaproofC
 
   metaproofContext.begin(conclusionNode);
 
-  const conclusionString = nodeAsString(conclusionNode);
+  const conclusionString = metaproofContext.nodeAsString(conclusionNode);
 
   metaproofContext.debug(`Verifying the '${conclusionString}' conclusion...`);
 

package/src/verify/consequence.js

@@ -4,7 +4,6 @@ import Consequence from "../consequence";
 import verifyUnqualifiedStatement from "./statement/unqualified";
 
 import { nodeQuery } from "../utilities/query";
-import { nodeAsString } from "../utilities/string";
 
 const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!"),
       unqualifiedStatementNodeQuery = nodeQuery("/consequence/unqualifiedStatement!");
@@ -14,9 +13,9 @@ export default function verifyConsequence(consequenceNode, consequences, proofCo
 
   proofContext.begin(consequenceNode);
 
-  const consequenceString = nodeAsString(consequenceNode);
+  const consequenceString = proofContext.nodeAsString(consequenceNode);
 
-  proofContext.debug(`Verifying the ${consequenceString} consequence...`);
+  proofContext.debug(`Verifying the '${consequenceString}' consequence...`);
 
   const derived = false,
         assertions = [],

package/src/verify/derivation.js

@@ -107,8 +107,10 @@ function verifyChild(childNode, proofContext) {
     }
 
     case QUALIFIED_STATEMENT_RULE_NAME: {
-      const qualifiedStatementNode = childNode,  ///
-            qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, proofContext);
+      const derived = true,
+            assertions = [],
+            qualifiedStatementNode = childNode,  ///
+            qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, assertions, derived, proofContext);
 
       if (qualifiedStatementVerified) {
         const statementNode = statementNodeQuery(qualifiedStatementNode),

package/src/verify/label.js

@@ -2,7 +2,6 @@
 
 import Label from "../label";
 
-import { nodeAsString } from "../utilities/string";
 import { labelNameFromLabelNode } from "../utilities/query";
 
 export default function verifyLabel(labelNode, labels, fileContext) {
@@ -14,7 +13,7 @@ export default function verifyLabel(labelNode, labels, fileContext) {
         labelPresent = fileContext.isLabelPresentByLabelName(labelName);
 
   if (labelPresent) {
-    const labelString = nodeAsString(labelNode);
+    const labelString = fileContext.nodeAsString(labelNode);
 
     fileContext.error(`The '${labelString}' label is already present.`, labelNode);
   } else {

package/src/verify/lemma.js

@@ -23,7 +23,7 @@ export default function verifyLemma(lemmaNode, fileContext) {
   fileContext.begin(lemmaNode);
 
   const labelNodes = labelNodesQuery(lemmaNode),
-        labelsString = nodesAsString(labelNodes),
+        labelsString = fileContext.nodesAsString(labelNodes),
         proofContext = ProofContext.fromFileContext(fileContext);
 
   (labelsString === EMPTY_STRING) ?