occam-verify-cli 0.0.937 → 0.0.939

package/src/verify/assertion/contained.js

@@ -83,10 +83,9 @@ function verifyStatedContainedAssertion(containedAssertionNode, assignments, der
 
     localContext.debug(`The '${containedAssertionString}' stated contained assertion cannot be verified.`, containedAssertionNode);
 
-    const nonTerminalNode = containedAssertionNode, ///
-          nonTerminalNodeVerified = metaLevelVerifier.verify(nonTerminalNode, localContext);
+    const verified = metaLevelVerifier.verify(containedAssertionNode, localContext);
 
-    statedContainedAssertionVerified = nonTerminalNodeVerified; ///
+    statedContainedAssertionVerified = verified; ///
 
     if (statedContainedAssertionVerified) {
       localContext.debug(`...verified the '${containedAssertionString}' stated contained assertion.`, containedAssertionNode);

package/src/verify/assertion/defined.js

@@ -112,10 +112,9 @@ function verifyStatedDefinedAssertion(definedAssertionNode, assignments, derived
 
     localContext.trace(`Verifying the '${definedAssertionString}' stated defined assertion...`, definedAssertionNode);
 
-    const nonTerminalNode = definedAssertionNode, ///
-          nonTerminalNodeVerified = metaLevelVerifier.verify(nonTerminalNode, localContext);
+    const verified = metaLevelVerifier.verify(definedAssertionNode, localContext);
 
-    statedDefinedAssertionVerified = nonTerminalNodeVerified; ///
+    statedDefinedAssertionVerified = verified; ///
 
     if (statedDefinedAssertionVerified) {
       localContext.debug(`...verified the '${definedAssertionString}' stated defined assertion.`, definedAssertionNode);

package/src/verify/assertion/subproof.js

@@ -1,9 +1,6 @@
 "use strict";
 
-import { nodesQuery } from "../../utilities/query";
-import { STATEMENT_META_TYPE_NAME } from "../../metaTypeNames";
-
-const metavariableNodesQuery = nodesQuery("/subproofAssertion/statement/metavariable!");
+import metaLevelVerifier from "../../verifier/metaLevel";
 
 export default function verifySubproofAssertion(subproofAssertionNode, assignments, derived, localContext) {
   let subproofAssertionVerified;
@@ -54,19 +51,9 @@ function verifyStatedSubproofAssertion(subproofAssertionNode, assignments, deriv
 
     localContext.trace(`Verifying the '${subproofAssertionString}' stated subproof assertion...`, subproofAssertionNode);
 
-    const metavariableNodes = metavariableNodesQuery(subproofAssertionNode);
-
-    statedSubproofAssertionVerified = metavariableNodes.every((metavariableNode) => {
-      const metavariable = localContext.findMetavariableByMetavariableNode(metavariableNode);
-
-      if (metavariable !== null) {
-        const metaTypeName = metavariable.getMetaTypeName();
+    const verified = metaLevelVerifier.verify(subproofAssertionNode, localContext);
 
-        if (metaTypeName === STATEMENT_META_TYPE_NAME) {
-          return true;
-        }
-      }
-    });
+    statedSubproofAssertionVerified = verified; ///
 
     if (statedSubproofAssertionVerified) {
       localContext.debug(`...verified the '${subproofAssertionString}' stated subproof assertion.`, subproofAssertionNode);

package/src/verify/statement/qualified.js

@@ -65,7 +65,7 @@ function verifyQualifiedStatementAAgainstRule(qualifiedStatementNode, substituti
 
     localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${metavariableString}' rule...`, qualifiedStatementNode);
 
-    const ruleMatchesStatement = rule.matchStatement(statementNode, localContext);
+    const ruleMatchesStatement = rule.unifyStatement(statementNode, localContext);
 
     qualifiedStatementVerifiedAgainstRule = ruleMatchesStatement;  ///
 
@@ -90,7 +90,7 @@ function verifyQualifiedStatementAAgainstAxiom(qualifiedStatementNode, substitut
 
     localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${metavariableString}' axiom...`, qualifiedStatementNode);
 
-    const axiomMatchesStatement = axiom.matchStatement(statementNode, localContext);
+    const axiomMatchesStatement = axiom.unifyStatement(statementNode, localContext);
 
     qualifiedStatementVerifiedAgainstAxiom = axiomMatchesStatement; ///
 
@@ -115,7 +115,7 @@ function verifyQualifiedStatementAAgainstLemma(qualifiedStatementNode, substitut
 
     localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${metavariableString}' lemma...`, qualifiedStatementNode);
 
-    const lemmaMatchesStatement = lemma.matchStatement(statementNode, localContext);
+    const lemmaMatchesStatement = lemma.unifyStatement(statementNode, localContext);
 
     qualifiedStatementVerifiedAgainstLemma = lemmaMatchesStatement; ///
 
@@ -140,7 +140,7 @@ function verifyQualifiedStatementAAgainstTheorem(qualifiedStatementNode, substit
 
     localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${metavariableString}' theorem...`, qualifiedStatementNode);
 
-    const theoremMatchesStatement = theorem.matchStatement(statementNode, localContext);
+    const theoremMatchesStatement = theorem.unifyStatement(statementNode, localContext);
 
     qualifiedStatementVerifiedAgainstTheorem = theoremMatchesStatement; ///
 
@@ -165,7 +165,7 @@ function verifyQualifiedStatementAAgainstConjecture(qualifiedStatementNode, subs
 
     localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${metavariableString}' conjecture...`, qualifiedStatementNode);
 
-    const conjectureMatchesStatement = conjecture.matchStatement(statementNode, localContext);
+    const conjectureMatchesStatement = conjecture.unifyStatement(statementNode, localContext);
 
     qualifiedStatementVerifiedAgainstConjecture = conjectureMatchesStatement; ///
 

package/src/verify/statement.js

@@ -3,6 +3,7 @@
 import shim from "../shim";
 import verifyEquality from "../verify/equality";
 import verifyJudgement from "../verify/judgement";
+import metaLevelVerifier from "../verifier/metaLevel";
 import bracketedCombinator from "../ocmbinator/bracketed";
 import verifyTypeAssertion from "../verify/assertion/type";
 import verifyDefinedAssertion from "../verify/assertion/defined";
@@ -11,19 +12,14 @@ import verifyContainedAssertion from "../verify/assertion/contained";
 import statementAgainstCombinatorUnifier from "../unifier/statementAgainstCombinator";
 
 import { nodeQuery } from "../utilities/query";
-import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 
-const variableNodeQuery = nodeQuery("/*/variable!"),
-      equalityNodeQuery = nodeQuery("/statement/equality!"),
+const equalityNodeQuery = nodeQuery("/statement/equality!"),
       judgementNodeQuery = nodeQuery("/statement/judgement!"),
       metavariableNodeQuery = nodeQuery("/*/metavariable!"),
-      substitutionNodeQuery = nodeQuery("/statement/substitution!"),
-      termVariableNodeQuery = nodeQuery("/substitution/term/variable!"),
       typeAssertionNodeQuery = nodeQuery("/statement/typeAssertion!"),
       definedAssertionNodeQuery = nodeQuery("/statement/definedAssertion!"),
       subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion!"),
-      containedAssertionNodeQuery = nodeQuery("/statement/containedAssertion!"),
-      statementMetavariableNodeQuery = nodeQuery("/substitution/statement/metavariable!");
+      containedAssertionNodeQuery = nodeQuery("/statement/containedAssertion!");
 
 function verifyStatement(statementNode, assignments, derived, localContext) {
   let statementVerified;
@@ -99,16 +95,9 @@ function verifyStatementAsMetavariable(statementNode, assignments, derived, loca
 
     localContext.trace(`Verifying the '${statementString}' statement as a metavariable...`, statementNode);
 
-    const metavariableVerified = verifyMetavariable(metavariableNode, localContext);
+    const verified = metaLevelVerifier.verify(statementNode, localContext);
 
-    if (metavariableVerified) {
-      const substitutionNode = substitutionNodeQuery(statementNode),
-            substitutionVerified = verifySubstitution(substitutionNode, localContext);
-
-      if (substitutionVerified) {
-        statementVerifiedAsMetavariable = true;
-      }
-    }
+    statementVerifiedAsMetavariable = verified; ///
 
     if (statementVerifiedAsMetavariable) {
       localContext.debug(`...verified the '${statementString}' statement as a metavariable.`, statementNode);
@@ -198,11 +187,7 @@ function verifyStatementAsDefinedAssertion(statementNode, assignments, derived,
 
     localContext.trace(`Verifying the '${statementString}' statement as a defined assertion...`, statementNode);
 
-    const definedAssertionVerified = verifyDefinedAssertion(definedAssertionNode, assignments, derived, localContext, () => {
-      const verifiedAhead = true;
-
-      return verifiedAhead;
-    });
+    const definedAssertionVerified = verifyDefinedAssertion(definedAssertionNode, assignments, derived, localContext);
 
     statementVerifiedAsDefinedAssertion = definedAssertionVerified; ///
 
@@ -224,11 +209,7 @@ function verifyStatementAsSubproofAssertion(statementNode, assignments, derived,
 
     localContext.trace(`Verifying the '${statementString}' statement as a subproof assertion...`, statementNode);
 
-    const subproofAssertionVerified = verifySubproofAssertion(subproofAssertionNode, assignments, derived, localContext, () => {
-      const verifiedAhead = true;
-
-      return verifiedAhead;
-    });
+    const subproofAssertionVerified = verifySubproofAssertion(subproofAssertionNode, assignments, derived, localContext);
 
     statementVerifiedAsSubproofAssertion = subproofAssertionVerified; ///
 
@@ -250,11 +231,7 @@ function verifyStatementAsContainedAssertion(statementNode, assignments, derived
 
     localContext.trace(`Verifying the '${statementString}' statement as a defined assertion...`, statementNode);
 
-    const containedAssertionVerified = verifyContainedAssertion(containedAssertionNode, assignments, derived, localContext, () => {
-      const verifiedAhead = true;
-
-      return verifiedAhead;
-    });
+    const containedAssertionVerified = verifyContainedAssertion(containedAssertionNode, assignments, derived, localContext);
 
     statementVerifiedAsContainedAssertion = containedAssertionVerified; ///
 
@@ -322,60 +299,3 @@ function verifyStatementAgainstCombinator(statementNode, combinator, localContex
 
   return statementVerifiedAgainstCombinator;
 }
-
-function verifyMetavariable(metavariableNode, localContext) {
-  let metavariableVerified = false;
-
-  const metavariable = localContext.findMetavariableByMetavariableNode(metavariableNode);
-
-  if (metavariable !== null) {
-    const metaTypeName  = metavariable.getMetaTypeName();
-
-    if (metaTypeName === STATEMENT_META_TYPE_NAME) {
-      metavariableVerified = true;
-    }
-  }
-
-  return metavariableVerified;
-}
-
-function verifySubstitution(substitutionNode, localContext) {
-  let substitutionVerified = false;
-
-  if (substitutionNode === null) {
-    substitutionVerified = true;
-  } else {
-    const variableNode = variableNodeQuery(substitutionNode),
-          metavariableNode = metavariableNodeQuery(substitutionNode);
-
-    if (variableNode !== null) {
-      const variablePresent = localContext.isVariablePresentByVariableNode(variableNode);
-
-      if (variablePresent) {
-        const termVariableNode = termVariableNodeQuery(substitutionNode);
-
-        if (termVariableNode !== null) {
-          const termVariablePresent = localContext.isVariablePresentByVariableNode(termVariableNode);
-
-          substitutionVerified = termVariablePresent; ///
-        }
-      }
-    }
-
-    if (metavariableNode !== null) {
-      const metavariablePresent = localContext.isMetavariablePresentByMetavariableNode(metavariableNode);
-
-      if (metavariablePresent) {
-        const statementMetavariableNode = statementMetavariableNodeQuery(substitutionNode);
-
-        if (statementMetavariableNode !== null) {
-          const statementMetavariablePresent = localContext.isMetavariablePresentByMetavariableNode(statementMetavariableNode);
-
-          substitutionVerified = statementMetavariablePresent; ///
-        }
-      }
-    }
-  }
-
-  return substitutionVerified;
-}