occam-verify-cli 1.0.68 → 1.0.70

package/lib/dom/axiom.js

@@ -14,6 +14,7 @@ var _query = require("../utilities/query");
 var _constants = require("../constants");
 var _dom = require("../dom");
 var _json = require("../utilities/json");
+var _context = require("../utilities/context");
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -165,7 +166,7 @@ function _is_native_reflect_construct() {
     })();
 }
 var _Axiom;
-var match = _necessary.arrayUtilities.match;
+var match = _necessary.arrayUtilities.match, backwardsSome = _necessary.arrayUtilities.backwardsSome;
 var firstPrimaryKeywordTerminalNodeQuery = (0, _query.nodeQuery)("/axiom/@primary-keyword[0]");
 var _default = (0, _dom.domAssigned)((_Axiom = /*#__PURE__*/ function(TopLevelAssertion) {
     _inherits(Axiom, TopLevelAssertion);
@@ -279,11 +280,23 @@ var _default = (0, _dom.domAssigned)((_Axiom = /*#__PURE__*/ function(TopLevelAs
             value: function unifyStatementAndProofStepSubproofs(statement, proofStepSubproofs, substitutions, context) {
                 var statementAndProofStepSubproofsUnified;
                 statementAndProofStepSubproofsUnified = _get(_get_prototype_of(Axiom.prototype), "unifyStatementAndProofStepSubproofs", this).call(this, statement, proofStepSubproofs, substitutions, context);
-                // if (statementAndProofStepSubproofsUnified) {
-                //   if (this.satisfying) {
-                //     debugger
-                //   }
-                // }
+                if (statementAndProofStepSubproofsUnified) {
+                    if (this.satisfying) {
+                        var substitutionsMatch = backwardsSome(proofStepSubproofs, function(proofStepSubproof) {
+                            var proofStepSubproofProofStep = proofStepSubproof.isProofStep();
+                            if (proofStepSubproofProofStep) {
+                                var proofStep = proofStepSubproof, _$statement = proofStep.getStatement(), satisfyingAssertion = (0, _context.satisfyingAssertionFromStatement)(_$statement, context);
+                                if (satisfyingAssertion !== null) {
+                                    var substitutionsMatch = satisfyingAssertion.matchSubstitutions(substitutions, context);
+                                    if (substitutionsMatch) {
+                                        return true;
+                                    }
+                                }
+                            }
+                        });
+                        statementAndProofStepSubproofsUnified = substitutionsMatch; ///
+                    }
+                }
                 return statementAndProofStepSubproofsUnified;
             }
         },
@@ -327,4 +340,4 @@ function satisfyingFromNode(node, fileContext) {
     return satisfying;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/axiom.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nimport TopLevelAssertion  from \"./topLevelAssertion\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { SATISFYING } from \"../constants\";\nimport { domAssigned } from \"../dom\";\nimport { labelsFromJSON,\n         deductionFromJSON,\n         satisfyingFromJSON,\n         labelsToLabelsJSON,\n         suppositionsFromJSON,\n         deductionToDeductionJSON,\n         suppositionsToSuppositionsJSON } from \"../utilities/json\";\nimport { proofFromNode, labelsFromNode, deductionFromNode, suppositionsFromNode, stringFromLabelsAndDeduction } from \"./topLevelAssertion\";\n\nconst { match } = arrayUtilities;\n\nconst firstPrimaryKeywordTerminalNodeQuery = nodeQuery(\"/axiom/@primary-keyword[0]\");\n\nexport default domAssigned(class Axiom extends TopLevelAssertion {\n  constructor(fileContext, string, labels, suppositions, deduction, proof, satisfying) {\n    super(fileContext, string, labels, suppositions, deduction, proof);\n\n    this.satisfying = satisfying;\n  }\n\n  isSatisfying() {\n    return this.satisfying;\n  }\n\n  verify() {\n    let verified;\n\n    const axiom = this, ///\n          axiomString = axiom.getString(),\n          fileContext = this.getFileContext();\n\n    fileContext.trace(`Verifying the '${axiomString}' axiom...`);\n\n    verified = super.verify();\n\n    if (verified) {\n      const axiom = this; ///\n\n      fileContext.addAxiom(axiom);\n\n      fileContext.debug(`...verified the '${axiomString}' axiom.`);\n    }\n\n    return verified;\n  }\n\n  unifyDeduction(generalDeduction, specificDeduction, substitutions, generalContext, specificContext) {\n    let deductionUnified;\n\n    const context = specificContext,  ///\n          generalDeductionString = generalDeduction.getString(),\n          specificDeductionString = specificDeduction.getString();\n\n    context.trace(`Unifying the '${specificDeductionString}' deduction with the '${generalDeductionString}' deduction...`);\n\n    const statement = specificDeduction.getStatement(),\n          statementUnified = generalDeduction.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    deductionUnified = statementUnified;  ///\n\n    if (deductionUnified) {\n      context.debug(`...unified the '${specificDeductionString}' deduction with the '${generalDeductionString}' deduction.`);\n    }\n\n    return deductionUnified;\n  }\n\n  unifySupposition(generalSupposition, specificSupposition, substitutions, generalContext, specificContext) {\n    let suppositionUnified;\n\n    const context = specificContext,  ///\n          generalSuppositionString = generalSupposition.getString(),\n          specificSuppositionString = specificSupposition.getString();\n\n    context.trace(`Unifying the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition...`);\n\n    const statement = specificSupposition.getStatement(),\n          statementUnified = generalSupposition.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    suppositionUnified = statementUnified;  ///\n\n    if (suppositionUnified) {\n      context.debug(`...unified the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition.`);\n    }\n\n    return suppositionUnified;\n  }\n\n  unifySuppositions(generalSuppositions, specificSuppositions, substitutions, generalContext, specificContext) {\n    let suppositionsUnified;\n\n    const suppositionsMatch = match(generalSuppositions, specificSuppositions, (generalSupposition, specificSupposition) => {\n      const suppositionUnified = this.unifySupposition(generalSupposition, specificSupposition, substitutions, generalContext, specificContext);\n\n      if (suppositionUnified) {\n        return true;\n      }\n    });\n\n    suppositionsUnified = suppositionsMatch;  ///\n\n    return suppositionsUnified;\n  }\n\n  unifyAxiomLemmaTheoremConjecture(axiomLemmaTheoremConjecture, substitutions, context) {\n    let axiomLemmaTheoremConjectureUnified = false;\n\n    const axiomString = this.getString(),\n          axiomLemmaTheoremConjectureString = axiomLemmaTheoremConjecture.getString();\n\n    context.trace(`Unifying the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture with the '${axiomString}' axiom...`);\n\n    const fileContext = this.getFileContext(),\n          generalContext = fileContext, ///\n          specificContext = context;  ///\n\n    let deduction;\n\n    deduction = this.getDeduction();\n\n    const generalDeduction = deduction; ///\n\n    deduction = axiomLemmaTheoremConjecture.getDeduction();\n\n    const specificDeduction = deduction,  ///\n          deductionUnified = this.unifyDeduction(generalDeduction, specificDeduction, substitutions, generalContext, specificContext);\n\n    if (deductionUnified) {\n      let suppositions;\n\n      suppositions = this.getSuppositions();\n\n      const generalSuppositions = suppositions; ///\n\n      suppositions = axiomLemmaTheoremConjecture.getSuppositions();\n\n      const specificSuppositions = suppositions,  ///\n            suppositionsUnified = this.unifySuppositions(generalSuppositions, specificSuppositions, substitutions, generalContext, specificContext);\n\n      axiomLemmaTheoremConjectureUnified = suppositionsUnified; ///\n    }\n\n    if (axiomLemmaTheoremConjectureUnified) {\n      context.debug(`...unified the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture with the '${axiomString}' axiom.`);\n    }\n\n    return axiomLemmaTheoremConjectureUnified;\n  }\n\n  unifyStatementAndProofStepSubproofs(statement, proofStepSubproofs, substitutions, context) {\n    let statementAndProofStepSubproofsUnified;\n\n    statementAndProofStepSubproofsUnified = super.unifyStatementAndProofStepSubproofs(statement, proofStepSubproofs, substitutions, context);\n\n    // if (statementAndProofStepSubproofsUnified) {\n    //   if (this.satisfying) {\n    //     debugger\n    //   }\n    // }\n\n    return statementAndProofStepSubproofsUnified;\n  }\n\n  static name = \"Axiom\";\n\n  toJSON() {\n    let labels = this.getLabels(),\n        deduction = this.getDeduction(),\n        suppositions = this.getSuppositions();\n\n    const labelsJSON = labelsToLabelsJSON(labels),\n          deductionJSON = deductionToDeductionJSON(deduction),\n          suppositionsJSON = suppositionsToSuppositionsJSON(suppositions);\n\n    labels = labelsJSON;  ///\n    deduction = deductionJSON;  ///\n    suppositions = suppositionsJSON;  ///\n\n    const satisfying = this.satisfying,\n          json = {\n            labels,\n            deduction,\n            suppositions,\n            satisfying\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const labels = labelsFromJSON(json, fileContext),\n          suppositions = suppositionsFromJSON(json, fileContext),\n          deduction = deductionFromJSON(json, fileContext),\n          proof = null,\n          satisfying = satisfyingFromJSON(json, fileContext),\n          string = stringFromLabelsAndDeduction(labels, deduction),\n          topLevelAssertion = new Axiom(fileContext, string, labels, suppositions, deduction, proof, satisfying);\n\n    return topLevelAssertion;\n  }\n\n  static fromAxiomNode(axiomNode, fileContext) {\n    const node = axiomNode, ///\n          labels = labelsFromNode(node, fileContext),\n          suppositions = suppositionsFromNode(node, fileContext),\n          deduction = deductionFromNode(node, fileContext),\n          proof = proofFromNode(node, fileContext),\n          satisfying = satisfyingFromNode(node, fileContext),\n          string = stringFromLabelsAndDeduction(labels, deduction),\n          topLevelAssertion = new Axiom(fileContext, string, labels, suppositions, deduction, proof, satisfying);\n\n    return topLevelAssertion;\n  }\n});\n\nfunction satisfyingFromNode(node, fileContext) {\n  const firstPrimaryKeywordTerminalNode = firstPrimaryKeywordTerminalNodeQuery(node),\n        content = firstPrimaryKeywordTerminalNode.getContent(),\n        contentSatisfying = (content === SATISFYING),\n        satisfying = contentSatisfying; ///\n\n  return satisfying;\n}\n\n"],"names":["match","arrayUtilities","firstPrimaryKeywordTerminalNodeQuery","nodeQuery","domAssigned","Axiom","fileContext","string","labels","suppositions","deduction","proof","satisfying","isSatisfying","verify","verified","axiom","axiomString","getString","getFileContext","trace","addAxiom","debug","unifyDeduction","generalDeduction","specificDeduction","substitutions","generalContext","specificContext","deductionUnified","context","generalDeductionString","specificDeductionString","statement","getStatement","statementUnified","unifyStatement","unifySupposition","generalSupposition","specificSupposition","suppositionUnified","generalSuppositionString","specificSuppositionString","unifySuppositions","generalSuppositions","specificSuppositions","suppositionsUnified","suppositionsMatch","unifyAxiomLemmaTheoremConjecture","axiomLemmaTheoremConjecture","axiomLemmaTheoremConjectureUnified","axiomLemmaTheoremConjectureString","getDeduction","getSuppositions","unifyStatementAndProofStepSubproofs","proofStepSubproofs","statementAndProofStepSubproofsUnified","toJSON","getLabels","labelsJSON","labelsToLabelsJSON","deductionJSON","deductionToDeductionJSON","suppositionsJSON","suppositionsToSuppositionsJSON","json","fromJSON","labelsFromJSON","suppositionsFromJSON","deductionFromJSON","satisfyingFromJSON","stringFromLabelsAndDeduction","topLevelAssertion","fromAxiomNode","axiomNode","node","labelsFromNode","suppositionsFromNode","deductionFromNode","proofFromNode","satisfyingFromNode","TopLevelAssertion","name","firstPrimaryKeywordTerminalNode","content","getContent","contentSatisfying","SATISFYING"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/axiom.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nimport TopLevelAssertion  from \"./topLevelAssertion\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { SATISFYING } from \"../constants\";\nimport { domAssigned } from \"../dom\";\nimport { labelsFromJSON,\n         deductionFromJSON,\n         satisfyingFromJSON,\n         labelsToLabelsJSON,\n         suppositionsFromJSON,\n         deductionToDeductionJSON,\n         suppositionsToSuppositionsJSON } from \"../utilities/json\";\nimport { satisfyingAssertionFromStatement } from \"../utilities/context\";\nimport { proofFromNode, labelsFromNode, deductionFromNode, suppositionsFromNode, stringFromLabelsAndDeduction } from \"./topLevelAssertion\";\n\nconst { match, backwardsSome } = arrayUtilities;\n\nconst firstPrimaryKeywordTerminalNodeQuery = nodeQuery(\"/axiom/@primary-keyword[0]\");\n\nexport default domAssigned(class Axiom extends TopLevelAssertion {\n  constructor(fileContext, string, labels, suppositions, deduction, proof, satisfying) {\n    super(fileContext, string, labels, suppositions, deduction, proof);\n\n    this.satisfying = satisfying;\n  }\n\n  isSatisfying() {\n    return this.satisfying;\n  }\n\n  verify() {\n    let verified;\n\n    const axiom = this, ///\n          axiomString = axiom.getString(),\n          fileContext = this.getFileContext();\n\n    fileContext.trace(`Verifying the '${axiomString}' axiom...`);\n\n    verified = super.verify();\n\n    if (verified) {\n      const axiom = this; ///\n\n      fileContext.addAxiom(axiom);\n\n      fileContext.debug(`...verified the '${axiomString}' axiom.`);\n    }\n\n    return verified;\n  }\n\n  unifyDeduction(generalDeduction, specificDeduction, substitutions, generalContext, specificContext) {\n    let deductionUnified;\n\n    const context = specificContext,  ///\n          generalDeductionString = generalDeduction.getString(),\n          specificDeductionString = specificDeduction.getString();\n\n    context.trace(`Unifying the '${specificDeductionString}' deduction with the '${generalDeductionString}' deduction...`);\n\n    const statement = specificDeduction.getStatement(),\n          statementUnified = generalDeduction.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    deductionUnified = statementUnified;  ///\n\n    if (deductionUnified) {\n      context.debug(`...unified the '${specificDeductionString}' deduction with the '${generalDeductionString}' deduction.`);\n    }\n\n    return deductionUnified;\n  }\n\n  unifySupposition(generalSupposition, specificSupposition, substitutions, generalContext, specificContext) {\n    let suppositionUnified;\n\n    const context = specificContext,  ///\n          generalSuppositionString = generalSupposition.getString(),\n          specificSuppositionString = specificSupposition.getString();\n\n    context.trace(`Unifying the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition...`);\n\n    const statement = specificSupposition.getStatement(),\n          statementUnified = generalSupposition.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    suppositionUnified = statementUnified;  ///\n\n    if (suppositionUnified) {\n      context.debug(`...unified the '${specificSuppositionString}' supposition with the '${generalSuppositionString}' supposition.`);\n    }\n\n    return suppositionUnified;\n  }\n\n  unifySuppositions(generalSuppositions, specificSuppositions, substitutions, generalContext, specificContext) {\n    let suppositionsUnified;\n\n    const suppositionsMatch = match(generalSuppositions, specificSuppositions, (generalSupposition, specificSupposition) => {\n      const suppositionUnified = this.unifySupposition(generalSupposition, specificSupposition, substitutions, generalContext, specificContext);\n\n      if (suppositionUnified) {\n        return true;\n      }\n    });\n\n    suppositionsUnified = suppositionsMatch;  ///\n\n    return suppositionsUnified;\n  }\n\n  unifyAxiomLemmaTheoremConjecture(axiomLemmaTheoremConjecture, substitutions, context) {\n    let axiomLemmaTheoremConjectureUnified = false;\n\n    const axiomString = this.getString(),\n          axiomLemmaTheoremConjectureString = axiomLemmaTheoremConjecture.getString();\n\n    context.trace(`Unifying the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture with the '${axiomString}' axiom...`);\n\n    const fileContext = this.getFileContext(),\n          generalContext = fileContext, ///\n          specificContext = context;  ///\n\n    let deduction;\n\n    deduction = this.getDeduction();\n\n    const generalDeduction = deduction; ///\n\n    deduction = axiomLemmaTheoremConjecture.getDeduction();\n\n    const specificDeduction = deduction,  ///\n          deductionUnified = this.unifyDeduction(generalDeduction, specificDeduction, substitutions, generalContext, specificContext);\n\n    if (deductionUnified) {\n      let suppositions;\n\n      suppositions = this.getSuppositions();\n\n      const generalSuppositions = suppositions; ///\n\n      suppositions = axiomLemmaTheoremConjecture.getSuppositions();\n\n      const specificSuppositions = suppositions,  ///\n            suppositionsUnified = this.unifySuppositions(generalSuppositions, specificSuppositions, substitutions, generalContext, specificContext);\n\n      axiomLemmaTheoremConjectureUnified = suppositionsUnified; ///\n    }\n\n    if (axiomLemmaTheoremConjectureUnified) {\n      context.debug(`...unified the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture with the '${axiomString}' axiom.`);\n    }\n\n    return axiomLemmaTheoremConjectureUnified;\n  }\n\n  unifyStatementAndProofStepSubproofs(statement, proofStepSubproofs, substitutions, context) {\n    let statementAndProofStepSubproofsUnified;\n\n    statementAndProofStepSubproofsUnified = super.unifyStatementAndProofStepSubproofs(statement, proofStepSubproofs, substitutions, context);\n\n    if (statementAndProofStepSubproofsUnified) {\n      if (this.satisfying) {\n        const substitutionsMatch = backwardsSome(proofStepSubproofs, (proofStepSubproof) => {\n          const proofStepSubproofProofStep = proofStepSubproof.isProofStep();\n\n          if (proofStepSubproofProofStep) {\n            const proofStep = proofStepSubproof,  ///\n                  statement = proofStep.getStatement(),\n                  satisfyingAssertion = satisfyingAssertionFromStatement(statement, context);\n\n            if (satisfyingAssertion !== null) {\n              const substitutionsMatch = satisfyingAssertion.matchSubstitutions(substitutions, context);\n\n              if (substitutionsMatch) {\n                return true;\n              }\n            }\n          }\n        });\n\n        statementAndProofStepSubproofsUnified = substitutionsMatch; ///\n      }\n    }\n\n    return statementAndProofStepSubproofsUnified;\n  }\n\n  toJSON() {\n    let labels = this.getLabels(),\n        deduction = this.getDeduction(),\n        suppositions = this.getSuppositions();\n\n    const labelsJSON = labelsToLabelsJSON(labels),\n          deductionJSON = deductionToDeductionJSON(deduction),\n          suppositionsJSON = suppositionsToSuppositionsJSON(suppositions);\n\n    labels = labelsJSON;  ///\n    deduction = deductionJSON;  ///\n    suppositions = suppositionsJSON;  ///\n\n    const satisfying = this.satisfying,\n          json = {\n            labels,\n            deduction,\n            suppositions,\n            satisfying\n          };\n\n    return json;\n  }\n\n  static name = \"Axiom\";\n\n  static fromJSON(json, fileContext) {\n    const labels = labelsFromJSON(json, fileContext),\n          suppositions = suppositionsFromJSON(json, fileContext),\n          deduction = deductionFromJSON(json, fileContext),\n          proof = null,\n          satisfying = satisfyingFromJSON(json, fileContext),\n          string = stringFromLabelsAndDeduction(labels, deduction),\n          topLevelAssertion = new Axiom(fileContext, string, labels, suppositions, deduction, proof, satisfying);\n\n    return topLevelAssertion;\n  }\n\n  static fromAxiomNode(axiomNode, fileContext) {\n    const node = axiomNode, ///\n          labels = labelsFromNode(node, fileContext),\n          suppositions = suppositionsFromNode(node, fileContext),\n          deduction = deductionFromNode(node, fileContext),\n          proof = proofFromNode(node, fileContext),\n          satisfying = satisfyingFromNode(node, fileContext),\n          string = stringFromLabelsAndDeduction(labels, deduction),\n          topLevelAssertion = new Axiom(fileContext, string, labels, suppositions, deduction, proof, satisfying);\n\n    return topLevelAssertion;\n  }\n});\n\nfunction satisfyingFromNode(node, fileContext) {\n  const firstPrimaryKeywordTerminalNode = firstPrimaryKeywordTerminalNodeQuery(node),\n        content = firstPrimaryKeywordTerminalNode.getContent(),\n        contentSatisfying = (content === SATISFYING),\n        satisfying = contentSatisfying; ///\n\n  return satisfying;\n}\n\n"],"names":["match","arrayUtilities","backwardsSome","firstPrimaryKeywordTerminalNodeQuery","nodeQuery","domAssigned","Axiom","fileContext","string","labels","suppositions","deduction","proof","satisfying","isSatisfying","verify","verified","axiom","axiomString","getString","getFileContext","trace","addAxiom","debug","unifyDeduction","generalDeduction","specificDeduction","substitutions","generalContext","specificContext","deductionUnified","context","generalDeductionString","specificDeductionString","statement","getStatement","statementUnified","unifyStatement","unifySupposition","generalSupposition","specificSupposition","suppositionUnified","generalSuppositionString","specificSuppositionString","unifySuppositions","generalSuppositions","specificSuppositions","suppositionsUnified","suppositionsMatch","unifyAxiomLemmaTheoremConjecture","axiomLemmaTheoremConjecture","axiomLemmaTheoremConjectureUnified","axiomLemmaTheoremConjectureString","getDeduction","getSuppositions","unifyStatementAndProofStepSubproofs","proofStepSubproofs","statementAndProofStepSubproofsUnified","substitutionsMatch","proofStepSubproof","proofStepSubproofProofStep","isProofStep","proofStep","satisfyingAssertion","satisfyingAssertionFromStatement","matchSubstitutions","toJSON","getLabels","labelsJSON","labelsToLabelsJSON","deductionJSON","deductionToDeductionJSON","suppositionsJSON","suppositionsToSuppositionsJSON","json","fromJSON","labelsFromJSON","suppositionsFromJSON","deductionFromJSON","satisfyingFromJSON","stringFromLabelsAndDeduction","topLevelAssertion","fromAxiomNode","axiomNode","node","labelsFromNode","suppositionsFromNode","deductionFromNode","proofFromNode","satisfyingFromNode","TopLevelAssertion","name","firstPrimaryKeywordTerminalNode","content","getContent","contentSatisfying","SATISFYING"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.68",
+  "version": "1.0.70",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -11,15 +11,15 @@
   },
   "dependencies": {
     "argumentative": "^2.0.32",
-    "necessary": "^14.2.1",
-    "occam-custom-grammars": "^5.0.1072",
-    "occam-entities": "^1.0.284",
-    "occam-file-system": "^6.0.306",
-    "occam-furtle": "^2.0.58",
-    "occam-grammar-utilities": "^8.0.250",
-    "occam-lexers": "^23.0.37",
-    "occam-parsers": "^23.0.42",
-    "occam-query": "^4.1.21"
+    "necessary": "^14.3.2",
+    "occam-custom-grammars": "^5.0.1073",
+    "occam-entities": "^1.0.285",
+    "occam-file-system": "^6.0.307",
+    "occam-furtle": "^2.0.59",
+    "occam-grammar-utilities": "^8.0.256",
+    "occam-lexers": "^23.0.43",
+    "occam-parsers": "^23.0.48",
+    "occam-query": "^4.1.27"
   },
   "devDependencies": {
     "@swc/core": "^1.5.6",

package/src/dom/axiom.js

@@ -14,9 +14,10 @@ import { labelsFromJSON,
          suppositionsFromJSON,
          deductionToDeductionJSON,
          suppositionsToSuppositionsJSON } from "../utilities/json";
+import { satisfyingAssertionFromStatement } from "../utilities/context";
 import { proofFromNode, labelsFromNode, deductionFromNode, suppositionsFromNode, stringFromLabelsAndDeduction } from "./topLevelAssertion";
 
-const { match } = arrayUtilities;
+const { match, backwardsSome } = arrayUtilities;
 
 const firstPrimaryKeywordTerminalNodeQuery = nodeQuery("/axiom/@primary-keyword[0]");
 
@@ -161,17 +162,33 @@ export default domAssigned(class Axiom extends TopLevelAssertion {
 
     statementAndProofStepSubproofsUnified = super.unifyStatementAndProofStepSubproofs(statement, proofStepSubproofs, substitutions, context);
 
-    // if (statementAndProofStepSubproofsUnified) {
-    //   if (this.satisfying) {
-    //     debugger
-    //   }
-    // }
+    if (statementAndProofStepSubproofsUnified) {
+      if (this.satisfying) {
+        const substitutionsMatch = backwardsSome(proofStepSubproofs, (proofStepSubproof) => {
+          const proofStepSubproofProofStep = proofStepSubproof.isProofStep();
+
+          if (proofStepSubproofProofStep) {
+            const proofStep = proofStepSubproof,  ///
+                  statement = proofStep.getStatement(),
+                  satisfyingAssertion = satisfyingAssertionFromStatement(statement, context);
+
+            if (satisfyingAssertion !== null) {
+              const substitutionsMatch = satisfyingAssertion.matchSubstitutions(substitutions, context);
+
+              if (substitutionsMatch) {
+                return true;
+              }
+            }
+          }
+        });
+
+        statementAndProofStepSubproofsUnified = substitutionsMatch; ///
+      }
+    }
 
     return statementAndProofStepSubproofsUnified;
   }
 
-  static name = "Axiom";
-
   toJSON() {
     let labels = this.getLabels(),
         deduction = this.getDeduction(),
@@ -196,6 +213,8 @@ export default domAssigned(class Axiom extends TopLevelAssertion {
     return json;
   }
 
+  static name = "Axiom";
+
   static fromJSON(json, fileContext) {
     const labels = labelsFromJSON(json, fileContext),
           suppositions = suppositionsFromJSON(json, fileContext),