occam-nominal 1.0.310 → 1.0.317

package/src/element/substitution/reference.js

@@ -152,15 +152,13 @@ export default define(class ReferenceSubstitution extends Substitution {
 
     context.trace(`Validating the '${referenceSubstitutionString}' reference substitution's target reference...`);
 
-    manifest((context) => {
-      elide((context) => {
-        const targetReference = this.targetReference.validate(context);
+    elide((context) => {
+      const targetReference = this.targetReference.validate(context);
 
-        if (targetReference !== null) {
-          targetReferenceValidates = true;
-        }
-      }, context);
-    }, specificContext, context);
+      if (targetReference !== null) {
+        targetReferenceValidates = true;
+      }
+    }, context);
 
     if (targetReferenceValidates) {
       context.debug(`...validated the '${referenceSubstitutionString}' reference substitution's target reference...`);
@@ -221,41 +219,41 @@ export default define(class ReferenceSubstitution extends Substitution {
     return referenceSubstitutionn;
   }
 
-  static fromReferenceAndMetavariable(reference, metavariable, generalContext, specificContext) {
+  static fromAssumptionAndConstraint(assumption, constraint, generalContext, specificContext) {
     let referenceSubstitution;
 
     ablates((generalContext, specificContext) => {
-      const context = specificContext;  ///
-
-      instantiate((context) => {
-        const specificContext = context,  ///
-              referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
-              string = referenceSubstitutionString,  ///
-              referenceSubstitutionNode = instantiateReferenceSubstitution(string, context);
-
-        referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, generalContext, specificContext);
-      }, context);
+      instantiate((specificContext) => {
+        manifest((generalContext) => {
+          const metavariable = assumption.getMetavariable(),
+                reference = constraint.getReference(),
+                referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
+                string = referenceSubstitutionString,  ///
+                context = specificContext,  ///
+                referenceSubstitutionNode = instantiateReferenceSubstitution(string, context);
+
+          referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, generalContext, specificContext);
+        }, generalContext, specificContext);
+      }, specificContext);
     }, generalContext, specificContext);
 
     return referenceSubstitution;
   }
 
-  static fromAssumptionAndConstraint(assumption, constraint, generalContext, specificContext) {
+  static fromReferenceAndMetavariable(reference, metavariable, generalContext, specificContext) {
     let referenceSubstitution;
 
     ablates((generalContext, specificContext) => {
-      const context = specificContext;  ///
-
-      instantiate((context) => {
-        const specificContext = context,  ///
-              metavariable = assumption.getMetavariable(),
-              reference = constraint.getReference(),
-              referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
-              string = referenceSubstitutionString,  ///
-              referenceSubstitutionNode = instantiateReferenceSubstitution(string, context);
-
-        referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, generalContext, specificContext);
-      }, context);
+      instantiate((specificContext) => {
+        manifest((generalContext) => {
+          const referenceSubstitutionString = referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable),
+                string = referenceSubstitutionString,  ///
+                context = specificContext,  ///
+                referenceSubstitutionNode = instantiateReferenceSubstitution(string, context);
+
+          referenceSubstitution = referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, generalContext, specificContext);
+        }, generalContext, specificContext);
+      }, specificContext);
     }, generalContext, specificContext);
 
     return referenceSubstitution;

package/src/element/substitution/statement.js

@@ -15,11 +15,10 @@ import { statementSubstitutionStringFromStatementAndMetavariable, statementSubst
 const { breakPointFromJSON } = breakPointUtilities;
 
 export default define(class StatementSubstitution extends Substitution {
-  constructor(contexts, string, node, breakPoint, resolved, substitution, targetStatement, replacementStatement) {
+  constructor(contexts, string, node, breakPoint, resolved, targetStatement, replacementStatement) {
     super(contexts, string, node, breakPoint);
 
     this.resolved = resolved;
-    this.substitution = substitution;
     this.targetStatement = targetStatement;
     this.replacementStatement = replacementStatement;
   }
@@ -28,10 +27,6 @@ export default define(class StatementSubstitution extends Substitution {
     return this.resolved;
   }
 
-  getSubstitution() {
-    return this.substitution;
-  }
-
   getTargetStatement() {
     return this.targetStatement;
   }
@@ -61,13 +56,9 @@ export default define(class StatementSubstitution extends Substitution {
     return replacementNode;
   }
 
-  getMetavariableNode() { return this.targetStatement.getMetavariableNode(); }
+  isSimple() { return this.targetStatement.isSimple(); }
 
-  isSimple() {
-    const simple = (this.substitution === null);
-
-    return simple;
-  }
+  getMetavariableNode() { return this.targetStatement.getMetavariableNode(); }
 
   matchMetavariableNode(metavariableNode) { return this.targetStatement.matchMetavariableNode(metavariableNode); }
 
@@ -87,7 +78,7 @@ export default define(class StatementSubstitution extends Substitution {
     return comparesToParameter;
   }
 
-  validate(substitution, context, continuatino) {
+  validate(context, continuatino) {
     const statementSubstitutionString = this.getString();  ///
 
     context.trace(`Validating the '${statementSubstitutionString}' statement substitution...`);
@@ -111,12 +102,9 @@ export default define(class StatementSubstitution extends Substitution {
       const validateTargetStatement = this.validateTargetStatement.bind(this),
             validateReplacementStatement = this.validateReplacementStatement.bind(this);
 
-      all([
+      return all([
         validateTargetStatement,
-        validateReplacementStatement,
-        (generalContext, specificContext, continuatino) => {
-          this.validateSubstitution(substitution, generalContext, specificContext, continuatino);
-        }
+        validateReplacementStatement
       ], generalContext, specificContext, (validates) => {
         let statementSubstitution = null;
 
@@ -136,38 +124,11 @@ export default define(class StatementSubstitution extends Substitution {
           context.debug(`...validated the '${statementSubstitutionString}' statement substitution.`);
         }
 
-        continuatino(statementSubstitution);
+        return continuatino(statementSubstitution);
       });
     }, generalContext, specificContext);
   }
 
-  validateSubstitution(substitution, generalContext, specificContext, continuatino) {
-    if (substitution === null) {
-      const substitutionValidates = true;
-
-      continuatino(substitutionValidates);
-
-      return;
-    }
-
-    let substitutionValidates;
-
-    const context = generalContext,  ///
-          statementSubstitutionString = this.getString(); ///
-
-    context.trace(`Validating the '${statementSubstitutionString}' statement substitution's substitution...`);
-
-    this.substitution = substitution;
-
-    substitutionValidates = true;
-
-    if (substitutionValidates) {
-      context.debug(`...validatewd the '${statementSubstitutionString}' statement substitution's substitution.`);
-    }
-
-    continuatino(substitutionValidates);
-  }
-
   validateTargetStatement(generalContext, specificContext, continuatino) {
     const context = generalContext,  ///
           statementSubstitutionString = this.getString();  ///
@@ -187,23 +148,21 @@ export default define(class StatementSubstitution extends Substitution {
       return;
     }
 
-    manifest((context) => {
-      elide((context) => {
-        this.targetStatement.validate(context, (targetStatement) => {
-          let targetStatementValidates = false;
+    elide((context) => {
+      this.targetStatement.validate(context, (targetStatement) => {
+        let targetStatementValidates = false;
 
-          if (targetStatement !== null) {
-            targetStatementValidates = true;
-          }
+        if (targetStatement !== null) {
+          targetStatementValidates = true;
+        }
 
-          if (targetStatementValidates) {
-            context.debug(`...validated the '${statementSubstitutionString}' statement substitution's target statement...`);
-          }
+        if (targetStatementValidates) {
+          context.debug(`...validated the '${statementSubstitutionString}' statement substitution's target statement...`);
+        }
 
-          continuatino(targetStatementValidates);
-        });
-      }, context);
-    }, specificContext, context);
+        continuatino(targetStatementValidates);
+      });
+    }, context);
   }
 
   validateReplacementStatement(generalContext, specificContext, continuatino) {
@@ -265,9 +224,7 @@ export default define(class StatementSubstitution extends Substitution {
     return targetStatemnentUnifies;
   }
 
-  unifyReplacementStatement(substitution, context) {
-    let replacementStatemnentUnifies = false;
-
+  unifyReplacementStatement(substitution, context, continuation) {
     const generalSubstitution = this, ///
           specificSubstitution = substitution,
           generalSubstitutionString = generalSubstitution.getString(),
@@ -285,77 +242,93 @@ export default define(class StatementSubstitution extends Substitution {
           specificStatement = specificSubstitutionReplacementStatement; ///
 
     reconcile((specificContext) => {
-      const statementUnifies = generalStatement.unifyStatement(specificStatement, generalContext, specificContext);
+      return generalStatement.unifyStatement(specificStatement, generalContext, specificContext, (statementUnifies) => {
+        let replacementStatemnentUnifies = false;
 
-      if (statementUnifies) {
-        specificContext.commit(context);
+        if (statementUnifies) {
+          specificContext.commit(context);
 
-        replacementStatemnentUnifies = true;
-      }
-    }, specificContext);
+          replacementStatemnentUnifies = true;
+        }
 
-    if (replacementStatemnentUnifies) {
-      context.trace(`...unified the '${specificSubstitutionString}' substitution's replacement statement with the '${generalSubstitutionString}' substitution's replacement statement.`);
-    }
+        if (replacementStatemnentUnifies) {
+          context.trace(`...unified the '${specificSubstitutionString}' substitution's replacement statement with the '${generalSubstitutionString}' substitution's replacement statement.`);
+        }
 
-    return replacementStatemnentUnifies;
+        return continuation(replacementStatemnentUnifies);
+      });
+    }, specificContext);
   }
 
-  unifyComplexSubstitution(complexSubstitution, context) {
-    let substitution = null;
-
+  unifyComplexSubstitution(complexSubstitution, context, continuation) {
     const simpleSubstitution = this,  ///
           simpleSubstitutionString = simpleSubstitution.getString(),  ///
           complexSubstitutionString = complexSubstitution.getString();  ///
 
     context.trace(`Unifying the '${complexSubstitutionString}' complex substitution with the '${simpleSubstitutionString}' simple substitution...`);
 
-    let simpleSubstitutionUnifies = false;
-
     reconcile((context) => {
-      const replacementStatementUnifies = this.unifyReplacementStatement(complexSubstitution, context);
+      return this.unifyReplacementStatement(complexSubstitution, context, (replacementStatementUnifies) => {
+        let substitution = null;
+
+        if (!replacementStatementUnifies) {
+          return continuation(substitution);
+        }
+
+        let simpleSubstitutionUnifies = false;
 
-      if (replacementStatementUnifies) {
         const soleNonTrivialDerivedSubstitution = context.getSoleNonTrivialDerivedSubstitution();
 
         substitution = soleNonTrivialDerivedSubstitution;  ///
-      }
-    }, context);
 
-    if (substitution !== null) {
-      simpleSubstitutionUnifies = true;
-    }
+        if (substitution !== null) {
+          simpleSubstitutionUnifies = true;
+        }
 
-    if (simpleSubstitutionUnifies) {
-      context.debug(`...unified the '${complexSubstitutionString}' complex substitution with the '${simpleSubstitutionString}' simple substitution.`);
-    }
+        if (simpleSubstitutionUnifies) {
+          context.debug(`...unified the '${complexSubstitutionString}' complex substitution with the '${simpleSubstitutionString}' simple substitution.`);
+        }
 
-    return substitution;
+        return continuation(substitution);
+      });
+    }, context);
   }
 
-  resolve(context) {
+  resolve(context, continuation) {
     const metavariableNode = this.getMetavariableNode(),
           simpleDerivedSubstitution = context.findSimpleDerivedSubstitutionByMetavariableNode(metavariableNode);
 
-    if (simpleDerivedSubstitution !== null) {
-      const simpleSubstitution = simpleDerivedSubstitution, ///
-            complexSubstitution = this, ///
-            complexSubstitutionString = complexSubstitution.getString();
+    if (simpleDerivedSubstitution === null) {
+      return continuation();
+    }
 
-      context.trace(`Resolving the ${complexSubstitutionString}' complex substitution...`);
+    const simpleSubstitution = simpleDerivedSubstitution, ///
+          complexSubstitution = this, ///
+          complexSubstitutionString = complexSubstitution.getString();
 
-      const substitution = simpleSubstitution.unifyComplexSubstitution(complexSubstitution, context);
+    context.trace(`Resolving the ${complexSubstitutionString}' complex substitution...`);
 
-      if (substitution !== null) {
-        const simpleSubstitutionUnifies = this.substitution.unifySubstitution(substitution, context);
+    return simpleSubstitution.unifyComplexSubstitution(complexSubstitution, context, (substitution) => {
+      if (substitution === null) {
+        return continuation();
+      }
 
-        if (simpleSubstitutionUnifies) {
+      const replacementSubstitution = substitution; ///
+
+      substitution = this.targetStatement.getSubstitution();
+
+      const targetSubstitution = substitution; ///
+
+      return targetSubstitution.unifySubstitution(replacementSubstitution, context, (substitutionUnifies) => {
+        if (substitutionUnifies) {
           this.resolved = true;
 
           context.debug(`...resolved the '${complexSubstitutionString}' complex substitution.`);
         }
-      }
-    }
+
+        return continuation();
+      });
+    });
   }
 
   static name = "StatementSubstitution";
@@ -372,8 +345,7 @@ export default define(class StatementSubstitution extends Substitution {
                 statementSubstitutionNode = instantiateStatementSubstitution(string, context),
                 node = statementSubstitutionNode, ///
                 breakPoint = breakPointFromJSON(json),
-                resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
-                substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext),
+                resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext),
                 targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, generalContext),
                 replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, specificContext),
                 contexts = [
@@ -381,7 +353,7 @@ export default define(class StatementSubstitution extends Substitution {
                   specificContext
                 ];
 
-          statementSubstitutionn = new StatementSubstitution(contexts, string, node, breakPoint, resolved, substitution, targetStatement, replacementStatement);
+          statementSubstitutionn = new StatementSubstitution(contexts, string, node, breakPoint, resolved, targetStatement, replacementStatement);
         }, json, context);
       }, context);
     }
@@ -397,16 +369,16 @@ export default define(class StatementSubstitution extends Substitution {
     let statementSubstitution;
 
     ablates((generalContext, specificContext) => {
-      const context = specificContext;  ///
-
-      instantiate((context) => {
-        const specificContext = context,  ///
-              statementSubstitutionString = statementSubstitutionStringFromStatementAndMetavariable(statement, metavariable),
-              string = statementSubstitutionString, ///
-              statementSubstitutionNode = instantiateStatementSubstitution(string, context);
-
-        statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext);
-      }, context);
+      instantiate((specificContext) => {
+        manifest((generalContext) => {
+          const statementSubstitutionString = statementSubstitutionStringFromStatementAndMetavariable(statement, metavariable),
+                string = statementSubstitutionString, ///
+                context = specificContext,  ///
+                statementSubstitutionNode = instantiateStatementSubstitution(string, context);
+
+          statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext);
+        }, generalContext, specificContext);
+      }, specificContext);
     }, generalContext, specificContext);
 
     return statementSubstitution;
@@ -420,35 +392,28 @@ export default define(class StatementSubstitution extends Substitution {
     let statementSubstitution;
 
     ablates((generalContext, specificContext) => {
-      const context = specificContext;  ///
-
-      instantiate((context) => {
-        const specificContext = context,  ///
-              statementSubstitutionString = statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution),
-              string = statementSubstitutionString, ///
-              statementSubstitutionNode = instantiateStatementSubstitution(string, context);
-
-        statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext);
-      }, context);
+      instantiate((specificContext) => {
+        manifest((generalContext) => {
+          const statementSubstitutionString = statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution),
+                string = statementSubstitutionString, ///
+                context = specificContext,  ///
+                statementSubstitutionNode = instantiateStatementSubstitution(string, context);
+
+          statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext);
+        }, generalContext, specificContext);
+      }, specificContext);
     }, generalContext, specificContext);
 
     return statementSubstitution;
   }
 });
 
-function resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+function resolvedFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext) {
   const resolved = true;
 
   return resolved;
 }
 
-function substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
-  const substitutionNode = statementSubstitutionNode.getSubstitutionNode(),
-        substitution = context.findSubstitutionBySubstitutionNode(substitutionNode);
-
-  return substitution;
-}
-
 function targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, generalContext) {
   const targetStatementNode = statementSubstitutionNode.getTargetStatementNode(),
         targetStatement = generalContext.findStatementByStatementNode(targetStatementNode);