occam-nominal 1.0.310 → 1.0.317

package/src/element/substitution/term.js

@@ -10,7 +10,7 @@ import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionFromTermSubstitutionNode } from "../../utilities/element";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
-import { elide, ablates, manifest, attempts, reconcile, instantiate, unserialises } from "../../utilities/context";
+import { elide, ablate, ablates, descend, manifest, attempts, reconcile, instantiate, unserialises } from "../../utilities/context";
 
 const { breakPointFromJSON } = breakPointUtilities;
 
@@ -62,6 +62,13 @@ export default define(class TermSubstitution extends Substitution {
 
   matchVariableNode(variableNode) { return this.targetTerm.matchVariableNode(variableNode); }
 
+  compareParameter(parameter) {
+    const targetTermComparesToParameter = this.targetTerm.compareParameter(parameter),
+          comparesToParameter = targetTermComparesToParameter;  ///
+
+    return comparesToParameter;
+  }
+
   compareTerm(term, context) {
     term = stripBracketsFromTerm(term, context); ///
 
@@ -71,13 +78,6 @@ export default define(class TermSubstitution extends Substitution {
     return comparedToTerm;
   }
 
-  compareParameter(parameter) {
-    const targetTermComparesToParameter = this.targetTerm.compareParameter(parameter),
-          comparesToParameter = targetTermComparesToParameter;  ///
-
-    return comparesToParameter;
-  }
-
   validate(context, continuatino) {
     const termSubstitutionString = this.getString();  ///
 
@@ -90,9 +90,7 @@ export default define(class TermSubstitution extends Substitution {
 
       context.debug(`...the '${termSubstitutionString}' term substitution is already valid.`);
 
-      continuatino(termSubstitution);
-
-      return;
+      return continuatino(termSubstitution);
     }
 
     const generalContext = this.getGeneralContext(),
@@ -102,7 +100,7 @@ export default define(class TermSubstitution extends Substitution {
       const validateTargetTerm = this.validateTargetTerm.bind(this),
             validateReplacementTerm = this.validateReplacementTerm.bind(this);
 
-      all([
+      return all([
         validateTargetTerm,
         validateReplacementTerm
       ], generalContext, specificContext, (validates) => {
@@ -124,7 +122,7 @@ export default define(class TermSubstitution extends Substitution {
           context.debug(`...validated the '${termSubstitutionString}' term substitution.`);
         }
 
-        continuatino(termSubstitution);
+        return continuatino(termSubstitution);
       });
     }, generalContext, specificContext);
   }
@@ -143,28 +141,24 @@ export default define(class TermSubstitution extends Substitution {
 
       context.debug(`The '${targetTermString}' target term is not singular.`);
 
-      continuatino(targetTermValidates);
-
-      return;
+      return continuatino(targetTermValidates);
     }
 
-    manifest((context) => {
-      elide((context) => {
-        this.targetTerm.validate(context, (targetTerm) => {
-          let targetTermValidates = false;
+    elide((context) => {
+      return this.targetTerm.validate(context, (targetTerm) => {
+        let targetTermValidates = false;
 
-          if (targetTerm !== null) {
-            targetTermValidates = true;
-          }
+        if (targetTerm !== null) {
+          targetTermValidates = true;
+        }
 
-          if (targetTermValidates) {
-            context.debug(`...validated the '${termSubstitutionString}' term substitution's target term...`);
-          }
+        if (targetTermValidates) {
+          context.debug(`...validated the '${termSubstitutionString}' term substitution's target term...`);
+        }
 
-          continuatino(targetTermValidates);
-        });
-      }, context);
-    }, specificContext, context);
+        return continuatino(targetTermValidates);
+      });
+    }, context);
   }
 
   validateReplacementTerm(generalContext, specificContext, continuatino) {
@@ -174,7 +168,7 @@ export default define(class TermSubstitution extends Substitution {
     context.trace(`Validating the '${termSubstitutionString}' term substitution's replacement term...`);
 
     elide((context) => {
-      this.replacementTerm.validate(context, (replacementTerm) => {
+      return this.replacementTerm.validate(context, (replacementTerm) => {
         let replacementTermValidates = false;
 
         if (replacementTerm !== null) {
@@ -185,14 +179,12 @@ export default define(class TermSubstitution extends Substitution {
           context.debug(`...validated the '${termSubstitutionString}' term substitution's replacement term.`);
         }
 
-        continuatino(replacementTermValidates);
+        return continuatino(replacementTermValidates);
       });
     }, context);
   }
 
-  unifySubstitution(substitution, context) {
-    let substitutionUnifies = false;
-
+  unifySubstitution(substitution, context, continuation) {
     const generalSubstitution = this, ///
           specificSubstitution = substitution,
           generalSubstitutionString = generalSubstitution.getString(),
@@ -201,29 +193,27 @@ export default define(class TermSubstitution extends Substitution {
     context.trace(`Unifying the '${specificSubstitutionString}' substitution with the '${generalSubstitutionString}' substitution...`);
 
     reconcile((context) => {
-      const replacementTermUnifies = this.unifyReplacementTerm(substitution, context);
-
-      if (replacementTermUnifies) {
-        const targetTermUnifies = this.unifyTargetTerm(substitution, context);
-
-        if (targetTermUnifies) {
+      const unifyTargetTerm = this.unifyTargetTerm.bind(this),
+            unifyReplacementTerm = this.unifyReplacementTerm.bind(this);
+
+      return all([
+        unifyReplacementTerm,
+        unifyTargetTerm
+      ], substitution, context, (substitutionUnifies) => {
+        if (substitutionUnifies) {
           context.commit();
-
-          substitutionUnifies = true;
         }
-      }
-    }, context);
 
-    if (substitutionUnifies) {
-      context.debug(`...unified the '${specificSubstitutionString}' substitution with the '${generalSubstitutionString}' substitution.`);
-    }
+        if (substitutionUnifies) {
+          context.debug(`...unified the '${specificSubstitutionString}' substitution with the '${generalSubstitutionString}' substitution.`);
+        }
 
-    return substitutionUnifies;
+        return continuation(substitutionUnifies);
+      });
+    }, context);
   }
 
-  unifyTargetTerm(substitution, context) {
-    let targetTermUnifies = false;
-
+  unifyTargetTerm(substitution, context, continuation) {
     const generalSubstitution = this, ///
           specificSubstitution = substitution,
           generalSubstitutionString = generalSubstitution.getString(),
@@ -241,31 +231,36 @@ export default define(class TermSubstitution extends Substitution {
           specificTerm = specificSubstitutionTargetTerm; ///
 
     reconcile((specificContext) => {
-      const termNode = generalTerm.getNode(),
+      const termNode = generalTerm.getTermNode(),
             variable = variableFromTermNode(termNode, generalContext);
 
-      if (variable !== null) {
-        const term = specificTerm,  ///
-              termUnifies = variable.unifyTerm(term, generalContext, specificContext);
+      if (variable === null) {
+        const targetTermUnifies = false;
+
+        return continuation(targetTermUnifies);
+      }
+
+      const term = specificTerm;  ///
+
+      return variable.unifyTerm(term, generalContext, specificContext, (termUnifies) => {
+        let targetTermUnifies = false;
 
         if (termUnifies) {
           specificContext.commit(context);
 
           targetTermUnifies = true;
         }
-      }
-    }, specificContext);
 
-    if (targetTermUnifies) {
-      context.trace(`...unified the '${specificSubstitutionString}' substitution's target term with the '${generalSubstitutionString}' substitution's target term.`);
-    }
+        if (targetTermUnifies) {
+          context.trace(`...unified the '${specificSubstitutionString}' substitution's target term with the '${generalSubstitutionString}' substitution's target term.`);
+        }
 
-    return targetTermUnifies;
+        return continuation(targetTermUnifies);
+      });
+    }, specificContext);
   }
 
-  unifyReplacementTerm(substitution, context) {
-    let replacementTermUnifies = false;
-
+  unifyReplacementTerm(substitution, context, continuation) {
     const generalSubstitution = this, ///
           specificSubstitution = substitution,
           generalSubstitutionString = generalSubstitution.getString(),
@@ -286,23 +281,30 @@ export default define(class TermSubstitution extends Substitution {
       const termNode = generalTerm.getNode(),
             variable = variableFromTermNode(termNode, generalContext);
 
-      if (variable !== null) {
-        const term = specificTerm,  ///
-              termUnifies = variable.unifyTerm(term, generalContext, specificContext);
+      if (variable === null) {
+        const replacementTermUnifies = false;
+
+        return continuation(replacementTermUnifies);
+      }
+
+      const term = specificTerm;  ///
+
+      return variable.unifyTerm(term, generalContext, specificContext, (termUnifies) => {
+        let replacementTermUnifies = false;
 
         if (termUnifies) {
           specificContext.commit(context);
 
           replacementTermUnifies = true;
         }
-      }
-    }, specificContext);
 
-    if (replacementTermUnifies) {
-      context.trace(`...unified the '${specificSubstitutionString}' substitution's replacement term with the '${generalSubstitutionString}' substitution's replacement term.`);
-    }
+        if (replacementTermUnifies) {
+          context.trace(`...unified the '${specificSubstitutionString}' substitution's replacement term with the '${generalSubstitutionString}' substitution's replacement term.`);
+        }
 
-    return replacementTermUnifies;
+        return continuation(replacementTermUnifies);
+      });
+    }, specificContext);
   }
 
   static name = "TermSubstitution";
@@ -334,16 +336,20 @@ export default define(class TermSubstitution extends Substitution {
     return termSubstitutionn;
   }
 
-  static fromStatement(statement, context) {
+  static fromStatementNode(statementNode, context) {
     let termSubstitution = null;
 
-    const termSubstitutionNode = statement.getTermSubstitutionNode();
+    const termSubstitutionNode = statementNode.getTermSubstitutionNode();
 
     if (termSubstitutionNode !== null) {
-      const generalContext = context, ///
-            specificContext = context;  ///
+      ablate((context) => {
+        descend((context) => {
+          const generalContext = context, ///
+                specificContext = context;  ///
 
-      termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext);
+          termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext);
+        }, context);
+      }, context);
     }
 
     return termSubstitution;
@@ -357,16 +363,16 @@ export default define(class TermSubstitution extends Substitution {
     let termSubstitution;
 
     ablates((generalContext, specificContext) => {
-      const context = specificContext;  ///
-
-      instantiate((context) => {
-        const specificContext = context, ///
-              termSubstitutionString = termSubstitutionStringFromTermAndVariable(term, variable),
-              string = termSubstitutionString,  ///
-              termSubstitutionNode = instantiateTermSubstitution(string, context);
-
-        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext);
-      }, context);
+      instantiate((specificContext) => {
+        manifest((generalContext) => {
+          const termSubstitutionString = termSubstitutionStringFromTermAndVariable(term, variable),
+                string = termSubstitutionString,  ///
+                context = specificContext,  ///
+                termSubstitutionNode = instantiateTermSubstitution(string, context);
+
+          termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext);
+        }, generalContext, specificContext);
+      }, specificContext);
     }, generalContext, specificContext);
 
     return termSubstitution;

package/src/element/substitution.js

@@ -113,6 +113,12 @@ export default class Substitution extends Element {
     return equalTo;
   }
 
+  isSimple() {
+    const simple = true;
+
+    return simple;
+  }
+
   isComplex() {
     const simple = this.isSimple(),
           complex = !simple;
@@ -181,12 +187,6 @@ export default class Substitution extends Element {
     return replacementReference;
   }
 
-  isSimple() {
-    const simple = true;
-
-    return simple;
-  }
-
   matchVariableNode(variableNode) {
     const variableNodeMatches = false;
 

package/src/element/term.js

@@ -199,7 +199,7 @@ export default define(class Term extends Element {
 
     let term = this;
 
-    exists(validateTerms, term, context, (termValidates) => {
+    return exists(validateTerms, term, context, (termValidates) => {
       if (termValidates) {
         context.addTerm(term);
 

package/src/element/topLevelAssertion/axiom.js

@@ -35,12 +35,10 @@ export default define(class Axiom extends TopLevelAssertion {
     if (signatureVerifies) {
       const verifies = false;
 
-      continuation(verifies);
-
-      return;
+      return continuation(verifies);
     }
 
-    this.verifyEx(context, (verifies) => {
+    return this.verifyEx(context, (verifies) => {
       if (verifies) {
         const axiom = this; ///
 
@@ -49,7 +47,7 @@ export default define(class Axiom extends TopLevelAssertion {
         context.debug(`...verified the '${axiomString}' axiom.`);
       }
 
-      continuation(verifies);
+      return continuation(verifies);
     });
   });
 

package/src/element/topLevelAssertion/conjecture.js

@@ -21,7 +21,7 @@ export default define(class Conjecture extends TopLevelAssertion {
 
     context.trace(`Verifying the '${conjectureString}' conjecture...`);
 
-    this.verifyEx(context, (verifies) => {
+    return this.verifyEx(context, (verifies) => {
       if (verifies) {
         const conjecture = this;  ///
 
@@ -30,7 +30,7 @@ export default define(class Conjecture extends TopLevelAssertion {
         context.debug(`...verified the '${conjectureString}' conjecture.`);
       }
 
-      continuation(verifies);
+      return continuation(verifies);
     });
   });
 

package/src/element/topLevelAssertion/lemma.js

@@ -23,7 +23,7 @@ export default define(class Lemma extends TopLevelAssertion {
       context.trace(`Verifying a lemma...`) :
         context.trace(`Verifying the '${lemmaString}' lemma...`);
 
-    this.verifyEx(context, (verifies) => {
+    return this.verifyEx(context, (verifies) => {
       if (verifies) {
         const lemma = this; ///
 
@@ -34,7 +34,7 @@ export default define(class Lemma extends TopLevelAssertion {
             context.debug(`...verified the '${lemmaString}' lemma.`);
       }
 
-      continuation(verifies);
+      return continuation(verifies);
     });
   });
 

package/src/element/topLevelAssertion/theorem.js

@@ -21,7 +21,7 @@ export default define(class Theorem extends TopLevelAssertion {
 
     context.trace(`Verifying the '${theoremString}' theorem...`);
 
-    this.verifyEx(context, (verifies) => {
+    return this.verifyEx(context, (verifies) => {
       if (verifies) {
         const theorem = this; ///
 
@@ -30,7 +30,7 @@ export default define(class Theorem extends TopLevelAssertion {
         context.debug(`...verified the '${theoremString}' theorem.`);
       }
 
-      continuation(verifies);
+      return continuation(verifies);
     });
   });