occam-verify-cli 0.0.1107 → 0.0.1109

package/src/metavariable.js

@@ -59,6 +59,12 @@ class Metavariable {
     return metavariableNameMatches;
   }
 
+  matchMetavariableNode(metavariableNode) {
+    const metavariableNodeMatches = metavariableNode.match(this.node);
+
+    return metavariableNodeMatches;
+  }
+
   isEqualTo(metavariable) {
     let equalTo = false;
 

package/src/mixins/statement/unify.js

@@ -2,24 +2,12 @@
 
 import BracketedCombinator from "../../combinator/bracketed";
 
-import { unifyStatementWithCombinator } from "../../utilities/unification";
-
 function unifyWithBracketedCombinator(statement, assignments, stated, context) {
   let unifiedWithBracketedCombinator;
 
-  const statementString = statement.getString();
-
-  context.trace(`Unifying the '${statementString}' statement with the bracketed combinator...`);
-
-  const bracketedCombinator = BracketedCombinator.fromNothing(),
-        combinator = bracketedCombinator, ///
-        statementUnifiedWithCombinator = unifyStatementWithCombinator(statement, combinator, assignments, stated, context);
+  const bracketedCombinator = BracketedCombinator.fromNothing();
 
-  unifiedWithBracketedCombinator = statementUnifiedWithCombinator;
-
-  if (unifiedWithBracketedCombinator) {
-    context.debug(`...unified the '${statementString}' statement with the bracketed combinator.`);
-  }
+  unifiedWithBracketedCombinator = bracketedCombinator.unifyStatement(statement, assignments, stated, context);
 
   return unifiedWithBracketedCombinator;
 }
@@ -34,7 +22,7 @@ function unifyWithCombinators(statement, assignments, stated, context) {
   assignments = null; ///
 
   unifiedWithCombinators = combinators.some((combinator) => {
-    const unifiedWithCombinator = unifyWithCombinator(statement, combinator, assignments, stated, context);
+    const unifiedWithCombinator = combinator.unifyStatement(statement, assignments, stated, context);
 
     if (unifiedWithCombinator) {
       return true;
@@ -51,22 +39,3 @@ const unifyMixins = [
 ];
 
 export default unifyMixins;
-
-function unifyWithCombinator(statement, combinator, assignments, stated, context) {
-  let unifiedWithCombinator;
-
-  const statementString = statement.getString(),
-        combinatorString = combinator.getString();
-
-  context.trace(`Unifying the '${statementString}' statement with the '${combinatorString}' combinator...`);
-
-  const statementUnifiedWithCombinator = unifyStatementWithCombinator(statement, combinator, assignments, stated, context);
-
-  unifiedWithCombinator = statementUnifiedWithCombinator; ///
-
-  if (unifiedWithCombinator) {
-    context.debug(`...unified the '${statementString}' statement with the '${combinatorString}' combinator.`);
-  }
-
-  return unifiedWithCombinator;
-}

package/src/mixins/term/unify.js

@@ -1,54 +1,13 @@
 "use strict";
 
-import shim from "../../shim";
 import BracketedConstructor from "../../constructor/bracketed";
 
-import { nodeQuery } from "../../utilities/query";
-import { unifyTermWithConstructor } from "../../utilities/unification";
-
-const termNodeQuery = nodeQuery("/term/argument/term");
-
 function unifyWithBracketedConstructor(term, context, verifyAhead) {
   let unifiedWithBracketedConstructor;
 
-  const termString = term.getString();
-
-  context.trace(`Unifying the '${termString}' term with the bracketed constructor...`, term);
-
   const bracketedConstructor = BracketedConstructor.fromNothing();
 
-  unifiedWithBracketedConstructor = unifyWithConstructor(term, bracketedConstructor, context, () => {
-    let verifiedAhead = false;
-
-    const { Term } = shim,
-          bracketedTerm = term, ///
-          bracketedTermNode = bracketedTerm.getNode(),
-          termNode = termNodeQuery(bracketedTermNode); ///
-
-    term = Term.fromTermNode(termNode, context);
-
-    if (term !== null) {
-      const termVVerified = term.verify(context, () => {
-        let verifiedAhead;
-
-        const type = term.getType();
-
-        bracketedTerm.setType(type);
-
-        verifiedAhead = verifyAhead();
-
-        return verifiedAhead;
-      });
-
-      verifiedAhead = termVVerified;  ///
-    }
-
-    return verifiedAhead;
-  });
-
-  if (unifiedWithBracketedConstructor) {
-    context.debug(`...unified the '${termString}' term with the bracketed constructor.`, term);
-  }
+  unifiedWithBracketedConstructor = bracketedConstructor.unifyTerm(term, context, verifyAhead);
 
   return unifiedWithBracketedConstructor;
 }
@@ -59,7 +18,7 @@ function unifyWithConstructors(term, context, verifyAhead) {
   const constructors = context.getConstructors();
 
   unifiedWithConstructors = constructors.some((constructor) => {
-    const unifiedWithConstructor = unifyWithConstructor(term, constructor, context, verifyAhead);
+    const unifiedWithConstructor = constructor.unifyTerm(term, context, verifyAhead);
 
     if (unifiedWithConstructor) {
       return true;
@@ -75,32 +34,3 @@ const unifyMixins = [
 ];
 
 export default unifyMixins;
-
-function unifyWithConstructor(term, constructor, context, verifyAhead) {
-  let unifiedWithConstructor = false;
-
-  const termString = term.getString(),
-        constructorString = constructor.getString();
-
-  context.trace(`Unifying the '${termString}' term with the '${constructorString}' constructor...`, term);
-
-  const termUnifiedWithConstructor = unifyTermWithConstructor(term, constructor, context);
-
-  if (termUnifiedWithConstructor) {
-    let verifiedAhead;
-
-    const type = constructor.getType();
-
-    term.setType(type);
-
-    verifiedAhead = verifyAhead();
-
-    unifiedWithConstructor = verifiedAhead;  ///
-  }
-
-  if (unifiedWithConstructor) {
-    context.debug(`...unified the '${termString}' term with the '${constructorString}' constructor.`, term);
-  }
-
-  return unifiedWithConstructor;
-}

package/src/reference.js

@@ -27,8 +27,16 @@ export default class Reference {
     return metavariableName;
   }
 
+  getMetavariableNode() {
+    const metavariableNode = this.metavariable.getNode();
+
+    return metavariableNode;
+  }
+
   matchMetavariableName(metavariableName) { return this.metavariable.matchMetavariableName(metavariableName); }
 
+  matchMetavariableNode(metavariableNode) { return this.metavariable.matchMetavariableNode(metavariableNode); }
+
   unifyLabel(label, substitutions, generalContext, specificContext) {
     let labelUnified;
 

package/src/rule.js

@@ -148,15 +148,9 @@ class Rule {
 
     this.fileContext.trace(`Verifying the '${ruleString}' rule...`);
 
-    const labelsVerifiedWhenDeclared = this.labels.every((label) => {
-      const labelVVerifiedWhenDeclared = label.verifyWhenDeclared(this.fileContext);
+    const labelsVerified = this.verifyLabels();
 
-      if (labelVVerifiedWhenDeclared) {
-        return true;
-      }
-    });
-
-    if (labelsVerifiedWhenDeclared) {
+    if (labelsVerified) {
       const context = LocalContext.fromFileContext(this.fileContext),
             premisesVerified = this.premises.every((premise) => {
               const premiseVerified = premise.verify(context);
@@ -197,6 +191,19 @@ class Rule {
     return verified;
   }
 
+  verifyLabels() {
+    const labelsVerified = this.labels.every((label) => {
+      const nameOnly = true,
+            labelVVerifiedWhenDeclared = label.verifyWhenDeclared(this.fileContext, nameOnly);
+
+      if (labelVVerifiedWhenDeclared) {
+        return true;
+      }
+    });
+
+    return labelsVerified;
+  }
+
   toJSON() {
     const labelsJSON = labelsToLabelsJSON(this.labels),
           premisesJSON = premisesToPremisesJSON(this.premises),

package/src/topLevelAssertion.js

@@ -215,15 +215,9 @@ export default class TopLevelAssertion {
   verify() {
     let verified = false;
 
-    const labelsVerifiedWhenDeclared = this.labels.every((label) => {
-      const labelVVerifiedWhenDeclared = label.verifyWhenDeclared(this.fileContext);
+    const labelsVerified = this.verifyLabels();
 
-      if (labelVVerifiedWhenDeclared) {
-        return true;
-      }
-    });
-
-    if (labelsVerifiedWhenDeclared) {
+    if (labelsVerified) {
       const localContext = LocalContext.fromFileContext(this.fileContext),
             context = localContext, ///
             suppositionsVerified = this.suppositions.every((supposition) => {
@@ -252,6 +246,19 @@ export default class TopLevelAssertion {
     return verified;
   }
 
+  verifyLabels() {
+    const labelsVerified = this.labels.every((label) => {
+      const nameOnly = true,
+            labelVVerifiedWhenDeclared = label.verifyWhenDeclared(this.fileContext, nameOnly);
+
+      if (labelVVerifiedWhenDeclared) {
+        return true;
+      }
+    });
+
+    return labelsVerified;
+  }
+
   toJSON() {
     const labelsJSON = labelsToLabelsJSON(this.labels),
           consequentJSON = consequentToConsequentJSON(this.consequent),