occam-verify-cli 1.0.747 → 1.0.753

package/src/element/proofAssertion/step.js

@@ -6,7 +6,7 @@ import ProofAssertion from "../proofAssertion";
 
 import { define } from "../../elements";
 import { unifyStatements } from "../../utilities/unification";
-import { attempt, asyncLiminally } from "../../utilities/context";
+import { attempt, asyncReconcile } from "../../utilities/context";
 import { propertyAssertionFromStatement } from "../../utilities/statement";
 
 const { asyncSome } = asynchronousUtilities;
@@ -117,7 +117,7 @@ export default define(class Step extends ProofAssertion {
           const satisfiesAssertioValidates = this.validateSatisfiesAssertion(context);
 
           if (satisfiesAssertioValidates) {
-            this.setContext(context);
+            context.commit(this);
 
             validates = true;
           }
@@ -190,7 +190,7 @@ export default define(class Step extends ProofAssertion {
           reference = this.getReference(),
           satisfiesAssertion = this.getSatisfiesAssertion();
 
-    await asyncLiminally(async (context) => {
+    await asyncReconcile(async (context) => {
       await asyncSome(unifyStatements, async (unifyStatement) => {
         const statementUnifies = await unifyStatement(statement, reference, satisfiesAssertion, context);
 

package/src/element/proofAssertion/supposition.js

@@ -4,7 +4,7 @@ import ProofAssertion from "../proofAssertion";
 
 import { define } from "../../elements";
 import { instantiateSupposition} from "../../process/instantiate";
-import { attempt, liminally, literally } from "../../utilities/context";
+import { attempt, reconcile, instantiate } from "../../utilities/context";
 import { statementFromSuppositionNode, procedureCallFromSuppositionNode } from "../../utilities/element";
 import { ephemeralContextFromJSON, ephemeralContextToEphemeralContextJSON } from "../../utilities/json";
 
@@ -72,7 +72,7 @@ export default define(class Supposition extends ProofAssertion {
         const statementValidates = this.validateStatement(context);
 
         if (statementValidates) {
-          this.setContext(context);
+          context.commit(this);
 
           validates = true;
         }
@@ -82,7 +82,7 @@ export default define(class Supposition extends ProofAssertion {
         const procedureCallValidates = this.validateProcedureCall(context);
 
         if (procedureCallValidates) {
-          this.setContext(context);
+          context.commit(this);
 
           validates = true;
         }
@@ -190,7 +190,7 @@ export default define(class Supposition extends ProofAssertion {
           suppositionContext = this.getContext(),
           generalContext = suppositionContext, ///
           specificContext = proofAssertionContext,
-          statementUnifies = liminally((specificContext) => {
+          statementUnifies = reconcile((specificContext) => {
             const statement = proofAssertion.getStatement(),
                   statementUnifies = this.unifyStatement(statement, generalContext, specificContext);
 
@@ -321,7 +321,7 @@ export default define(class Supposition extends ProofAssertion {
 
     context = ephemeralContext; ///
 
-    const supposition = literally((context) => {
+    const supposition = instantiate((context) => {
       const { string } = json,
             suppositionNode = instantiateSupposition(string, context),
             node = suppositionNode,  ///

package/src/element/property.js

@@ -3,7 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
-import { literally } from "../utilities/context";
+import { instantiate } from "../utilities/context";
 import { instantiateProperty } from "../process/instantiate";
 import { nameFromPropertyNode } from "../utilities/element";
 import { nominalTypeNameFromJSON, nominalTypeNameToNominalTypeNameJSON } from "../utilities/json";
@@ -58,7 +58,7 @@ export default define(class Property extends Element {
   static name = "Property";
 
   static fromJSON(json, context) {
-    const property = literally((context) => {
+    const property = instantiate((context) => {
       const { string } = json,
             propertyNode = instantiateProperty(string, context),
             node = propertyNode,  ///

package/src/element/propertyRelation.js

@@ -3,7 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
-import { literally } from "../utilities/context";
+import { instantiate } from "../utilities/context";
 import { instantiatePropertyRelation } from "../process/instantiate";
 import { propertyFromPropertyRelationNode } from "../utilities/element";
 
@@ -59,7 +59,7 @@ export default define(class PropertyRelation extends Element {
 
     context.trace(`Validating the '${termString}' term...`);
 
-    const term = this.term.validate(context, () => {
+    const term = this.term.validate(context, (term) => {
       const validatesForwards = true;
 
       return validatesForwards;
@@ -124,7 +124,7 @@ export default define(class PropertyRelation extends Element {
   }
 
   static fromJSON(json, context) {
-    const propertyRelation = literally((context) => {
+    const propertyRelation = instantiate((context) => {
       const { string } = json,
             propertyRelationNode = instantiatePropertyRelation(string, context),
             node = propertyRelationNode,  ///

package/src/element/reference.js

@@ -3,7 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
-import { literally } from "../utilities/context";
+import { instantiate } from "../utilities/context";
 import { instantiateReference } from "../process/instantiate";
 import { REFERENCE_META_TYPE_NAME } from "../metaTypeNames";
 import { metavariableFromReferenceNode } from "../utilities/element";
@@ -282,7 +282,7 @@ export default define(class Reference extends Element {
   static name = "Reference";
 
   static fromJSON(json, context) {
-    const reference = literally((context) => {
+    const reference = instantiate((context) => {
       const { string } = json,
             referenceNode = instantiateReference(string, context),
             node = referenceNode,  ///

package/src/element/rule.js

@@ -4,7 +4,7 @@ import { arrayUtilities } from "necessary";
 import { Element, asynchronousUtilities } from "occam-languages";
 
 import { define } from "../elements";
-import { asyncScope } from "../utilities/context";
+import { asyncRestrict } from "../utilities/context";
 import { labelsFromJSON, premisesFromJSON, conclusionFromJSON, labelsToLabelsJSON, premisesToPremisesJSON, conclusionToConclusionJSON } from "../utilities/json";
 
 const { reverse, extract } = arrayUtilities,
@@ -88,7 +88,7 @@ export default define(class Rule extends Element {
 
     context.trace(`Verifying the '${ruleString}' rule...`);
 
-    await asyncScope(async (context) => {
+    await asyncRestrict(async (context) => {
       const labelsVerify = this.verifyLabels();
 
       if (labelsVerify) {

package/src/element/signature.js

@@ -4,7 +4,7 @@ import { Element } from "occam-languages";
 import { arrayUtilities } from "necessary";
 
 import { define } from "../elements";
-import { literally } from "../utilities/context";
+import { instantiate } from "../utilities/context";
 import { instantiateSignature } from "../process/instantiate";
 import { termsFromSignatureNode } from "../utilities/element";
 
@@ -79,7 +79,7 @@ export default define(class Signature extends Element {
 
     context.trace(`Validating the '${signatureString}' signature's '${termString}' term...`);
 
-    term = term.validate(context, () => { ///
+    term = term.validate(context, (term) => { ///
       const validatesForwards = true;
 
       return validatesForwards;
@@ -225,7 +225,7 @@ export default define(class Signature extends Element {
   static name = "Signature";
 
   static fromJSON(json, context) {
-    const signature = literally((context) => {
+    const signature = instantiate((context) => {
       const { string } = json,
             signatureNode = instantiateSignature(string, context),
             node = signatureNode,  ///

package/src/element/statement.js

@@ -4,7 +4,7 @@ import { Element } from "occam-languages";
 import { arrayUtilities } from "necessary";
 
 import { define } from "../elements";
-import { literally } from "../utilities/context";
+import { instantiate } from "../utilities/context";
 import { unifyStatement } from "../process/unify";
 import { validateStatements } from "../utilities/validation";
 import { instantiateStatement } from "../process/instantiate";
@@ -319,7 +319,7 @@ export default define(class Statement extends Element {
   static name = "Statement";
 
   static fromJSON(json, context) {
-    const statement = literally((context) => {
+    const statement = instantiate((context) => {
       const { string } = json,
             statementNode = instantiateStatement(string, context),
             node = statementNode; ///

package/src/element/subproof.js

@@ -3,7 +3,7 @@
 import { Element, asynchronousUtilities } from "occam-languages";
 
 import { define } from "../elements";
-import { asyncScope } from "../utilities/context";
+import { asyncRestrict } from "../utilities/context";
 
 const { asyncEvery } = asynchronousUtilities;
 
@@ -63,7 +63,7 @@ export default define(class Subproof extends Element {
   async verify(context) {
     let verifies = false;
 
-    await asyncScope(async (context) => {
+    await asyncRestrict(async (context) => {
       const suppositionsVerify = await this.verifySuppositions(context);
 
       if (suppositionsVerify) {

package/src/element/substitution/frame.js

@@ -3,7 +3,7 @@
 import Substitution from "../substitution";
 
 import { define } from "../../elements";
-import { literally } from "../../utilities/context";
+import { instantiate } from "../../utilities/context";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
 import { frameSubstitutionFromStatementNode, frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
@@ -121,7 +121,7 @@ export default define(class FrameSubstitution extends Substitution {
           targetFrameString = this.targetFrame.getString(),
           frameSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${frameSubstitutionString}' frame subtitution's '${targetFrameString}' target frame...`);
+    context.trace(`Validating the '${frameSubstitutionString}' frame substitution's '${targetFrameString}' target frame...`);
 
     const targetFrameSingular = this.targetFrame.isSingular();
 
@@ -135,11 +135,11 @@ export default define(class FrameSubstitution extends Substitution {
         targetFrameValidates = true;
       }
     } else {
-      context.debug(`The '${frameSubstitutionString}' frame subtitution's '${targetFrameString}' target frame is not singular.`);
+      context.debug(`The '${frameSubstitutionString}' frame substitution's '${targetFrameString}' target frame is not singular.`);
     }
 
     if (targetFrameValidates) {
-      context.debug(`...validated the '${frameSubstitutionString}' frame subtitution's '${targetFrameString}' target frame...`);
+      context.debug(`...validated the '${frameSubstitutionString}' frame substitution's '${targetFrameString}' target frame...`);
     }
 
     return targetFrameValidates;
@@ -152,7 +152,7 @@ export default define(class FrameSubstitution extends Substitution {
           replacementFrameString = this.replacementFrame.getString(),
           frameSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${frameSubstitutionString}' frame subtitution's '${replacementFrameString}' replacement frame...`);
+    context.trace(`Validating the '${frameSubstitutionString}' frame substitution's '${replacementFrameString}' replacement frame...`);
 
     const stated = true,
           replacementFrame = this.replacementFrame.validate(stated, context);
@@ -164,7 +164,7 @@ export default define(class FrameSubstitution extends Substitution {
     }
 
     if (replacementFrameValidates) {
-      context.debug(`...validated the '${frameSubstitutionString}' frame subtitution's '${replacementFrameString}' replacement frame.`);
+      context.debug(`...validated the '${frameSubstitutionString}' frame substitution's '${replacementFrameString}' replacement frame.`);
     }
 
     return replacementFrameValidates;
@@ -178,7 +178,7 @@ export default define(class FrameSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      literally((context) => {
+      instantiate((context) => {
         const { string } = json,
               frameSubstitutionNode = instantiateFrameSubstitution(string, context),
               node = frameSubstitutionNode,  ///
@@ -202,7 +202,7 @@ export default define(class FrameSubstitution extends Substitution {
   }
 
   static fromFrameAndMetavariable(frame, metavariable, context) {
-    return literally((context) => {
+    return instantiate((context) => {
       const frameSubstitutionString = frameSubstitutionStringFromFrameAndMetavariable(frame, metavariable),
             string = frameSubstitutionString,  ///
             frameSubstitutionNode = instantiateFrameSubstitution(string, context),

package/src/element/substitution/metaLevel.js

@@ -3,7 +3,7 @@
 import Substitution from "../substitution";
 
 import { define } from "../../elements";
-import { literally } from "../../utilities/context";
+import { instantiate } from "../../utilities/context";
 import { instantiateMetaLevelSubstitution } from "../../process/instantiate";
 import { metaLevelSubstitutionFromMetaLevelSubstitutionNode } from "../../utilities/element";
 import { metaLevelSubstitutionStringFromStatementAndReference } from "../../utilities/string";
@@ -111,7 +111,7 @@ export default define(class MetaLevelSubstitution extends Substitution {
           targetReferenceString = this.targetReference.getString(),
           metaLevelSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${metaLevelSubstitutionString}' meta-level subtitution's '${targetReferenceString}' target reference...`);
+    context.trace(`Validating the '${metaLevelSubstitutionString}' meta-level substitution's '${targetReferenceString}' target reference...`);
 
     const targetReference = this.targetReference.validate(context);
 
@@ -120,7 +120,7 @@ export default define(class MetaLevelSubstitution extends Substitution {
     }
 
     if (targetReferenceValidates) {
-      context.debug(`...validated the '${metaLevelSubstitutionString}' meta-level subtitution's '${targetReferenceString}' target reference...`);
+      context.debug(`...validated the '${metaLevelSubstitutionString}' meta-level substitution's '${targetReferenceString}' target reference...`);
     }
 
     return targetReferenceValidates;
@@ -133,7 +133,7 @@ export default define(class MetaLevelSubstitution extends Substitution {
           replacementStatementString = this.replacementStatement.getString(),
           metaLevelSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${metaLevelSubstitutionString}' meta-level subtitution's '${replacementStatementString}' replacement statement...`);
+    context.trace(`Validating the '${metaLevelSubstitutionString}' meta-level substitution's '${replacementStatementString}' replacement statement...`);
 
     const stated = true,
       replacementStatement = this.replacementStatement.validate(stated, context);
@@ -143,7 +143,7 @@ export default define(class MetaLevelSubstitution extends Substitution {
     }
 
     if (replacementStatementValidates) {
-      context.debug(`...validated the '${metaLevelSubstitutionString}' meta-level subtitution's '${replacementStatementString}' replacement statement.`);
+      context.debug(`...validated the '${metaLevelSubstitutionString}' meta-level substitution's '${replacementStatementString}' replacement statement.`);
     }
 
     return replacementStatementValidates;
@@ -176,7 +176,7 @@ export default define(class MetaLevelSubstitution extends Substitution {
 
     context = ephemeralContext; ///
 
-    const metaLevelSubstitution = literally((context) => {
+    const metaLevelSubstitution = instantiate((context) => {
       const { string } = json,
             metaLevelSubstitutionNode = instantiateMetaLevelSubstitution(string, context),
             targetReference = targetReferenceFromMetaLevelSubstitutionNode(metaLevelSubstitutionNode, context),
@@ -191,7 +191,7 @@ export default define(class MetaLevelSubstitution extends Substitution {
   }
 
   static fromStatementAndReference(statement, reference, context) {
-    return literally((context) => {
+    return instantiate((context) => {
       const metaLevelSubstitutionString = metaLevelSubstitutionStringFromStatementAndReference(statement, reference),
             string = metaLevelSubstitutionString,  ///
             metaLevelSubstitutionNode = instantiateMetaLevelSubstitution(string, context),

package/src/element/substitution/reference.js

@@ -3,7 +3,7 @@
 import Substitution from "../substitution";
 
 import { define } from "../../elements";
-import { literally } from "../../utilities/context";
+import { instantiate } from "../../utilities/context";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
@@ -121,7 +121,7 @@ export default define(class ReferenceSubstitution extends Substitution {
           targetReferenceString = this.targetReference.getString(),
           referenceSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${referenceSubstitutionString}' reference subtitution's '${targetReferenceString}' target reference...`);
+    context.trace(`Validating the '${referenceSubstitutionString}' reference substitution's '${targetReferenceString}' target reference...`);
 
     const targetReference = this.targetReference.validate(context);
 
@@ -130,7 +130,7 @@ export default define(class ReferenceSubstitution extends Substitution {
     }
 
     if (targetReferenceValidates) {
-      context.debug(`...validated the '${referenceSubstitutionString}' reference subtitution's '${targetReferenceString}' target reference...`);
+      context.debug(`...validated the '${referenceSubstitutionString}' reference substitution's '${targetReferenceString}' target reference...`);
     }
 
     return targetReferenceValidates;
@@ -143,7 +143,7 @@ export default define(class ReferenceSubstitution extends Substitution {
           replacementReferenceString = this.replacementReference.getString(),
           referenceSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${referenceSubstitutionString}' reference subtitution's '${replacementReferenceString}' replacement reference...`);
+    context.trace(`Validating the '${referenceSubstitutionString}' reference substitution's '${replacementReferenceString}' replacement reference...`);
 
     const replacementReference = this.replacementReference.validate(context);
 
@@ -152,7 +152,7 @@ export default define(class ReferenceSubstitution extends Substitution {
     }
 
     if (replacementReferenceValidates) {
-      context.debug(`...validated the '${referenceSubstitutionString}' reference subtitution's '${replacementReferenceString}' replacement reference.`);
+      context.debug(`...validated the '${referenceSubstitutionString}' reference substitution's '${replacementReferenceString}' replacement reference.`);
     }
 
     return replacementReferenceValidates;
@@ -166,7 +166,7 @@ export default define(class ReferenceSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      literally((context) => {
+      instantiate((context) => {
         const { string } = json,
               referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
               node = referenceSubstitutionNode,  ///
@@ -183,7 +183,7 @@ export default define(class ReferenceSubstitution extends Substitution {
   }
 
   static fromReferenceAndMetavariable(reference, metavariable, context) {
-    return literally((context) => {
+    return instantiate((context) => {
       const referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
             string = referenceSubstitutionString,  ///
             referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),

package/src/element/substitution/statement.js

@@ -4,9 +4,9 @@ import Substitution from "../substitution";
 
 import { define } from "../../elements";
 import { unifySubstitution } from "../../process/unify";
+import { join, reconcile, instantiate } from "../../utilities/context";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { instantiateStatementSubstitution } from "../../process/instantiate";
-import { liminally, literally, synthetically } from "../../utilities/context";
 import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilities/element";
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
@@ -156,7 +156,7 @@ export default define(class StatementSubstitution extends Substitution {
           targetStatementString = this.targetStatement.getString(),
           statementSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${statementSubstitutionString}' statement subtitution's '${targetStatementString}' target statement...`);
+    context.trace(`Validating the '${statementSubstitutionString}' statement substitution's '${targetStatementString}' target statement...`);
 
     const targetStatementSingular = this.targetStatement.isSingular();
 
@@ -168,11 +168,11 @@ export default define(class StatementSubstitution extends Substitution {
         targetStatementValidates = true;
       }
     } else {
-      context.debug(`The '${statementSubstitutionString}' statement subtitution's '${targetStatementString}' target statement is not singular.`);
+      context.debug(`The '${statementSubstitutionString}' statement substitution's '${targetStatementString}' target statement is not singular.`);
     }
 
     if (targetStatementValidates) {
-      context.debug(`...validated the '${statementSubstitutionString}' statement subtitution's '${targetStatementString}' target statement...`);
+      context.debug(`...validated the '${statementSubstitutionString}' statement substitution's '${targetStatementString}' target statement...`);
     }
 
     return targetStatementValidates;
@@ -185,7 +185,7 @@ export default define(class StatementSubstitution extends Substitution {
           replacementStatementString = this.replacementStatement.getString(),
           statementSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${statementSubstitutionString}' statement subtitution's '${replacementStatementString}' replacement statement...`);
+    context.trace(`Validating the '${statementSubstitutionString}' statement substitution's '${replacementStatementString}' replacement statement...`);
 
     const stated = true,
           replacementStatement = this.replacementStatement.validate(stated, context);
@@ -195,7 +195,7 @@ export default define(class StatementSubstitution extends Substitution {
     }
 
     if (replacementStatementValidates) {
-      context.debug(`...validated the '${statementSubstitutionString}' statement subtitution's '${replacementStatementString}' replacement statement.`);
+      context.debug(`...validated the '${statementSubstitutionString}' statement substitution's '${replacementStatementString}' replacement statement.`);
     }
 
     return replacementStatementValidates;
@@ -262,7 +262,7 @@ export default define(class StatementSubstitution extends Substitution {
     if (simpleSubstitution !== null) {
       context = this.getContext();
 
-      const subtitution = liminally((context) => {
+      const substitution = reconcile((context) => {
         let substitution = null;
 
         const specificContext = context;  ///
@@ -285,29 +285,22 @@ export default define(class StatementSubstitution extends Substitution {
         return substitution;
       }, context);
 
-      if (subtitution !== null) {
-        liminally((specificContext) => {
-          const contexts = [];
-
-          context = simpleSubstitution.getContext();
-
-          contexts.push(context);
-
-          context = this.getContext();
-
-          contexts.push(context);
+      if (substitution !== null) {
+        reconcile((specificContext) => {
+          const complexContext = this.getContext(), ///
+                simpleContext = simpleSubstitution.getContext();  ///
 
           context = specificContext;  ///
 
-          synthetically((context) => {
+          join((context) => {
             const specificContext = context;  ///
 
             context = this.substitution.getContext();
 
             const generalContext = context; ///
 
-            this.unifySubstitution(subtitution, generalContext, specificContext);
-          }, contexts, context);
+            this.unifySubstitution(substitution, generalContext, specificContext);
+          }, complexContext, simpleContext, context);
 
           specificContext.commit();
         }, specificContext);
@@ -329,7 +322,7 @@ export default define(class StatementSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      literally((context) => {
+      instantiate((context) => {
         const { string } = json,
               statementSubstitutionNode = instantiateStatementSubstitution(string, context),
               node = statementSubstitutionNode,  ///
@@ -348,7 +341,7 @@ export default define(class StatementSubstitution extends Substitution {
   static fromStatementAndMetavariable(statement, metavariable, context) {
     statement = stripBracketsFromStatement(statement, context); ///
 
-    return literally((context) => {
+    return instantiate((context) => {
       const statementSubstitutionString = statementSubstitutionStringFromStatementAndMetavariable(statement, metavariable, context),
             string = statementSubstitutionString, ///
             statementSubstitutionNode = instantiateStatementSubstitution(string, context),
@@ -361,7 +354,7 @@ export default define(class StatementSubstitution extends Substitution {
   static fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context) {
     statement = stripBracketsFromStatement(statement, context); ///
 
-    return literally((context) => {
+    return instantiate((context) => {
       const statementSubstitutionString = statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution),
             string = statementSubstitutionString, ///
             statementSubstitutionNode = instantiateStatementSubstitution(string, context),

package/src/element/substitution/term.js

@@ -3,7 +3,7 @@
 import Substitution from "../substitution";
 
 import { define } from "../../elements";
-import { literally } from "../../utilities/context";
+import { instantiate } from "../../utilities/context";
 import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
@@ -124,12 +124,12 @@ export default define(class TermSubstitution extends Substitution {
           targetTermString = this.targetTerm.getString(),
           termSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${termSubstitutionString}' term subtitution's '${targetTermString}' target term...`);
+    context.trace(`Validating the '${termSubstitutionString}' term substitution's '${targetTermString}' target term...`);
 
     const targetTermSingular = this.targetTerm.isSingular();
 
     if (targetTermSingular) {
-      const targetTerm = this.targetTerm.validate(context, () => {
+      const targetTerm = this.targetTerm.validate(context, (targetTerm) => {
         const validatesForwards = true;
 
         return validatesForwards;
@@ -141,11 +141,11 @@ export default define(class TermSubstitution extends Substitution {
         targetTermValidates = true;
       }
     } else {
-      context.debug(`The '${termSubstitutionString}' term subtitution's '${targetTermString}' target term is not singular.`);
+      context.debug(`The '${termSubstitutionString}' term substitution's '${targetTermString}' target term is not singular.`);
     }
 
     if (targetTermValidates) {
-      context.debug(`...validated the '${termSubstitutionString}' term subtitution's '${targetTermString}' target term...`);
+      context.debug(`...validated the '${termSubstitutionString}' term substitution's '${targetTermString}' target term...`);
     }
 
     return targetTermValidates;
@@ -158,9 +158,9 @@ export default define(class TermSubstitution extends Substitution {
           replacementTermString = this.replacementTerm.getString(),
           termSubstitutionString = this.getString();  ///
 
-    context.trace(`Validating the '${termSubstitutionString}' term subtitution's '${replacementTermString}' replacement term...`);
+    context.trace(`Validating the '${termSubstitutionString}' term substitution's '${replacementTermString}' replacement term...`);
 
-    const replacementTerm = this.replacementTerm.validate(context, () => {
+    const replacementTerm = this.replacementTerm.validate(context, (replacementTerm) => {
       const validatesForwards = true;
 
       return validatesForwards;
@@ -173,7 +173,7 @@ export default define(class TermSubstitution extends Substitution {
     }
 
     if (replacementTermValidates) {
-      context.debug(`...validated the '${termSubstitutionString}' term subtitution's '${replacementTermString}' replacement term...`);
+      context.debug(`...validated the '${termSubstitutionString}' term substitution's '${replacementTermString}' replacement term...`);
     }
 
     return replacementTermValidates;
@@ -187,7 +187,7 @@ export default define(class TermSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      literally((context) => {
+      instantiate((context) => {
         const { string } = json,
               termSubstitutionNode = instantiateTermSubstitution(string, context),
               node = termSubstitutionNode,  ///
@@ -213,7 +213,7 @@ export default define(class TermSubstitution extends Substitution {
   static fromTermAndVariable(term, variable, context) {
     term = stripBracketsFromTerm(term, context); ///
 
-    return literally((context) => {
+    return instantiate((context) => {
       const termSubstitutionString = termSubstitutionStringFromTermAndVariable(term, variable),
             string = termSubstitutionString,  ///
             termSubstitutionNode = instantiateTermSubstitution(string, context),