occam-verify-cli 0.0.878 → 0.0.880

package/src/verify/metaproof.js

@@ -6,11 +6,11 @@ import { nodeQuery } from "../utilities/query";
 
 const metaDerivationNodeQuery = nodeQuery("/metaproof/metaDerivation!");
 
-export default function verifyMetaproof(metaproofNode, conclusion, localMetaproof) {
+export default function verifyMetaproof(metaproofNode, conclusion, substitutions, localMetaproof) {
   let metaproofVerified = false;
 
   const metaDerivationNode = metaDerivationNodeQuery(metaproofNode),
-        metaDerivationVerified = verifyMetaDerivation(metaDerivationNode, localMetaproof);
+        metaDerivationVerified = verifyMetaDerivation(metaDerivationNode, substitutions, localMetaproof);
 
   if (metaDerivationVerified) {
     const lastMetaproofStep = localMetaproof.getLastMetaproofStep();

package/src/verify/metastatement/qualified.js

@@ -1,13 +1,14 @@
 "use strict";
 
 import verifyMetastatement from "../metastatement";
+import verifyMetavariableAgainstMetastatement from "../../verify/metavariableAgainstMetastatement";
 
 import { nodeQuery } from "../../utilities/query";
 
 const metastatementNodeQuery = nodeQuery("/qualifiedMetastatement/metastatement!"),
       referenceMetavariableNodeQuery = nodeQuery("/qualifiedMetastatement/reference!/metavariable!");
 
-export default function verifyQualifiedMetastatement(qualifiedMetastatementNode, metavariableReferences, assignments, derived, localMetaContext) {
+export default function verifyQualifiedMetastatement(qualifiedMetastatementNode, substitutions, assignments, derived, localMetaContext) {
   let qualifiedMetastatementVerified = false;
 
   const metastatementNode = metastatementNodeQuery(qualifiedMetastatementNode);
@@ -27,18 +28,26 @@ export default function verifyQualifiedMetastatement(qualifiedMetastatementNode,
 
       qualifiedMetastatementVerified = ruleMatchesMetastatement;  ///
     } else {
-      if (metavariableReferences) {
+      if (substitutions !== null) {
         const metavariableNode = referenceMetavariableNode, ///
               metavariablePresent = localMetaContext.isMetavariablePresentByMetavariableNode(metavariableNode, localMetaContext);
 
         if (metavariablePresent) {
           const metastatementVerified = verifyMetastatement(metastatementNode, assignments, derived, localMetaContext, () => {
-                  const verifiedAhead = true;
+            const verifiedAhead = true;
 
-                  return verifiedAhead;
-                });
+            return verifiedAhead;
+          });
 
-          qualifiedMetastatementVerified = metastatementVerified; ///
+          if (metastatementVerified) {
+            const metavariableVerifiedAgainstMetastatement = verifyMetavariableAgainstMetastatement(metavariableNode, metastatementNode, substitutions, () => {
+              const verifiedAhead = true;
+
+              return verifiedAhead;
+            });
+
+            qualifiedMetastatementVerified = metavariableVerifiedAgainstMetastatement; ///
+          }
         }
       }
     }

package/src/verify/metatheorem.js

@@ -28,23 +28,24 @@ export default function verifyMetatheorem(metatheoremNode, fileContext) {
         labelsVerified = verifyLabels(labelsNode, labels, fileContext);
 
   if (labelsVerified) {
-    const metaSuppositions = [],
+    const substitutions = [],
+          metaSuppositions = [],
           metaSuppositionNodes = metaSuppositionsNodeQuery(metatheoremNode),
-          metaSuppositionsVerified = verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions, localMetaContext);
+          metaSuppositionsVerified = verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions, substitutions, localMetaContext);
 
     if (metaSuppositionsVerified) {
       const metaConsequents = [],
             metaConsequentNode = metaConsequentNodeQuery(metatheoremNode),
-            metaConsequentVerified = verifyMetaConsequent(metaConsequentNode, metaConsequents, localMetaContext);
+            metaConsequentVerified = verifyMetaConsequent(metaConsequentNode, metaConsequents, substitutions, localMetaContext);
 
       if (metaConsequentVerified) {
         const metaproofNode = metaproofNodeQuery(metatheoremNode),
               firstMetaConsequent = first(metaConsequents),
               metaConsequent = firstMetaConsequent, ///
-              metaproofVerified = verifyMetaproof(metaproofNode, metaConsequent, localMetaContext);
+              metaproofVerified = verifyMetaproof(metaproofNode, metaConsequent, substitutions, localMetaContext);
 
         if (metaproofVerified) {
-          const metatheorem = Metatheorem.fromLabelsMetaSuppositionsMetaConsequentAndFileContext(labels, metaSuppositions, metaConsequent, fileContext);
+          const metatheorem = Metatheorem.fromLabelsMetaSuppositionsMetaConsequentSubstitutionsAndFileContext(labels, metaSuppositions, metaConsequent, substitutions, fileContext);
 
           fileContext.addMetatheorem(metatheorem);
 

package/src/verify/metavariableAgainstMetastatement.js

@@ -2,7 +2,7 @@
 
 import MetastatementForMetavariableSubstitution from "../substitution/metastatementForMetavariable";
 
-export default function verifyMetavariableAgainstMetastatement(metavariableNode, metastatementNode, substitutions, localContextA, localMetaContextB, verifyAhead) {
+export default function verifyMetavariableAgainstMetastatement(metavariableNode, metastatementNode, substitutions, verifyAhead) {
   let metavariableVerifiedAgainstMetastatement = false;
 
   const substitution = substitutions.find((substitution) => {

package/src/verify/ruleDerivation.js

@@ -94,10 +94,10 @@ function verifyChild(childNode, localMetaContext) {
 
       const derived = true,
             assignments = [],
-            metavariableReferences = true,
+            substitutions = null,
             qualifiedMetastatementNode = childNode;  ///
 
-      qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, metavariableReferences, assignments, derived, localMetaContext);
+      qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, substitutions, assignments, derived, localMetaContext);
 
       if (qualifiedMetastatementVerified) {
         const assignmentAssigned = assignAssignment(assignments, localMetaContext);

package/lib/utilities/metaEquivalences.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "mergeMetaEquivalences", {
-    enumerable: true,
-    get: function() {
-        return mergeMetaEquivalences;
-    }
-});
-function mergeMetaEquivalences(metaEquivalencesA, metaEquivalencesB, localMetaContext) {
-    debugger;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbWV0YUVxdWl2YWxlbmNlcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIG1lcmdlTWV0YUVxdWl2YWxlbmNlcyhtZXRhRXF1aXZhbGVuY2VzQSwgbWV0YUVxdWl2YWxlbmNlc0IsIGxvY2FsTWV0YUNvbnRleHQpIHtcbiAgZGVidWdnZXJcbn1cbiJdLCJuYW1lcyI6WyJtZXJnZU1ldGFFcXVpdmFsZW5jZXMiLCJtZXRhRXF1aXZhbGVuY2VzQSIsIm1ldGFFcXVpdmFsZW5jZXNCIiwibG9jYWxNZXRhQ29udGV4dCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBRWdCQTs7O2VBQUFBOzs7QUFBVCxTQUFTQSxzQkFBc0JDLGlCQUFpQixFQUFFQyxpQkFBaUIsRUFBRUMsZ0JBQWdCO0lBQzFGLFFBQVE7QUFDViJ9

package/src/utilities/metaEquivalences.js

@@ -1,5 +0,0 @@
-"use strict";
-
-export function mergeMetaEquivalences(metaEquivalencesA, metaEquivalencesB, localMetaContext) {
-  debugger
-}