occam-verify-cli 1.0.852 → 1.0.857

package/lib/utilities/substitutions.js

@@ -12,8 +12,8 @@ _export(exports, {
     get frameFromFrameAndSubstitutions () {
         return frameFromFrameAndSubstitutions;
     },
-    get metavariableNodesFromSubstitutions () {
-        return metavariableNodesFromSubstitutions;
+    get metavariableNodesFromDerivedSubstitutions () {
+        return metavariableNodesFromDerivedSubstitutions;
     },
     get statementFromStatementAndSubstitutions () {
         return statementFromStatementAndSubstitutions;
@@ -78,10 +78,10 @@ function statementFromStatementAndSubstitutions(statement, generalContext, speci
     }
     return statement;
 }
-function metavariableNodesFromSubstitutions(substitutions) {
+function metavariableNodesFromDerivedSubstitutions(derivedSubstitutions) {
     const metavariableNodes = [];
-    substitutions.forEach((substitution)=>{
-        const metavariableNode = substitution.getMetavariableNode();
+    derivedSubstitutions.forEach((derivedSubstitution)=>{
+        const metavariableNode = derivedSubstitution.getMetavariableNode();
         if (metavariableNode !== null) {
             metavariableNodes.push(metavariableNode);
         }
@@ -95,4 +95,4 @@ function metavariableNodesFromSubstitutions(substitutions) {
     return metavariableNodes;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/substitutions.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nconst { compress } = arrayUtilities;\n\nexport function termFromTermAndSubstitutions(term, generalContext, specificContext) {\n  if (term !== null) {\n    const termNode = term.getNode(),\n          termSingular = term.isSingular();\n\n    term = null;  ///\n\n    if (termSingular) {\n      const variableNode = termNode.getVariableNode(),\n            substitution = specificContext.findSubstitutionByVariableNode(variableNode);\n\n      if (substitution !== null) {\n        const termSubstitution = substitution,  ///\n              replacementTerm = termSubstitution.getReplacementTerm();\n\n        term = replacementTerm; ///\n      }\n    }\n  }\n\n  return term;\n}\n\nexport function frameFromFrameAndSubstitutions(frame, generalContext, specificContext) {\n  if (frame !== null) {\n    const frameNode = frame.getNode(),\n          frameSingular = frame.isSingular();\n\n    frame = null;  ///\n\n    if (frameSingular) {\n      const metavariableNode = frameNode.getMetavariableNode(),\n            substitution = specificContext.findSubstitutionByMetavariableNode(metavariableNode);\n\n      if (substitution !== null) {\n        const frameSubstitution = substitution, ///\n              replacementFrame = frameSubstitution.getReplacementFrame();\n\n        frame = replacementFrame; ///\n      }\n    }\n  }\n\n  return frame;\n}\n\nexport function statementFromStatementAndSubstitutions(statement, generalContext, specificContext) {\n  if (statement !== null) {\n    const statementNode = statement.getNode(),\n          statementSingular = statement.isSingular();\n\n    statement = null;\n\n    if (statementSingular) {\n      let substitution = null;\n\n      const substitutionNode = statementNode.getSubstitutionNode();\n\n      if (substitutionNode !== null) {\n        let context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n\n        substitution = specificContext.findSubstitutionBySubstitutionNode(substitutionNode);\n\n        context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n      }\n\n      const metavariableNode = statementNode.getMetavariableNode();\n\n      substitution = (substitution !== null) ?\n                       specificContext.findSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution) :\n                         specificContext.findSubstitutionByMetavariableNode(metavariableNode);\n\n      if (substitution !== null) {\n        const statementSubstitution = substitution, ///\n              replacementStatement = statementSubstitution.getReplacementStatement();\n\n        statement = replacementStatement; ///\n      }\n    }\n  }\n\n  return statement;\n}\n\nexport function metavariableNodesFromSubstitutions(substitutions) {\n  const metavariableNodes = [];\n\n  substitutions.forEach((substitution) => {\n    const metavariableNode = substitution.getMetavariableNode();\n\n    if (metavariableNode !== null) {\n      metavariableNodes.push(metavariableNode);\n    }\n  });\n\n  compress(metavariableNodes, (metavariableNodeA, metavariableNodeB) => {\n    const metavariableNodeAMatchesetavariableNodeB = metavariableNodeA.match(metavariableNodeB);\n\n    if (!metavariableNodeAMatchesetavariableNodeB) {\n      return true;\n    }\n  });\n\n  return metavariableNodes;\n}\n"],"names":["frameFromFrameAndSubstitutions","metavariableNodesFromSubstitutions","statementFromStatementAndSubstitutions","termFromTermAndSubstitutions","compress","arrayUtilities","term","generalContext","specificContext","termNode","getNode","termSingular","isSingular","variableNode","getVariableNode","substitution","findSubstitutionByVariableNode","termSubstitution","replacementTerm","getReplacementTerm","frame","frameNode","frameSingular","metavariableNode","getMetavariableNode","findSubstitutionByMetavariableNode","frameSubstitution","replacementFrame","getReplacementFrame","statement","statementNode","statementSingular","substitutionNode","getSubstitutionNode","context","findSubstitutionBySubstitutionNode","findSubstitutionByMetavariableNodeAndSubstitution","statementSubstitution","replacementStatement","getReplacementStatement","substitutions","metavariableNodes","forEach","push","metavariableNodeA","metavariableNodeB","metavariableNodeAMatchesetavariableNodeB","match"],"mappings":"AAAA;;;;;;;;;;;QA6BgBA;eAAAA;;QAqEAC;eAAAA;;QA9CAC;eAAAA;;QA9CAC;eAAAA;;;2BAJe;AAE/B,MAAM,EAAEC,QAAQ,EAAE,GAAGC,yBAAc;AAE5B,SAASF,6BAA6BG,IAAI,EAAEC,cAAc,EAAEC,eAAe;IAChF,IAAIF,SAAS,MAAM;QACjB,MAAMG,WAAWH,KAAKI,OAAO,IACvBC,eAAeL,KAAKM,UAAU;QAEpCN,OAAO,MAAO,GAAG;QAEjB,IAAIK,cAAc;YAChB,MAAME,eAAeJ,SAASK,eAAe,IACvCC,eAAeP,gBAAgBQ,8BAA8B,CAACH;YAEpE,IAAIE,iBAAiB,MAAM;gBACzB,MAAME,mBAAmBF,cACnBG,kBAAkBD,iBAAiBE,kBAAkB;gBAE3Db,OAAOY,iBAAiB,GAAG;YAC7B;QACF;IACF;IAEA,OAAOZ;AACT;AAEO,SAASN,+BAA+BoB,KAAK,EAAEb,cAAc,EAAEC,eAAe;IACnF,IAAIY,UAAU,MAAM;QAClB,MAAMC,YAAYD,MAAMV,OAAO,IACzBY,gBAAgBF,MAAMR,UAAU;QAEtCQ,QAAQ,MAAO,GAAG;QAElB,IAAIE,eAAe;YACjB,MAAMC,mBAAmBF,UAAUG,mBAAmB,IAChDT,eAAeP,gBAAgBiB,kCAAkC,CAACF;YAExE,IAAIR,iBAAiB,MAAM;gBACzB,MAAMW,oBAAoBX,cACpBY,mBAAmBD,kBAAkBE,mBAAmB;gBAE9DR,QAAQO,kBAAkB,GAAG;YAC/B;QACF;IACF;IAEA,OAAOP;AACT;AAEO,SAASlB,uCAAuC2B,SAAS,EAAEtB,cAAc,EAAEC,eAAe;IAC/F,IAAIqB,cAAc,MAAM;QACtB,MAAMC,gBAAgBD,UAAUnB,OAAO,IACjCqB,oBAAoBF,UAAUjB,UAAU;QAE9CiB,YAAY;QAEZ,IAAIE,mBAAmB;YACrB,IAAIhB,eAAe;YAEnB,MAAMiB,mBAAmBF,cAAcG,mBAAmB;YAE1D,IAAID,qBAAqB,MAAM;gBAC7B,IAAIE,UAAU3B,gBAAgB,GAAG;gBAEjCA,iBAAiBC,iBAAiB,GAAG;gBAErCA,kBAAkB0B,SAAU,GAAG;gBAE/BnB,eAAeP,gBAAgB2B,kCAAkC,CAACH;gBAElEE,UAAU3B,gBAAgB,GAAG;gBAE7BA,iBAAiBC,iBAAiB,GAAG;gBAErCA,kBAAkB0B,SAAU,GAAG;YACjC;YAEA,MAAMX,mBAAmBO,cAAcN,mBAAmB;YAE1DT,eAAe,AAACA,iBAAiB,OAChBP,gBAAgB4B,iDAAiD,CAACb,kBAAkBR,gBAClFP,gBAAgBiB,kCAAkC,CAACF;YAEtE,IAAIR,iBAAiB,MAAM;gBACzB,MAAMsB,wBAAwBtB,cACxBuB,uBAAuBD,sBAAsBE,uBAAuB;gBAE1EV,YAAYS,sBAAsB,GAAG;YACvC;QACF;IACF;IAEA,OAAOT;AACT;AAEO,SAAS5B,mCAAmCuC,aAAa;IAC9D,MAAMC,oBAAoB,EAAE;IAE5BD,cAAcE,OAAO,CAAC,CAAC3B;QACrB,MAAMQ,mBAAmBR,aAAaS,mBAAmB;QAEzD,IAAID,qBAAqB,MAAM;YAC7BkB,kBAAkBE,IAAI,CAACpB;QACzB;IACF;IAEAnB,SAASqC,mBAAmB,CAACG,mBAAmBC;QAC9C,MAAMC,2CAA2CF,kBAAkBG,KAAK,CAACF;QAEzE,IAAI,CAACC,0CAA0C;YAC7C,OAAO;QACT;IACF;IAEA,OAAOL;AACT"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/substitutions.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nconst { compress } = arrayUtilities;\n\nexport function termFromTermAndSubstitutions(term, generalContext, specificContext) {\n  if (term !== null) {\n    const termNode = term.getNode(),\n          termSingular = term.isSingular();\n\n    term = null;  ///\n\n    if (termSingular) {\n      const variableNode = termNode.getVariableNode(),\n            substitution = specificContext.findSubstitutionByVariableNode(variableNode);\n\n      if (substitution !== null) {\n        const termSubstitution = substitution,  ///\n              replacementTerm = termSubstitution.getReplacementTerm();\n\n        term = replacementTerm; ///\n      }\n    }\n  }\n\n  return term;\n}\n\nexport function frameFromFrameAndSubstitutions(frame, generalContext, specificContext) {\n  if (frame !== null) {\n    const frameNode = frame.getNode(),\n          frameSingular = frame.isSingular();\n\n    frame = null;  ///\n\n    if (frameSingular) {\n      const metavariableNode = frameNode.getMetavariableNode(),\n            substitution = specificContext.findSubstitutionByMetavariableNode(metavariableNode);\n\n      if (substitution !== null) {\n        const frameSubstitution = substitution, ///\n              replacementFrame = frameSubstitution.getReplacementFrame();\n\n        frame = replacementFrame; ///\n      }\n    }\n  }\n\n  return frame;\n}\n\nexport function statementFromStatementAndSubstitutions(statement, generalContext, specificContext) {\n  if (statement !== null) {\n    const statementNode = statement.getNode(),\n          statementSingular = statement.isSingular();\n\n    statement = null;\n\n    if (statementSingular) {\n      let substitution = null;\n\n      const substitutionNode = statementNode.getSubstitutionNode();\n\n      if (substitutionNode !== null) {\n        let context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n\n        substitution = specificContext.findSubstitutionBySubstitutionNode(substitutionNode);\n\n        context = generalContext; ///\n\n        generalContext = specificContext; ///\n\n        specificContext = context;  ///\n      }\n\n      const metavariableNode = statementNode.getMetavariableNode();\n\n      substitution = (substitution !== null) ?\n                       specificContext.findSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution) :\n                         specificContext.findSubstitutionByMetavariableNode(metavariableNode);\n\n      if (substitution !== null) {\n        const statementSubstitution = substitution, ///\n              replacementStatement = statementSubstitution.getReplacementStatement();\n\n        statement = replacementStatement; ///\n      }\n    }\n  }\n\n  return statement;\n}\n\nexport function metavariableNodesFromDerivedSubstitutions(derivedSubstitutions) {\n  const metavariableNodes = [];\n\n  derivedSubstitutions.forEach((derivedSubstitution) => {\n    const metavariableNode = derivedSubstitution.getMetavariableNode();\n\n    if (metavariableNode !== null) {\n      metavariableNodes.push(metavariableNode);\n    }\n  });\n\n  compress(metavariableNodes, (metavariableNodeA, metavariableNodeB) => {\n    const metavariableNodeAMatchesetavariableNodeB = metavariableNodeA.match(metavariableNodeB);\n\n    if (!metavariableNodeAMatchesetavariableNodeB) {\n      return true;\n    }\n  });\n\n  return metavariableNodes;\n}\n"],"names":["frameFromFrameAndSubstitutions","metavariableNodesFromDerivedSubstitutions","statementFromStatementAndSubstitutions","termFromTermAndSubstitutions","compress","arrayUtilities","term","generalContext","specificContext","termNode","getNode","termSingular","isSingular","variableNode","getVariableNode","substitution","findSubstitutionByVariableNode","termSubstitution","replacementTerm","getReplacementTerm","frame","frameNode","frameSingular","metavariableNode","getMetavariableNode","findSubstitutionByMetavariableNode","frameSubstitution","replacementFrame","getReplacementFrame","statement","statementNode","statementSingular","substitutionNode","getSubstitutionNode","context","findSubstitutionBySubstitutionNode","findSubstitutionByMetavariableNodeAndSubstitution","statementSubstitution","replacementStatement","getReplacementStatement","derivedSubstitutions","metavariableNodes","forEach","derivedSubstitution","push","metavariableNodeA","metavariableNodeB","metavariableNodeAMatchesetavariableNodeB","match"],"mappings":"AAAA;;;;;;;;;;;QA6BgBA;eAAAA;;QAqEAC;eAAAA;;QA9CAC;eAAAA;;QA9CAC;eAAAA;;;2BAJe;AAE/B,MAAM,EAAEC,QAAQ,EAAE,GAAGC,yBAAc;AAE5B,SAASF,6BAA6BG,IAAI,EAAEC,cAAc,EAAEC,eAAe;IAChF,IAAIF,SAAS,MAAM;QACjB,MAAMG,WAAWH,KAAKI,OAAO,IACvBC,eAAeL,KAAKM,UAAU;QAEpCN,OAAO,MAAO,GAAG;QAEjB,IAAIK,cAAc;YAChB,MAAME,eAAeJ,SAASK,eAAe,IACvCC,eAAeP,gBAAgBQ,8BAA8B,CAACH;YAEpE,IAAIE,iBAAiB,MAAM;gBACzB,MAAME,mBAAmBF,cACnBG,kBAAkBD,iBAAiBE,kBAAkB;gBAE3Db,OAAOY,iBAAiB,GAAG;YAC7B;QACF;IACF;IAEA,OAAOZ;AACT;AAEO,SAASN,+BAA+BoB,KAAK,EAAEb,cAAc,EAAEC,eAAe;IACnF,IAAIY,UAAU,MAAM;QAClB,MAAMC,YAAYD,MAAMV,OAAO,IACzBY,gBAAgBF,MAAMR,UAAU;QAEtCQ,QAAQ,MAAO,GAAG;QAElB,IAAIE,eAAe;YACjB,MAAMC,mBAAmBF,UAAUG,mBAAmB,IAChDT,eAAeP,gBAAgBiB,kCAAkC,CAACF;YAExE,IAAIR,iBAAiB,MAAM;gBACzB,MAAMW,oBAAoBX,cACpBY,mBAAmBD,kBAAkBE,mBAAmB;gBAE9DR,QAAQO,kBAAkB,GAAG;YAC/B;QACF;IACF;IAEA,OAAOP;AACT;AAEO,SAASlB,uCAAuC2B,SAAS,EAAEtB,cAAc,EAAEC,eAAe;IAC/F,IAAIqB,cAAc,MAAM;QACtB,MAAMC,gBAAgBD,UAAUnB,OAAO,IACjCqB,oBAAoBF,UAAUjB,UAAU;QAE9CiB,YAAY;QAEZ,IAAIE,mBAAmB;YACrB,IAAIhB,eAAe;YAEnB,MAAMiB,mBAAmBF,cAAcG,mBAAmB;YAE1D,IAAID,qBAAqB,MAAM;gBAC7B,IAAIE,UAAU3B,gBAAgB,GAAG;gBAEjCA,iBAAiBC,iBAAiB,GAAG;gBAErCA,kBAAkB0B,SAAU,GAAG;gBAE/BnB,eAAeP,gBAAgB2B,kCAAkC,CAACH;gBAElEE,UAAU3B,gBAAgB,GAAG;gBAE7BA,iBAAiBC,iBAAiB,GAAG;gBAErCA,kBAAkB0B,SAAU,GAAG;YACjC;YAEA,MAAMX,mBAAmBO,cAAcN,mBAAmB;YAE1DT,eAAe,AAACA,iBAAiB,OAChBP,gBAAgB4B,iDAAiD,CAACb,kBAAkBR,gBAClFP,gBAAgBiB,kCAAkC,CAACF;YAEtE,IAAIR,iBAAiB,MAAM;gBACzB,MAAMsB,wBAAwBtB,cACxBuB,uBAAuBD,sBAAsBE,uBAAuB;gBAE1EV,YAAYS,sBAAsB,GAAG;YACvC;QACF;IACF;IAEA,OAAOT;AACT;AAEO,SAAS5B,0CAA0CuC,oBAAoB;IAC5E,MAAMC,oBAAoB,EAAE;IAE5BD,qBAAqBE,OAAO,CAAC,CAACC;QAC5B,MAAMpB,mBAAmBoB,oBAAoBnB,mBAAmB;QAEhE,IAAID,qBAAqB,MAAM;YAC7BkB,kBAAkBG,IAAI,CAACrB;QACzB;IACF;IAEAnB,SAASqC,mBAAmB,CAACI,mBAAmBC;QAC9C,MAAMC,2CAA2CF,kBAAkBG,KAAK,CAACF;QAEzE,IAAI,CAACC,0CAA0C;YAC7C,OAAO;QACT;IACF;IAEA,OAAON;AACT"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.852",
+  "version": "1.0.857",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/context/file/nominal.js

@@ -280,6 +280,10 @@ export default class NominalFileContext extends FileContext {
     return substitutions;
   }
 
+  getDerivedSubstitutions(derivedSubstitutions = []) {
+    return derivedSubstitutions;
+  }
+
   addType(type) {
     this.types.push(type);
 
@@ -642,6 +646,24 @@ export default class NominalFileContext extends FileContext {
     return declaredMetavariable;
   }
 
+  findSubstitutionByVariableNode(variableNode) {
+    const substitution = null;
+
+    return substitution;
+  }
+
+  findSubstitutionByMetavariableNode(metavariableNode) {
+    const substitution = null;
+
+    return substitution;
+  }
+
+  findSubstitutionBySubstitutionNode(substitutionNode) {
+    const substitution = null;
+
+    return substitution;
+  }
+
   findMetaLevelAssumptionByMetaLevelAssumptionNode(metaLevelAssumptionNode) {
     const metaLevelAssumption = null;
 
@@ -671,10 +693,10 @@ export default class NominalFileContext extends FileContext {
     return metavariablePresent;
   }
 
-  isLabelPresentByReference(reference) {
+  isLabelPresentByReference(reference, context = null) {
     const labels = this.getLabels(),
           labelPresent = labels.some((label) => {
-            const labelUnifies = reference.unifyLabel(label);
+            const labelUnifies = reference.unifyLabel(label, context);
 
             if (labelUnifies) {
               return true;

package/src/context/liminal.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
-import { metavariableNodesFromSubstitutions } from "../utilities/substitutions";
+import { metavariableNodesFromDerivedSubstitutions } from "../utilities/substitutions";
 
 import Context from "../context";
 import elements from "../elements";
@@ -9,126 +9,126 @@ import elements from "../elements";
 const { find, first } = arrayUtilities;
 
 export default class LiminalContext extends Context {
-  constructor(context, substitutions) {
+  constructor(context, derivedSubstitutions) {
     super(context);
 
-    this.substitutions = substitutions;
+    this.derivedSubstitutions = derivedSubstitutions;
   }
 
-  getSubstitutions(nested = true) {
-    let substitutions;
+  getDerivedSubstitutions(nested = true) {
+    let derivedSubstitutions;
 
     if (nested) {
       const context = this.getContext();
 
-      substitutions = context.getSubstitutions();
+      derivedSubstitutions = context.getDerivedSubstitutions();
 
-      substitutions = [ ///
-        ...this.substitutions,
-        ...substitutions
+      derivedSubstitutions = [ ///
+        ...this.derivedSubstitutions,
+        ...derivedSubstitutions
       ]
     } else {
-      substitutions = this.substitutions;
+      derivedSubstitutions = this.derivedSubstitutions;
     }
 
-    return substitutions;
+    return derivedSubstitutions;
   }
 
-  getSoleSubstitution(nested = true) {
-    let soleSubstitution = null;
+  getSoleDerivedSubstitution(nested = true) {
+    let soleDerivedSubstitution = null;
 
-    const substitutions = this.getSubstitutions(nested),
-          substitutionsLength = substitutions.length;
+    const derivedSubstitutions = this.getDerivedSubstitutions(nested),
+          derivedSubstitutionsLength = derivedSubstitutions.length;
 
-    if (substitutionsLength === 1) {
-      const firstSubstitution = first(substitutions);
+    if (derivedSubstitutionsLength === 1) {
+      const firstDerivedSubstitution = first(derivedSubstitutions);
 
-      soleSubstitution = firstSubstitution; ///
+      soleDerivedSubstitution = firstDerivedSubstitution; ///
     }
 
-    return soleSubstitution;
+    return soleDerivedSubstitution;
   }
 
-  getSoleNonTrivialSubstitution(nested = true) {
-    let soleNonTrivialSubstitution = null;
+  getSoleNonTrivialDerivedSubstitution(nested = true) {
+    let soleNonTrivialDerivedSubstitution = null;
 
-    const soleSubstitution = this.getSoleSubstitution(nested);
+    const soleDerivedSubstitution = this.getSoleDerivedSubstitution(nested);
 
-    if (soleSubstitution !== null) {
-      const soleSubstitutionNonTrivial = soleSubstitution.isNonTrivial();
+    if (soleDerivedSubstitution !== null) {
+      const soleDerivedSubstitutionNonTrivial = soleDerivedSubstitution.isNonTrivial();
 
-      if (soleSubstitutionNonTrivial) {
-        soleNonTrivialSubstitution = soleSubstitution;  ///
+      if (soleDerivedSubstitutionNonTrivial) {
+        soleNonTrivialDerivedSubstitution = soleDerivedSubstitution;  ///
       }
     }
 
-    return soleNonTrivialSubstitution;
+    return soleNonTrivialDerivedSubstitution;
   }
 
-  addSubstitution(substitution) {
+  addDerivedSubstitution(derivedSubstitution) {
     const context = this, ///
-          substitutionA = substitution, ///
-          substitutionString = substitution.getString();
+          derivedSubstitutionA = derivedSubstitution, ///
+          derivedSubstitutionString = derivedSubstitution.getString();
 
-    context.trace(`Adding the '${substitutionString}' substitution to the liminal context...`);
+    context.trace(`Adding the '${derivedSubstitutionString}' derivedSubstitution to the liminal context...`);
 
-    const substitutionB = this.substitutions.find((substitution) => {
-      const substitutionB = substitution, ///
-            substitutionAEqualToSubstitutionB = substitutionA.isEqualTo(substitutionB);
+    const derivedSubstitutionB = this.derivedSubstitutions.find((derivedSubstitution) => {
+      const derivedSubstitutionB = derivedSubstitution, ///
+            derivedSubstitutionAEqualToDerivedSubstitutionB = derivedSubstitutionA.isEqualTo(derivedSubstitutionB);
 
-      if (substitutionAEqualToSubstitutionB) {
+      if (derivedSubstitutionAEqualToDerivedSubstitutionB) {
         return true;
       }
     }) || null;
 
-    if (substitutionB !== null) {
-      context.debug(`The '${substitutionString}' substitution has already been added to the liminal context.`);
+    if (derivedSubstitutionB !== null) {
+      context.debug(`The '${derivedSubstitutionString}' derivedSubstitution has already been added to the liminal context.`);
     } else {
-      this.substitutions.push(substitution);
+      this.derivedSubstitutions.push(derivedSubstitution);
     }
 
-    context.debug(`...added the '${substitutionString}' substitution to the liminal context.`);
+    context.debug(`...added the '${derivedSubstitutionString}' derivedSubstitution to the liminal context.`);
   }
 
-  addSubstitutions(substitutions) {
-    substitutions.forEach((substitution) => {
-      this.addSubstitution(substitution);
+  addDerivedSubstitutions(derivedSubstitutions) {
+    derivedSubstitutions.forEach((derivedSubstitution) => {
+      this.addDerivedSubstitution(derivedSubstitution);
     });
   }
 
-  resolveSubstitutions() {
+  resolveDerivedSubstitutions() {
     const context = this, ///
-          substitutions = this.getSubstitutions(),
-          metavariableNodes = metavariableNodesFromSubstitutions(substitutions);
+          derivedSubstitutions = this.getDerivedSubstitutions(),
+          metavariableNodes = metavariableNodesFromDerivedSubstitutions(derivedSubstitutions);
 
     metavariableNodes.forEach((metavariableNode) => {
-      const complexSubstitutions = this.findComplexSubstitutionsByMetavariableNode(metavariableNode);
+      const complexDerivedSubstitutions = this.findComplexDerivedSubstitutionsByMetavariableNode(metavariableNode);
 
-      complexSubstitutions.forEach((complexSubstitution) => {
-        const substitution = complexSubstitution, ///
-              resolved = substitution.isResolved();
+      complexDerivedSubstitutions.forEach((complexDerivedSubstitution) => {
+        const derivedSubstitution = complexDerivedSubstitution, ///
+              resolved = derivedSubstitution.isResolved();
 
         if (!resolved) {
-          substitution.resolve(context);
+          derivedSubstitution.resolve(context);
         }
       });
     });
   }
 
-  areSubstitutionsResolved() {
-    const substitutions = this.getSubstitutions(),
-          metavariableNodes = metavariableNodesFromSubstitutions(substitutions),
+  areDerivedSubstitutionsResolved() {
+    const derivedSubstitutions = this.getDerivedSubstitutions(),
+          metavariableNodes = metavariableNodesFromDerivedSubstitutions(derivedSubstitutions),
           resolved = metavariableNodes.every((metavariableNode) => {
-            const complexSubstitutions = this.findComplexSubstitutionsByMetavariableNode(metavariableNode),
-                  complexSubstitutionsResolved = complexSubstitutions.every((complexSubstitution) => {
-                    const complexSubstitutionResolved = complexSubstitution.isResolved();
+            const complexDerivedSubstitutions = this.findComplexDerivedSubstitutionsByMetavariableNode(metavariableNode),
+                  complexDerivedSubstitutionsResolved = complexDerivedSubstitutions.every((complexDerivedSubstitution) => {
+                    const complexDerivedSubstitutionResolved = complexDerivedSubstitution.isResolved();
 
-                    if (complexSubstitutionResolved) {
+                    if (complexDerivedSubstitutionResolved) {
                       return true;
                     }
                   });
 
-            if (complexSubstitutionsResolved) {
+            if (complexDerivedSubstitutionsResolved) {
               return true;
             }
           });
@@ -137,8 +137,8 @@ export default class LiminalContext extends Context {
   }
 
   isEmpty() {
-    const substitutionsLength = this.substitutions.length,
-          empty = (substitutionsLength === 0);
+    const derivedSubstitutionsLength = this.derivedSubstitutions.length,
+          empty = (derivedSubstitutionsLength === 0);
 
     return empty;
   }
@@ -152,15 +152,15 @@ export default class LiminalContext extends Context {
       qualifies = true;
     } else {
       const nested = false,
-            soleSubstitution = this.getSoleSubstitution(nested);
+            soleDerivedSubstitution = this.getSoleDerivedSubstitution(nested);
 
-      if (soleSubstitution !== null) {
-        const { ReferenceSubstitution } = elements,
+      if (soleDerivedSubstitution !== null) {
+        const { ReferenceDerivedSubstitution } = elements,
               context = this,
-              referenceSubstitution = ReferenceSubstitution.fromAssumptionAndMetaLevelAssumption(assumption, metaLevelAssumption, context),
-              soleSubstitutionCompares = referenceSubstitution.compareSubstitution(soleSubstitution);
+              referenceDerivedSubstitution = ReferenceDerivedSubstitution.fromAssumptionAndMetaLevelAssumption(assumption, metaLevelAssumption, context),
+              soleDerivedSubstitutionCompares = referenceDerivedSubstitution.compareDerivedSubstitution(soleDerivedSubstitution);
 
-        if (soleSubstitutionCompares) {
+        if (soleDerivedSubstitutionCompares) {
           qualifies = true;
         }
       }
@@ -176,52 +176,52 @@ export default class LiminalContext extends Context {
 
     context.debug(`Committing the limiinal context`);
 
-    context.addSubstitutions(this.substitutions);
+    context.addDerivedSubstitutions(this.derivedSubstitutions);
   }
 
-  findSubstitution(callback) {
-    const substitutions = this.getSubstitutions(),
-          substitution = substitutions.find(callback);
+  findDerivedSubstitution(callback) {
+    const derivedSubstitutions = this.getDerivedSubstitutions(),
+          derivedSubstitution = derivedSubstitutions.find(callback);
 
-    return substitution;
+    return derivedSubstitution;
   }
 
-  findSubstitutions(callback, nested = true) {
-    let substitutions;
+  findDerivedSubstitutions(callback, nested = true) {
+    let derivedSubstitutions;
 
-    substitutions = this.getSubstitutions(nested);
+    derivedSubstitutions = this.getDerivedSubstitutions(nested);
 
-    substitutions = find(substitutions, callback);  ///
+    derivedSubstitutions = find(derivedSubstitutions, callback);  ///
 
-    return substitutions;
+    return derivedSubstitutions;
   }
 
-  findSubstitutionByVariableNode(variableNode) {
-    const substitution = this.findSubstitution((substitution) => {
-      const variableNodeMatches = substitution.matchVariableNode(variableNode);
+  findDerivedSubstitutionByVariableNode(variableNode) {
+    const derivedSubstitution = this.findDerivedSubstitution((derivedSubstitution) => {
+      const variableNodeMatches = derivedSubstitution.matchVariableNode(variableNode);
 
       if (variableNodeMatches) {
         return true;
       }
     }) || null;
 
-    return substitution;
+    return derivedSubstitution;
   }
 
-  findSubstitutionByMetavariableNode(metavariableNode) {
-    const simpleSubstitution = this.findSimpleSubstitutionByMetavariableNode(metavariableNode),
-          substitution = simpleSubstitution;  ///
+  findDerivedSubstitutionByMetavariableNode(metavariableNode) {
+    const simpleDerivedSubstitution = this.findSimpleDerivedSubstitutionByMetavariableNode(metavariableNode),
+          derivedSubstitution = simpleDerivedSubstitution;  ///
 
-    return substitution;
+    return derivedSubstitution;
   }
 
-  findSimpleSubstitutionByMetavariableNode(metavariableNode) {
-    const simpleSubstitution = this.findSubstitution((substitution) => {
-      const substitutionSimple = substitution.isSimple();
+  findSimpleDerivedSubstitutionByMetavariableNode(metavariableNode) {
+    const simpleDerivedSubstitution = this.findDerivedSubstitution((derivedSubstitution) => {
+      const derivedSubstitutionSimple = derivedSubstitution.isSimple();
 
-      if (substitutionSimple) {
-        const simpleSubstitution = substitution,  ///
-              metavariableNodeMatches = simpleSubstitution.matchMetavariableNode(metavariableNode);
+      if (derivedSubstitutionSimple) {
+        const simpleDerivedSubstitution = derivedSubstitution,  ///
+              metavariableNodeMatches = simpleDerivedSubstitution.matchMetavariableNode(metavariableNode);
 
         if (metavariableNodeMatches) {
           return true;
@@ -229,16 +229,16 @@ export default class LiminalContext extends Context {
       }
     }) || null;
 
-    return simpleSubstitution;
+    return simpleDerivedSubstitution;
   }
 
-  findComplexSubstitutionsByMetavariableNode(metavariableNode) {
-    const complexSubstitution = this.findSubstitutions((substitution) => {
-      const substitutionComplex = substitution.isComplex();
+  findComplexDerivedSubstitutionsByMetavariableNode(metavariableNode) {
+    const complexDerivedSubstitution = this.findDerivedSubstitutions((derivedSubstitution) => {
+      const derivedSubstitutionComplex = derivedSubstitution.isComplex();
 
-      if (substitutionComplex) {
-        const complexSubstitution = substitution,  ///
-              metavariableNodeMatches = complexSubstitution.matchMetavariableNode(metavariableNode);
+      if (derivedSubstitutionComplex) {
+        const complexDerivedSubstitution = derivedSubstitution,  ///
+              metavariableNodeMatches = complexDerivedSubstitution.matchMetavariableNode(metavariableNode);
 
         if (metavariableNodeMatches) {
           return true;
@@ -246,46 +246,45 @@ export default class LiminalContext extends Context {
       }
     }) || null;
 
-    return complexSubstitution;
+    return complexDerivedSubstitution;
   }
 
-  findSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution) {
-    const substitutionA = substitution; ///
+  findDerivedSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, derivedSubstitution) {
+    const derivedSubstitutionA = derivedSubstitution; ///
 
-    substitution = this.findSubstitution((substitution) => {  ///
-      const metavariableNodeMatches = substitution.matchMetavariableNode(metavariableNode);
+    derivedSubstitution = this.findDerivedSubstitution((derivedSubstitution) => {  ///
+      const metavariableNodeMatches = derivedSubstitution.matchMetavariableNode(metavariableNode);
 
       if (metavariableNodeMatches) {
-        const substitutionB = substitution, ///
-              substitutionBEqualToSubstitutionA = substitutionB.isEqualTo(substitutionA);
+        const derivedSubstitutionB = derivedSubstitution, ///
+              derivedSubstitutionBEqualToDerivedSubstitutionA = derivedSubstitutionB.isEqualTo(derivedSubstitutionA);
 
-        if (substitutionBEqualToSubstitutionA) {
+        if (derivedSubstitutionBEqualToDerivedSubstitutionA) {
           return true;
         }
       }
     }) || null;
 
-    return substitution;
+    return derivedSubstitution;
   }
 
-  isSubstitutionPresentByMetavariableNode(metavariableNode) {
-    const substitution = this.findSubstitutionByMetavariableNode(metavariableNode),
-          substitutionPresent = (substitution !== null);
+  isDerivedSubstitutionPresentByMetavariableNode(metavariableNode) {
+    const derivedSubstitution = this.findDerivedSubstitutionByMetavariableNode(metavariableNode),
+          derivedSubstitutionPresent = (derivedSubstitution !== null);
 
-    return substitutionPresent;
+    return derivedSubstitutionPresent;
   }
 
-  isSubstitutionPresentByMetavariableNodeAndSubstitution(metavariableNode, substitution) {
-    substitution = this.findSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution);  ///
+  isDerivedSubstitutionPresentByMetavariableNodeAndSubstitution(metavariableNode, substitution) {
+    const derivedSubstitution = this.findDerivedSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution),
+          derivedSubstitutionPresent = (derivedSubstitution !== null);
 
-    const substitutionPresent = (substitution !== null);
-
-    return substitutionPresent;
+    return derivedSubstitutionPresent;
   }
 
   static fromNothing(context) {
-    const substitutions = [],
-          liminalContext = new LiminalContext(context, substitutions);
+    const derivedSubstitutions = [],
+          liminalContext = new LiminalContext(context, derivedSubstitutions);
 
     return liminalContext;
   }