occam-verify-cli 0.0.921 → 0.0.923

package/src/verify/declaration.js

@@ -7,8 +7,8 @@ import metaLevelNodeVerifier from "../verifier/node/metaLevel";
 import { nodeQuery } from "../utilities/query";
 
 const referenceNodeQuery = nodeQuery("/declaration/reference!"),
-      metavariableNodeQuery = nodeQuery("/reference/metavariable!"),
-      metastatementNodeQuery = nodeQuery("/declaration/metastatement!");
+      statementNodeQuery = nodeQuery("/declaration/statement!"),
+      metavariableNodeQuery = nodeQuery("/reference/metavariable!");
 
 export default function verifyDeclaration(declarationNode, declarations, localContext) {
   let declarationVerified = false;
@@ -21,20 +21,20 @@ export default function verifyDeclaration(declarationNode, declarations, localCo
         referenceVerified = verifyReference(referenceNode, localContext);
 
   if (referenceVerified) {
-    const metastatementNode = metastatementNodeQuery(declarationNode);
+    const statementNode = statementNodeQuery(declarationNode);
 
-    const { verifyMetastatement } = metaLevelNodeVerifier,
+    const { verifyStatement } = metaLevelNodeVerifier,
           derived = false,
           assignments = [],
-          metastatementVerified = verifyMetastatement(metastatementNode, assignments, derived, localContext, () => {
+          statementVerified = verifyStatement(statementNode, assignments, derived, localContext, () => {
             const verifiedAhead = true;
 
             return verifiedAhead;
           });
 
-    if (metastatementVerified) {
+    if (statementVerified) {
       const metavariableNode = metavariableNodeQuery(referenceNode),
-            declaration = Declaration.fromMetavariableNodeAndMetastatementNode(metavariableNode, metastatementNode);
+            declaration = Declaration.fromMetavariableNodeAndStatementNode(metavariableNode, statementNode);
 
       declarations.push(declaration);
 

package/src/verify/lemma.js

@@ -3,9 +3,9 @@
 import Lemma from "../lemma";
 import verifyProof from "../verify/proof";
 import verifyLabels from "../verify/labels";
+import LocalContext from "../context/local";
 import verifyConsequent from "../verify/consequent";
 import verifySuppositions from "../verify/suppositions";
-import IntrinsicLevelLocalContext from "../context/local/intrinsicLevel";
 
 import { first } from "../utilities/array";
 import { EMPTY_STRING } from "../constants";
@@ -19,10 +19,9 @@ const proofNodeQuery = nodeQuery("/lemma/proof!"),
 export default function verifyLemma(lemmaNode, fileContext) {
   let lemmaVerified = false;
 
-  const intrinsicLevelLocalContext = IntrinsicLevelLocalContext.fromFileContext(fileContext),
-        labelNodes = labelNodesQuery(lemmaNode),
+  const labelNodes = labelNodesQuery(lemmaNode),
         labelsString = fileContext.nodesAsString(labelNodes),
-        localContext = intrinsicLevelLocalContext;  ///
+        localContext = LocalContext.fromFileContext(fileContext);
 
   (labelsString === EMPTY_STRING) ?
     fileContext.trace(`Verifying a lemma...`, lemmaNode) :

package/src/verify/metaLemma.js

@@ -1,20 +1,20 @@
 "use strict";
 
 import MetaLemma from "../metaLemma";
+import verifyProof from "../verify/proof";
+import LocalContext from "../context/local";
 import verifyLabels from "../verify/labels";
-import verifyMetaproof from "../verify/metaproof";
-import verifyMetaConsequent from "../verify/metaConsequent";
-import MetaLevelLocalContext from "../context/local/metaLevel";
-import verifyMetaSuppositions from "../verify/metaSuppositions";
+import verifyConsequent from "../verify/consequent";
+import verifySuppositions from "../verify/suppositions";
 
 import { first } from "../utilities/array";
 import { EMPTY_STRING } from "../constants";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const labelNodesQuery = nodesQuery("/metaLemma/label"),
-      metaproofNodeQuery = nodeQuery("/metaLemma/metaproof!"),
-      metaConsequentNodeQuery = nodeQuery("/metaLemma/metaConsequent!"),
-      metaSuppositionsNodeQuery = nodesQuery("/metaLemma/metaSupposition");
+const proofNodeQuery = nodeQuery("/metaLemma/proof!"),
+      labelNodesQuery = nodesQuery("/metaLemma/label"),
+      consequentNodeQuery = nodeQuery("/metaLemma/consequent!"),
+      suppositionsNodeQuery = nodesQuery("/metaLemma/supposition");
 
 export default function verifyMetaLemma(metaLemmaNode, fileContext) {
   let metaLemmaVerified = false;
@@ -30,27 +30,26 @@ export default function verifyMetaLemma(metaLemmaNode, fileContext) {
         labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
-    const metaLevelLocalContext = MetaLevelLocalContext.fromFileContext(fileContext),
-          localContext = metaLevelLocalContext, ///
+    const localContext = LocalContext.fromFileContext(fileContext), ///
           substitutions = [],
-          metaSuppositions = [],
-          metaSuppositionNodes = metaSuppositionsNodeQuery(metaLemmaNode),
-          metaSuppositionsVerified = verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions, substitutions, localContext);
+          suppositions = [],
+          suppositionNodes = suppositionsNodeQuery(metaLemmaNode),
+          suppositionsVerified = verifySuppositions(suppositionNodes, suppositions, substitutions, localContext);
 
-    if (metaSuppositionsVerified) {
-      const metaConsequents = [],
-            metaConsequentNode = metaConsequentNodeQuery(metaLemmaNode),
-            metaConsequentVerified = verifyMetaConsequent(metaConsequentNode, metaConsequents, substitutions, localContext);
+    if (suppositionsVerified) {
+      const consequents = [],
+            consequentNode = consequentNodeQuery(metaLemmaNode),
+            consequentVerified = verifyConsequent(consequentNode, consequents, substitutions, localContext);
 
-      if (metaConsequentVerified) {
-        const metaproofNode = metaproofNodeQuery(metaLemmaNode),
-              firstMetaConsequent = first(metaConsequents),
-              metaConsequent = firstMetaConsequent, ///
-              metastatementNode = metaConsequent.getMetastatementNode(),
-              metaproofVerified = verifyMetaproof(metaproofNode, metastatementNode, substitutions, localContext);
+      if (consequentVerified) {
+        const proofNode = proofNodeQuery(metaLemmaNode),
+              firstConsequent = first(consequents),
+              consequent = firstConsequent, ///
+              statementNode = consequent.getStatementNode(),
+              proofVerified = verifyProof(proofNode, statementNode, substitutions, localContext);
 
-        if (metaproofVerified) {
-          const metaLemma = MetaLemma.fromLabelsMetaSuppositionsMetaConsequentSubstitutionsAndFileContext(labels, metaSuppositions, metaConsequent, substitutions, fileContext);
+        if (proofVerified) {
+          const metaLemma = MetaLemma.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext);
 
           fileContext.addMetaLemma(metaLemma);
 

package/src/verify/metastatement.js

@@ -2,142 +2,142 @@
 
 import verifyJudgement from "../verify/judgement";
 import metaLevelNodeVerifier from "../verifier/node/metaLevel";
-import verifyMetastatementAsDefinedAssertion from "./metastatementAsDefinedAssertion";
-import verifyMetastatementAsContainedAssertion from "./metastatementAsContainedAssertion";
+import verifyStatementAsDefinedAssertion from "./statementAsDefinedAssertion";
+import verifyStatementAsContainedAssertion from "./statementAsContainedAssertion";
 
 import { nodeQuery } from "../utilities/query";
 
-const judgementNodeQuery = nodeQuery("/metastatement/judgement!");
+const judgementNodeQuery = nodeQuery("/statement/judgement!");
 
-function verifyMetastatement(metastatementNode, assignments, derived, localContext) {
-  let metastatementVerified;
+function verifyStatement(statementNode, assignments, derived, localContext) {
+  let statementVerified;
 
-  const metastatementString = localContext.nodeAsString(metastatementNode);
+  const statementString = localContext.nodeAsString(statementNode);
 
-  localContext.trace(`Verifying the '${metastatementString}' metastatement...`, metastatementNode);
+  localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);
 
-  const verifyMetaStatementFunctions = [
-    verifyMetastatementAsJudgement,
-    verifyMetastatementAsDefinedAssertion,
-    verifyMetastatementAsContainedAssertion,
-    verifyMetastatementAsIs
+  const verifyStatementFunctions = [
+    verifyStatementAsJudgement,
+    verifyStatementAsDefinedAssertion,
+    verifyStatementAsContainedAssertion,
+    verifyStatementAsIs
   ];
 
-  metastatementVerified = verifyMetaStatementFunctions.some((verifyStatementFunction) => {
-    const metastatementVerified = verifyStatementFunction(metastatementNode, assignments, derived, localContext);
+  statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {
+    const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);
 
-    if (metastatementVerified) {
+    if (statementVerified) {
       return true;
     }
   });
 
-  if (metastatementVerified) {
-    localContext.debug(`...verified the '${metastatementString}' metastatement.`, metastatementNode);
+  if (statementVerified) {
+    localContext.debug(`...verified the '${statementString}' statement.`, statementNode);
   }
 
-  return metastatementVerified;
+  return statementVerified;
 }
 
 Object.assign(metaLevelNodeVerifier, {
-  verifyMetastatement
+  verifyStatement
 });
 
-export default verifyMetastatement;
+export default verifyStatement;
 
-function verifyMetastatementAsJudgement(metastatementNode, assignments, derived, localContext) {
-  let metastatementVerifiedAsJudgement = false;
+function verifyStatementAsJudgement(statementNode, assignments, derived, localContext) {
+  let statementVerifiedAsJudgement = false;
 
-  const metastatementJudgement = isMetastatementJudgement(metastatementNode);
+  const statementJudgement = isStatementJudgement(statementNode);
 
-  if (metastatementJudgement) {
-    const metastatementString = localContext.nodeAsString(metastatementNode);
+  if (statementJudgement) {
+    const statementString = localContext.nodeAsString(statementNode);
 
-    localContext.trace(`Verifying the '${metastatementString}' metastatement as a judgement...`, metastatementNode);
+    localContext.trace(`Verifying the '${statementString}' statement as a judgement...`, statementNode);
 
-    const judgementNode = judgementNodeQuery(metastatementNode),
+    const judgementNode = judgementNodeQuery(statementNode),
           judgementVerified = verifyJudgement(judgementNode, assignments, derived, localContext);
 
-    metastatementVerifiedAsJudgement = judgementVerified;  ///
+    statementVerifiedAsJudgement = judgementVerified;  ///
 
-    if (metastatementVerifiedAsJudgement) {
-      localContext.debug(`...verified the '${metastatementString}' metastatement as a judgement.`, metastatementNode);
+    if (statementVerifiedAsJudgement) {
+      localContext.debug(`...verified the '${statementString}' statement as a judgement.`, statementNode);
     }
   }
 
-  return metastatementVerifiedAsJudgement;
+  return statementVerifiedAsJudgement;
 }
 
-function verifyMetastatementAsIs(metastatementNode, assignments, derived, localContext) {
-  let metastatementVerifiedAsIs;
+function verifyStatementAsIs(statementNode, assignments, derived, localContext) {
+  let statementVerifiedAsIs;
 
-  const metastatementJudgement = isMetastatementJudgement(metastatementNode);
+  const statementJudgement = isStatementJudgement(statementNode);
 
-  if (!metastatementJudgement) {
-    const metastatementString = localContext.nodeAsString(metastatementNode);
+  if (!statementJudgement) {
+    const statementString = localContext.nodeAsString(statementNode);
 
-    localContext.trace(`Verifying the '${metastatementString}' metastatement as is...`, metastatementNode);
+    localContext.trace(`Verifying the '${statementString}' statement as is...`, statementNode);
 
-    const verifyMetastatementAsIsFunctions = [
-      verifyDerivedMetastatementAsIs,
-      verifyStatedMetastatementAsIs
+    const verifyStatementAsIsFunctions = [
+      verifyDerivedStatementAsIs,
+      verifyStatedStatementAsIs
     ];
 
-    metastatementVerifiedAsIs = verifyMetastatementAsIsFunctions.some((verifyMetastatementAsIsFunction) => {
-      const metastatementVerifiedAsIs = verifyMetastatementAsIsFunction(metastatementNode, assignments, derived, localContext);
+    statementVerifiedAsIs = verifyStatementAsIsFunctions.some((verifyStatementAsIsFunction) => {
+      const statementVerifiedAsIs = verifyStatementAsIsFunction(statementNode, assignments, derived, localContext);
 
-      if (metastatementVerifiedAsIs) {
+      if (statementVerifiedAsIs) {
         return true;
       }
     });
 
-    if (metastatementVerifiedAsIs) {
-      localContext.debug(`...verified the '${metastatementString}' metastatement as is.`, metastatementNode);
+    if (statementVerifiedAsIs) {
+      localContext.debug(`...verified the '${statementString}' statement as is.`, statementNode);
     }
   }
 
-  return metastatementVerifiedAsIs;
+  return statementVerifiedAsIs;
 }
 
-function verifyDerivedMetastatementAsIs(metastatementNode, assignments, derived, localContext) {
-  let derivedMetastatementVerifiedAsIs = false;
+function verifyDerivedStatementAsIs(statementNode, assignments, derived, localContext) {
+  let derivedStatementVerifiedAsIs = false;
 
   if (derived) {
-    const metastatementString = localContext.nodeAsString(metastatementNode);
+    const statementString = localContext.nodeAsString(statementNode);
 
-    localContext.debug(`Cannot verify the derived '${metastatementString}' metastatement as is.`, metastatementNode);
+    localContext.debug(`Cannot verify the derived '${statementString}' statement as is.`, statementNode);
   }
 
-  return derivedMetastatementVerifiedAsIs;
+  return derivedStatementVerifiedAsIs;
 }
 
-function verifyStatedMetastatementAsIs(metastatementNode, assignments, derived, localContext) {
-  let statedMetastatementVerifiedAsIs = false;
+function verifyStatedStatementAsIs(statementNode, assignments, derived, localContext) {
+  let statedStatementVerifiedAsIs = false;
 
   if (!derived) {
-    const metastatementString = localContext.nodeAsString(metastatementNode);
+    const statementString = localContext.nodeAsString(statementNode);
 
-    localContext.trace(`Verifying the stated '${metastatementString}' metastatement as is...`, metastatementNode);
+    localContext.trace(`Verifying the stated '${statementString}' statement as is...`, statementNode);
 
-    const nonTerminalNode = metastatementNode, ///
+    const nonTerminalNode = statementNode, ///
           nonTerminalNodeVerified = metaLevelNodeVerifier.verifyNonTerminalNode(nonTerminalNode, localContext, () => {
             const verifiedAhead = true;
 
             return verifiedAhead;
           });
 
-    statedMetastatementVerifiedAsIs = nonTerminalNodeVerified;  ///
+    statedStatementVerifiedAsIs = nonTerminalNodeVerified;  ///
 
-    if (statedMetastatementVerifiedAsIs) {
-      localContext.debug(`...verified the stated '${metastatementString}' metastatement as is.`, metastatementNode);
+    if (statedStatementVerifiedAsIs) {
+      localContext.debug(`...verified the stated '${statementString}' statement as is.`, statementNode);
     }
   }
 
-  return statedMetastatementVerifiedAsIs;
+  return statedStatementVerifiedAsIs;
 }
 
-function isMetastatementJudgement(metastatementNode) {
-  const judgementNode = judgementNodeQuery(metastatementNode),
-        metastatementJudgement = (judgementNode !== null);
+function isStatementJudgement(statementNode) {
+  const judgementNode = judgementNodeQuery(statementNode),
+        statementJudgement = (judgementNode !== null);
 
-  return metastatementJudgement;
+  return statementJudgement;
 }

package/src/verify/metatheorem.js

@@ -1,19 +1,19 @@
 "use strict";
 
+import verifyProof from "../verify/proof";
 import Metatheorem from "../metatheorem";
 import verifyLabels from "../verify/labels";
-import verifyMetaproof from "../verify/metaproof";
-import verifyMetaConsequent from "../verify/metaConsequent";
-import MetaLevelLocalContext from "../context/local/metaLevel";
-import verifyMetaSuppositions from "../verify/metaSuppositions";
+import LocalContext from "../context/local";
+import verifyConsequent from "../verify/consequent";
+import verifySuppositions from "../verify/suppositions";
 
 import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const labelNodesQuery = nodesQuery("/metatheorem/label"),
-      metaproofNodeQuery = nodeQuery("/metatheorem/metaproof!"),
-      metaConsequentNodeQuery = nodeQuery("/metatheorem/metaConsequent!"),
-      metaSuppositionsNodeQuery = nodesQuery("/metatheorem/metaSupposition");
+      proofNodeQuery = nodeQuery("/metatheorem/proof!"),
+      consequentNodeQuery = nodeQuery("/metatheorem/consequent!"),
+      suppositionsNodeQuery = nodesQuery("/metatheorem/supposition");
 
 export default function verifyMetatheorem(metatheoremNode, fileContext) {
   let metatheoremVerified = false;
@@ -27,27 +27,26 @@ export default function verifyMetatheorem(metatheoremNode, fileContext) {
         labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
-    const metaLevelLocalContext = MetaLevelLocalContext.fromFileContext(fileContext),
-          localContext = metaLevelLocalContext, ///
+    const localContext = LocalContext.fromFileContext(fileContext), ///
           substitutions = [],
-          metaSuppositions = [],
-          metaSuppositionNodes = metaSuppositionsNodeQuery(metatheoremNode),
-          metaSuppositionsVerified = verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions, substitutions, localContext);
+          suppositions = [],
+          suppositionNodes = suppositionsNodeQuery(metatheoremNode),
+          suppositionsVerified = verifySuppositions(suppositionNodes, suppositions, substitutions, localContext);
 
-    if (metaSuppositionsVerified) {
-      const metaConsequents = [],
-            metaConsequentNode = metaConsequentNodeQuery(metatheoremNode),
-            metaConsequentVerified = verifyMetaConsequent(metaConsequentNode, metaConsequents, substitutions, localContext);
+    if (suppositionsVerified) {
+      const consequents = [],
+            consequentNode = consequentNodeQuery(metatheoremNode),
+            consequentVerified = verifyConsequent(consequentNode, consequents, substitutions, localContext);
 
-      if (metaConsequentVerified) {
-        const metaproofNode = metaproofNodeQuery(metatheoremNode),
-              firstMetaConsequent = first(metaConsequents),
-              metaConsequent = firstMetaConsequent, ///
-              metastatementNode = metaConsequent.getMetastatementNode(),
-              metaproofVerified = verifyMetaproof(metaproofNode, metastatementNode, substitutions, localContext);
+      if (consequentVerified) {
+        const proofNode = proofNodeQuery(metatheoremNode),
+              firstConsequent = first(consequents),
+              consequent = firstConsequent, ///
+              statementNode = consequent.getStatementNode(),
+              proofVerified = verifyProof(proofNode, statementNode, substitutions, localContext);
 
-        if (metaproofVerified) {
-          const metatheorem = Metatheorem.fromLabelsMetaSuppositionsMetaConsequentSubstitutionsAndFileContext(labels, metaSuppositions, metaConsequent, substitutions, fileContext);
+        if (proofVerified) {
+          const metatheorem = Metatheorem.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext);
 
           fileContext.addMetatheorem(metatheorem);
 

package/src/verify/premise.js

@@ -1,17 +1,14 @@
 "use strict";
 
 import Premise from "../premise";
-import MetaproofStep from "../step/metaproof";
+import ProofStep from "../proofStep";
 import verifyUnqualifiedStatement from "../verify/statement/unqualified";
-import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified";
 
 import { nodeQuery } from "../utilities/query";
 import { assignAssignment } from "../utilities/assignments";
 
 const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!"),
-      metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement!"),
-      unqualifiedStatementNodeQuery = nodeQuery("/premise/unqualifiedStatement!"),
-      unqualifiedMetastatementNodeQuery = nodeQuery("/premise/unqualifiedMetastatement!");
+      unqualifiedStatementNodeQuery = nodeQuery("/premise/unqualifiedStatement!");
 
 export default function verifyPremise(premiseNode, premises, localContext) {
   let premiseVerified;
@@ -21,56 +18,27 @@ export default function verifyPremise(premiseNode, premises, localContext) {
   localContext.trace(`Verifying the '${premiseString}' premise...`, premiseNode);
 
   const unqualifiedStatementNode = unqualifiedStatementNodeQuery(premiseNode),
-        unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(premiseNode);
+        derived = false,
+        assignments = [],
+        unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, assignments, derived, localContext);
 
-  if (unqualifiedStatementNode !== null) {
-    const derived = false,
-          assignments = [],
-          unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, assignments, derived, localContext);
+  if (unqualifiedStatementVerified) {
+    const assignmentAssigned = assignAssignment(assignments, localContext);
 
-    if (unqualifiedStatementVerified) {
-      const assignmentAssigned = assignAssignment(assignments, localContext);
+    if (assignmentAssigned) {
+      const statementNode = statementNodeQuery(unqualifiedStatementNode),
+            metaproofStep = ProofStep.fromStatementNode(statementNode),
+            premise = Premise.fromStatementNode(statementNode);
 
-      premiseVerified = assignmentAssigned; ///
-    }
-  }
+      premises.push(premise);
 
-  if (unqualifiedMetastatementNode !== null) {
-    const derived = false,
-          assignments = [],
-          unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localContext);
+      localContext.addProofStep(metaproofStep);
 
-    if (unqualifiedMetastatementVerified) {
-      const assignmentAssigned = assignAssignment(assignments, localContext);
-
-      premiseVerified = assignmentAssigned; ///
+      premiseVerified = true;
     }
   }
 
   if (premiseVerified) {
-    let premise,
-        metaproofStep;
-
-    if (unqualifiedStatementNode !== null) {
-      const statementNode = statementNodeQuery(unqualifiedStatementNode);
-
-      metaproofStep = MetaproofStep.fromMetastatementNode(statementNode);
-
-      premise = Premise.fromStatementNode(statementNode);
-    }
-
-    if (unqualifiedMetastatementNode !== null) {
-      const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
-
-      metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);
-
-      premise = Premise.fromMetastatementNode(metastatementNode);
-    }
-
-    premises.push(premise);
-
-    localContext.addMetaproofStep(metaproofStep);
-
     localContext.debug(`...verified the '${premiseString}' premise.`, premiseNode);
   }
 

package/src/verify/proof.js

@@ -1,7 +1,7 @@
 "use strict";
 
+import LocalContext from "../context/local";
 import verifyDerivation from "../verify/derivation";
-import IntrinsicLevelLocalContext from "../context/local/intrinsicLevel";
 
 import { nodeQuery } from "../utilities/query";
 
@@ -10,9 +10,7 @@ const derivationNodeQuery = nodeQuery("/proof/derivation!");
 export default function verifyProof(proofNode, conclusion, localContext) {
   let proofVerified = false;
 
-  const intrinsicLevelLocalContext = IntrinsicLevelLocalContext.fromLocalContext(localContext); ///
-
-  localContext = intrinsicLevelLocalContext;  ///
+  localContext = LocalContext.fromLocalContext(localContext); ///
 
   const derivationNode = derivationNodeQuery(proofNode),
         derivationVerified = verifyDerivation(derivationNode, localContext);

package/src/verify/proofStep.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import ProofStep from "../step/proof";
+import ProofStep from "../proofStep";
 import verifySubproof from "../verify/subproof";
 import verifySubDerivation from "../verify/subDerivation";
 import verifyQualifiedStatement from "../verify/statement/qualified";

package/src/verify/rule.js

@@ -1,18 +1,18 @@
 "use strict";
 
 import Rule from "../rule";
+import verifyProof from "../verify/proof";
+import LocalContext from "../context/local";
 import verifyLabels from "../verify/labels";
 import verifyPremises from "../verify/premises";
-import verifyMetaproof from "../verify/metaproof";
 import verifyConclusion from "../verify/conclusion";
-import MetaLevelLocalContext from "../context/local/metaLevel";
 
 import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const labelNodesQuery = nodesQuery("/rule/label"),
       premisesNodeQuery = nodesQuery("/rule/premise"),
-      metaproofNodeQuery = nodeQuery("/rule/metaproof!"),
+      proofNodeQuery = nodeQuery("/rule/proof!"),
       conclusionNodeQuery = nodeQuery("/rule/conclusion!");
 
 export default function verifyRule(ruleNode, fileContext) {
@@ -27,9 +27,8 @@ export default function verifyRule(ruleNode, fileContext) {
         labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
-    const metaLevelLocalContext = MetaLevelLocalContext.fromFileContext(fileContext),
-          premises = [],
-          localContext = metaLevelLocalContext, ///
+    const premises = [],
+          localContext = LocalContext.fromFileContext(fileContext),
           premiseNodes = premisesNodeQuery(ruleNode),
           premisesVerified = verifyPremises(premiseNodes, premises, localContext);
 
@@ -39,20 +38,20 @@ export default function verifyRule(ruleNode, fileContext) {
             conclusionVerified = verifyConclusion(conclusionNode, conclusions, localContext);
 
       if (conclusionVerified) {
-        let metaproofVerified = true; ///
+        let proofVerified = true; ///
 
         const firstConclusion = first(conclusions),
-              metaproofNode = metaproofNodeQuery(ruleNode),
+              proofNode = proofNodeQuery(ruleNode),
               conclusion = firstConclusion; ///
 
-        if (metaproofNode !== null) {
+        if (proofNode !== null) {
           const substitutions = [],
-                metastatementNode = conclusion.getMetastatementNode();
+                statementNode = conclusion.getStatementNode();
 
-          metaproofVerified = verifyMetaproof(metaproofNode, metastatementNode, substitutions, localContext);
+          proofVerified = verifyProof(proofNode, statementNode, substitutions, localContext);
         }
 
-        if (metaproofVerified) {
+        if (proofVerified) {
           const rule = Rule.fromLabelsPremisesConclusionAndFileContext(labels, premises, conclusion, fileContext);
 
           fileContext.addRule(rule);