occam-verify-cli 1.0.862 → 1.0.866

package/src/element/substitution/frame.js

@@ -6,11 +6,11 @@ import { define } from "../../elements";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
-import { join, ablate, descend, attempt, unserialise, instantiate } from "../../utilities/context";
+import { ablates, attempts, descend, instantiate, unserialises } from "../../utilities/context";
 
 export default define(class FrameSubstitution extends Substitution {
-  constructor(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame) {
-    super(context, string, node, lineIndex, generalContext);
+  constructor(contexts, string, node, lineIndex, targetFrame, replacementFrame) {
+    super(contexts, string, node, lineIndex);
 
     this.targetFrame = targetFrame;
     this.replacementFrame = replacementFrame;
@@ -70,11 +70,10 @@ export default define(class FrameSubstitution extends Substitution {
     return comparesToParameter;
   }
 
-  validate(generalContext, specificContext) {
+  validate(context) {
     let frameSubstitution = null;
 
-    const context = specificContext,  ///
-          frameSubstitutionString = this.getString();  ///
+    const frameSubstitutionString = this.getString();  ///
 
     context.trace(`Validating the '${frameSubstitutionString}' frame substitution...`);
 
@@ -87,27 +86,24 @@ export default define(class FrameSubstitution extends Substitution {
 
       context.debug(`...the '${frameSubstitutionString}' frame substitution is already valid.`);
     } else {
-      const context = this.getContext();
-
-      join((generalContext) => {
-        join((specificContext) => {
-          attempt((generalContext, specificContext) => {
-            const targetFrameValidates = this.validateTargetFrame(generalContext, specificContext);
-
-            if (targetFrameValidates) {
-              const replacementFrameValidates = this.validateReplacementFrame(generalContext, specificContext);
-
-              if (replacementFrameValidates) {
-                validates = true;
-              }
-            }
-
-            if (validates) {
-              this.setContexts(generalContext, specificContext);
-            }
-          }, generalContext, specificContext);
-        }, specificContext, context);
-      }, generalContext, context);
+      const generalContext = this.getGeneralContext(),
+            specificContext = this.getSpecificContext();
+
+      attempts((generalContext, specificContext) => {
+        const targetFrameValidates = this.validateTargetFrame(generalContext, specificContext);
+
+        if (targetFrameValidates) {
+          const replacementFrameValidates = this.validateReplacementFrame(generalContext, specificContext);
+
+          if (replacementFrameValidates) {
+            validates = true;
+          }
+        }
+
+        if (validates) {
+          this.commit(generalContext, specificContext);
+        }
+      }, generalContext, specificContext);
     }
 
     if (validates) {
@@ -189,17 +185,22 @@ export default define(class FrameSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      unserialise((json, generalContext, specificContext) => {
+      unserialises((json, generalContext, specificContext) => {
         const context = specificContext;  ///
 
         instantiate((context) => {
           const { string, lineIndex } = json,
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ],
                 frameSubstitutionNode = instantiateFrameSubstitution(string, context),
                 node = frameSubstitutionNode, ///
                 targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
                 replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
 
-          frameSubstitutionn = new FrameSubstitution(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame);
+          frameSubstitutionn = new FrameSubstitution(contexts, string, node, lineIndex, targetFrame, replacementFrame);
         }, context);
       }, json, context);
     }
@@ -207,32 +208,35 @@ export default define(class FrameSubstitution extends Substitution {
     return frameSubstitutionn;
   }
 
-  static fromStatement(statement, context) {
+  static fromStatement(statement, generalContext, specificContext) {
     let frameSubstitution = null;
 
     const frameSubstitutionNode = statement.getFrameSubstitutionNode();
 
     if (frameSubstitutionNode !== null) {
-      ablate((context) => {
-        frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, context);
-      }, context);
+      ablates((generalContext, specificContext) => {
+        frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, generalContext, specificContext);
+      }, generalContext, specificContext);
     }
 
     return frameSubstitution;
   }
 
-  static fromFrameAndMetavariable(frame, metavariable, context) {
+  static fromFrameAndMetavariable(frame, metavariable, generalContext, specificContext) {
     let frameSubstitution
 
-    ablate((context) => {
+    ablates((generalContext, specificContext) => {
+      const context = specificContext;  ///
+
       instantiate((context) => {
-        const frameSubstitutionString = frameSubstitutionStringFromFrameAndMetavariable(frame, metavariable),
+        const specificContext = context,  ///
+              frameSubstitutionString = frameSubstitutionStringFromFrameAndMetavariable(frame, metavariable),
               string = frameSubstitutionString,  ///
               frameSubstitutionNode = instantiateFrameSubstitution(string, context);
 
-        frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, context);
+        frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, generalContext, specificContext);
       }, context);
-    }, context);
+    }, generalContext, specificContext);
 
     return frameSubstitution;
   }

package/src/element/substitution/reference.js

@@ -5,12 +5,12 @@ import Substitution from "../substitution";
 import { define } from "../../elements";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
+import { ablates, attempts, descend, instantiate, unserialises } from "../../utilities/context";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
-import { join, ablate, descend, attempt, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class ReferenceSubstitution extends Substitution {
-  constructor(context, string, node, lineIndex, generalContext, targetReference, replacementReference) {
-    super(context, string, node, lineIndex, generalContext);
+  constructor(context, string, node, lineIndex, targetReference, replacementReference) {
+    super(context, string, node, lineIndex);
 
     this.targetReference = targetReference;
     this.replacementReference = replacementReference;
@@ -87,11 +87,10 @@ export default define(class ReferenceSubstitution extends Substitution {
     return substitutionCompares;
   }
 
-  validate(generalContext, specificContext) {
+  validate(context) {
     let referenceSubstitution = null;
 
-    const context = specificContext,  ///
-          referenceSubstitutionString = this.getString();  ///
+    const referenceSubstitutionString = this.getString();  ///
 
     context.trace(`Validating the '${referenceSubstitutionString}' reference substitution...`);
 
@@ -104,27 +103,24 @@ export default define(class ReferenceSubstitution extends Substitution {
 
       context.debug(`...the '${referenceSubstitutionString}' reference substitution is already valid.`);
     } else {
-      const context = this.getContext();
-
-      join((generalContext) => {
-        join((specificContext) => {
-          attempt((generalContext, specificContext) => {
-            const targetReferenceValidates = this.validateTargetReference(generalContext, specificContext);
-
-            if (targetReferenceValidates) {
-              const replacementReferenceValidates = this.validateReplacementReference(generalContext, specificContext);
-
-              if (replacementReferenceValidates) {
-                validates = true;
-              }
-            }
-
-            if (validates) {
-              this.setContexts(generalContext, specificContext);
-            }
-          }, generalContext, specificContext);
-        }, specificContext, context);
-      }, generalContext, context);
+      const generalContext = this.getGeneralContext(),
+            specificContext = this.getSpecificContext();
+
+      attempts((generalContext, specificContext) => {
+        const targetReferenceValidates = this.validateTargetReference(generalContext, specificContext);
+
+        if (targetReferenceValidates) {
+          const replacementReferenceValidates = this.validateReplacementReference(generalContext, specificContext);
+
+          if (replacementReferenceValidates) {
+            validates = true;
+          }
+        }
+
+        if (validates) {
+          this.commit(generalContext, specificContext);
+        }
+      }, generalContext, specificContext);
     }
 
     if (validates) {
@@ -194,17 +190,22 @@ export default define(class ReferenceSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      unserialise((json, generalContext, specificContext) => {
+      unserialises((json, generalContext, specificContext) => {
         const context = specificContext;  ///
 
         instantiate((context) => {
           const { string, lineIndex } = json,
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ],
                 referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
                 node = referenceSubstitutionNode, ///
                 targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
                 replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
 
-          referenceSubstitutionn = new ReferenceSubstitution(context, string, node, lineIndex, generalContext, targetReference, replacementReference);
+          referenceSubstitutionn = new ReferenceSubstitution(contexts, string, node, lineIndex, targetReference, replacementReference);
         }, context);
       }, json, context);
     }
@@ -212,36 +213,42 @@ export default define(class ReferenceSubstitution extends Substitution {
     return referenceSubstitutionn;
   }
 
-  static fromReferenceAndMetavariable(reference, metavariable, context) {
+  static fromReferenceAndMetavariable(reference, metavariable, generalContext, specificContext) {
     let referenceSubstitution;
 
-    ablate((context) => {
+    ablates((generalContext, specificContext) => {
+      const context = specificContext;  ///
+
       instantiate((context) => {
-        const referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
+        const specificContext = context,  ///
+              referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
               string = referenceSubstitutionString,  ///
               referenceSubstitutionNode = instantiateReferenceSubstitution(string, context);
 
-        referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
+        referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, generalContext, specificContext);
       }, context);
-    }, context);
+    }, generalContext, specificContext);
 
     return referenceSubstitution;
   }
 
-  static fromAssumptionAndMetaLevelAssumption(assumption, metaLevelAssumption, context) {
+  static fromAssumptionAndMetaLevelAssumption(assumption, metaLevelAssumption, generalContext, specificContext) {
     let referenceSubstitution;
 
-    ablate((context) => {
+    ablates((generalContext, specificContext) => {
+      const context = specificContext;  ///
+
       instantiate((context) => {
-        const reference = metaLevelAssumption.getReference(),
+        const specificContext = context,  ///
               metavariable = assumption.getMetavariable(),
+              reference = metaLevelAssumption.getReference(),
               referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
               string = referenceSubstitutionString,  ///
               referenceSubstitutionNode = instantiateReferenceSubstitution(string, context);
 
-        referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
+        referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, generalContext, specificContext);
       }, context);
-    }, context);
+    }, generalContext, specificContext);
 
     return referenceSubstitution;
   }

package/src/element/substitution/statement.js

@@ -7,12 +7,12 @@ import { unifySubstitution } from "../../process/unify";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { instantiateStatementSubstitution } from "../../process/instantiate";
 import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilities/element";
-import { join, ablate, descend, reconcile, attempt, unserialise, instantiate } from "../../utilities/context";
+import { join, ablates, attempts, descend, reconcile, instantiate, unserialises } from "../../utilities/context";
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
 export default define(class StatementSubstitution extends Substitution {
-  constructor(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement) {
-    super(context, string, node, lineIndex, generalContext);
+  constructor(contexts, string, node, lineIndex, resolved, substitution, targetStatement, replacementStatement) {
+    super(contexts, string, node, lineIndex);
 
     this.resolved = resolved;
     this.substitution = substitution;
@@ -83,11 +83,10 @@ export default define(class StatementSubstitution extends Substitution {
     return comparesToParameter;
   }
 
-  validate(substitution, generalContext, specificContext) {
+  validate(substitution, context) {
     let statementSubstitution = null;
 
-    const context = specificContext,  ///
-          statementSubstitutionString = this.getString();  ///
+    const statementSubstitutionString = this.getString();  ///
 
     context.trace(`Validating the '${statementSubstitutionString}' statement substitution...`);
 
@@ -100,31 +99,28 @@ export default define(class StatementSubstitution extends Substitution {
 
       context.debug(`...the '${statementSubstitutionString}' statement substitution is already valid.`);
     } else {
-      const context = this.getContext();
+      const generalContext = this.getGeneralContext(),
+            specificContext = this.getSpecificContext();
 
-      join((generalContext) => {
-        join((specificContext) => {
-          attempt((generalContext, specificContext) => {
-            const targetStatementValidates = this.validateTargetStatement(generalContext, specificContext);
+      attempts((generalContext, specificContext) => {
+        const targetStatementValidates = this.validateTargetStatement(generalContext, specificContext);
 
-            if (targetStatementValidates) {
-              const replacementStatementValidates = this.validateReplacementStatement(generalContext, specificContext);
+        if (targetStatementValidates) {
+          const replacementStatementValidates = this.validateReplacementStatement(generalContext, specificContext);
 
-              if (replacementStatementValidates) {
-                const substitutionValidates = this.validateSubstitution(substitution, generalContext, specificContext);
+          if (replacementStatementValidates) {
+            const substitutionValidates = this.validateSubstitution(substitution, generalContext, specificContext);
 
-                if (substitutionValidates) {
-                  validates = true;
-                }
-              }
+            if (substitutionValidates) {
+              validates = true;
             }
+          }
+        }
 
-            if (validates) {
-              this.setContexts(generalContext, specificContext);
-            }
-          }, generalContext, specificContext);
-        }, specificContext, context);
-      }, generalContext, context);
+        if (validates) {
+          this.commit(generalContext, specificContext);
+        }
+      }, generalContext, specificContext);
     }
 
     if (validates) {
@@ -272,9 +268,8 @@ export default define(class StatementSubstitution extends Substitution {
             replacementStatementUnifies = this.unifyReplacementStatement(replacementStatement, generalContext, specificContext);
 
       if (replacementStatementUnifies) {
-        const nested = false,
-              context = specificContext,  ///
-              soleNonTrivialDerivedSubstitution = context.getSoleNonTrivialDerivedSubstitution(nested);
+        const context = specificContext,  ///
+              soleNonTrivialDerivedSubstitution = context.getSoleNonTrivialDerivedSubstitution();
 
         substitution = soleNonTrivialDerivedSubstitution;  ///
       }
@@ -353,19 +348,24 @@ export default define(class StatementSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      unserialise((json, generalContext, specificContext) => {
+      unserialises((json, generalContext, specificContext) => {
         const context = specificContext;  ///
 
         instantiate((context) => {
           const { string, lineIndex } = json,
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ],
                 statementSubstitutionNode = instantiateStatementSubstitution(string, context),
                 node = statementSubstitutionNode, ///
                 resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
-                substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
+                substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext),
                 targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
                 replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context);
 
-          statementSubstitutionn = new StatementSubstitution(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement);
+          statementSubstitutionn = new StatementSubstitution(contexts, string, node, lineIndex, resolved, substitution, targetStatement, replacementStatement);
         }, context);
       }, json, context);
     }
@@ -373,38 +373,48 @@ export default define(class StatementSubstitution extends Substitution {
     return statementSubstitutionn;
   }
 
-  static fromStatementAndMetavariable(statement, metavariable, context) {
+  static fromStatementAndMetavariable(statement, metavariable, generalContext, specificContext) {
+    const context = specificContext;  ///
+
     statement = stripBracketsFromStatement(statement, context); ///
 
     let statementSubstitution;
 
-    ablate((context) => {
+    ablates((generalContext, specificContext) => {
+      const context = specificContext;  ///
+
       instantiate((context) => {
-        const statementSubstitutionString = statementSubstitutionStringFromStatementAndMetavariable(statement, metavariable, context),
+        const specificContext = context,  ///
+              statementSubstitutionString = statementSubstitutionStringFromStatementAndMetavariable(statement, metavariable),
               string = statementSubstitutionString, ///
               statementSubstitutionNode = instantiateStatementSubstitution(string, context);
 
-        statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context);
+        statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext);
       }, context);
-    }, context);
+    }, generalContext, specificContext);
 
     return statementSubstitution;
   }
 
-  static fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context) {
+  static fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, generalContext, specificContext) {
+    const context = specificContext;  ///
+
     statement = stripBracketsFromStatement(statement, context); ///
 
     let statementSubstitution;
 
-    ablate((context) => {
+    ablates((generalContext, specificContext) => {
+      const context = specificContext;  ///
+
       instantiate((context) => {
-        const statementSubstitutionString = statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution),
+        const specificContext = context,  ///
+              statementSubstitutionString = statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution),
               string = statementSubstitutionString, ///
               statementSubstitutionNode = instantiateStatementSubstitution(string, context);
 
-        statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context);
+        statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext);
       }, context);
-    }, context);
+    }, generalContext, specificContext);
 
     return statementSubstitution;
   }

package/src/element/substitution/term.js

@@ -7,11 +7,11 @@ import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionFromTermSubstitutionNode } from "../../utilities/element";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
-import { join, ablate, descend, attempt, unserialise, instantiate } from "../../utilities/context";
+import { ablates, attempts, descend, instantiate, unserialises } from "../../utilities/context";
 
 export default define(class TermSubstitution extends Substitution {
-  constructor(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm) {
-    super(context, string, node, lineIndex, generalContext);
+  constructor(context, string, node, lineIndex, targetTerm, replacementTerm) {
+    super(context, string, node, lineIndex);
 
     this.targetTerm = targetTerm;
     this.replacementTerm = replacementTerm;
@@ -73,11 +73,10 @@ export default define(class TermSubstitution extends Substitution {
     return comparesToParameter;
   }
 
-  validate(generalContext, specificContext) {
+  validate(context) {
     let termSubstitution = null;
 
-    const context = specificContext,  ///
-          termSubstitutionString = this.getString();  ///
+    const termSubstitutionString = this.getString();  ///
 
     context.trace(`Validating the '${termSubstitutionString}' term substitution...`);
 
@@ -90,27 +89,24 @@ export default define(class TermSubstitution extends Substitution {
 
       context.debug(`...the '${termSubstitutionString}' term substitution is already valid.`);
     } else {
-      const context = this.getContext();
-
-      join((generalContext) => {
-        join((specificContext) => {
-          attempt((generalContext, specificContext) => {
-            const targetTermValidates = this.validateTargetTerm(generalContext, specificContext);
-
-            if (targetTermValidates) {
-              const replacementTermValidates = this.validateReplacementTerm(generalContext, specificContext);
-
-              if (replacementTermValidates) {
-                validates = true;
-              }
-            }
-
-            if (validates) {
-              this.setContexts(generalContext, specificContext);
-            }
-          }, generalContext, specificContext);
-        }, specificContext, context);
-      }, generalContext, context);
+      const generalContext = this.getGeneralContext(),
+            specificContext = this.getSpecificContext();
+
+      attempts((generalContext, specificContext) => {
+        const targetTermValidates = this.validateTargetTerm(generalContext, specificContext);
+
+        if (targetTermValidates) {
+          const replacementTermValidates = this.validateReplacementTerm(generalContext, specificContext);
+
+          if (replacementTermValidates) {
+            validates = true;
+          }
+        }
+
+        if (validates) {
+          this.commit(generalContext, specificContext);
+        }
+      }, generalContext, specificContext);
     }
 
     if (validates) {
@@ -200,17 +196,22 @@ export default define(class TermSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      unserialise((json, generalContext, specificContext) => {
+      unserialises((json, generalContext, specificContext) => {
         const context = specificContext;  ///
 
         instantiate((context) => {
           const { string, lineIndex } = json,
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ],
                 termSubstitutionNode = instantiateTermSubstitution(string, context),
                 node = termSubstitutionNode,  ///
                 targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
                 replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
 
-          termSubstitutionn = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);
+          termSubstitutionn = new TermSubstitution(contexts, string, node, lineIndex, targetTerm, replacementTerm);
         }, context);
       }, json, context);
     }
@@ -218,34 +219,39 @@ export default define(class TermSubstitution extends Substitution {
     return termSubstitutionn;
   }
 
-  static fromStatement(statement, context) {
+  static fromStatement(statement, generalContext, specificContext) {
     let termSubstitution = null;
 
     const termSubstitutionNode = statement.getTermSubstitutionNode();
 
     if (termSubstitutionNode !== null) {
-      ablate((context) => {
-        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);
-      }, context);
+      ablates((generalContext, specificContext) => {
+        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext);
+      }, generalContext, specificContext);
     }
 
     return termSubstitution;
   }
 
-  static fromTermAndVariable(term, variable, context) {
+  static fromTermAndVariable(term, variable, generalContext, specificContext) {
+    const context = specificContext;  ///
+
     term = stripBracketsFromTerm(term, context); ///
 
     let termSubstitution;
 
-    ablate((context) => {
+    ablates((generalContext, specificContext) => {
+      const context = specificContext;  ///
+
       instantiate((context) => {
-        const termSubstitutionString = termSubstitutionStringFromTermAndVariable(term, variable),
+        const specificContext = context, ///
+              termSubstitutionString = termSubstitutionStringFromTermAndVariable(term, variable),
               string = termSubstitutionString,  ///
               termSubstitutionNode = instantiateTermSubstitution(string, context);
 
-        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);
+        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext);
       }, context);
-    }, context);
+    }, generalContext, specificContext);
 
     return termSubstitution;
   }