occam-nominal 1.0.310 → 1.0.317

package/src/element/metavariable.js

@@ -7,7 +7,6 @@ import elements from "../elements";
 import { all } from "../utilities/continuation";
 import { define } from "../elements";
 import { instantiate } from "../utilities/context";
-import { EMPTY_STRING } from "../constants";
 import { instantiateMetavariable } from "../process/instantiate";
 import { metaTypeFromJSON, metaTypeToMetaTypeJSON } from "../utilities/json";
 import { unifyMetavariable, unifyMetavariableIntrinsically } from "../process/unify";
@@ -199,7 +198,7 @@ export default define(class Metavariable extends Element {
           validateTerm = this.validateTerm.bind(this),
           validateType = this.validateType.bind(this);
 
-    all([
+    return all([
       validateName,
       validateTerm,
       validateType
@@ -219,7 +218,7 @@ export default define(class Metavariable extends Element {
         context.debug(`...validated the '${metavariableString}' metavariable.`);
       }
 
-      continuation(metavariable);
+      return continuation(metavariable);
     });
   }
 
@@ -250,22 +249,22 @@ export default define(class Metavariable extends Element {
       context.debug(`...validated the '${metavariableString}' metavariable's name.`);
     }
 
-    continuation(nameValidates);
+    return continuation(nameValidates);
   }
 
   validateTerm(strict, context, continuation) {
     if (this.term === null) {
       const termValidates = true;
 
-      continuation(termValidates);
-
-      return;
+      return continuation(termValidates);
     }
 
     const metavariableString = this.getString();  ///
 
     context.trace(`Validating the '${metavariableString}' metavariable's term...`);
 
+    debugger
+
     let termValidates = false;
 
     const metavariableName = this.getMetavariableName(),
@@ -304,9 +303,7 @@ export default define(class Metavariable extends Element {
     if (this.type === null) {
       const typeValidates = true;
 
-      continuation(typeValidates);
-
-      return;
+      return continuation(typeValidates);
     }
 
     let typeValidates;
@@ -325,7 +322,7 @@ export default define(class Metavariable extends Element {
       context.trace(`...validated  the '${metavariableString}' metavariable's type.`);
     }
 
-    continuation(typeValidates);
+    return continuation(typeValidates);
   }
 
   unifyFrame(frame, generalContext, specificContext, continuation) {
@@ -366,7 +363,7 @@ export default define(class Metavariable extends Element {
     const { FrameSubstitution } = elements,
           frameSubstitution = FrameSubstitution.fromFrameAndMetavariable(frame, metavariable, generalContext, specificContext);
 
-    frameSubstitution.validate(context, (frameSubstitution) => {
+    return frameSubstitution.validate(context, (frameSubstitution) => {
       let frameUnifies = false;
 
       if (frameSubstitution !== null) {
@@ -385,63 +382,70 @@ export default define(class Metavariable extends Element {
     });
   }
 
-  unifyStatement(statement, substitution, generalContext, specificContext, continuation) {
+  unifyStatement(statement, generalContext, specificContext, continuation) {
     const context = specificContext,  ///
           statementString = statement.getString(),
-          metavariableString = this.getString(), ///
-          substitutionString = (substitution !== null) ?
-                                  substitution.getString() :
-                                    EMPTY_STRING;
+          metavariableString = this.getString();
 
-    context.trace(`Unifying the '${statementString}' statement with the '${metavariableString}${substitutionString}' metavariable...`);
+    context.trace(`Unifying the '${statementString}' statement with the '${metavariableString}}' metavariable...`);
 
-    this.compareStatementMetavariable(statement, generalContext, specificContext, (statementMetavariableCompares) => {
-      if (statementMetavariableCompares) {
-        const statementUnifies = true;
+    const statementMetavariableCompares = this.compareStatementMetavariable(statement, generalContext, specificContext);
 
-        return continuation(statementUnifies);
-      }
+    if (statementMetavariableCompares) {
+      const statementUnifies = true;
 
-      const metavariable = this,  ///
-            metavariableNode = metavariable.getNode(),
-            derivedSubstitution = (substitution !== null) ?
-                                    context.findDerivedSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution) :
-                                      context.findDerivedSubstitutionByMetavariableNode(metavariableNode);
+      return continuation(statementUnifies);
+    }
 
-      if (derivedSubstitution !== null) {
-        let statementUnifies = false;
+    const metavariable = this,  ///
+          metavariableNode = metavariable.getNode(),
+          sublingSubstitutionNode = metavariableNode.getSiblingSubstitutionNode(),
+          substitutionNode = sublingSubstitutionNode, ///
+          derivedSubstitution = (substitutionNode !== null) ?
+                                  context.findDerivedSubstitutionByMetavariableNodeAndSubstitutionNode(metavariableNode, substitutionNode) :
+                                    context.findDerivedSubstitutionByMetavariableNode(metavariableNode);
 
-        const derivedSubstitutionComparesToStatement = derivedSubstitution.compareStatement(statement, context);
+    if (derivedSubstitution !== null) {
+      let statementUnifies = false;
 
-        if (derivedSubstitutionComparesToStatement) {
-          const derivedSubstitutionString = derivedSubstitution.getString();
+      const derivedSubstitutionComparesToStatement = derivedSubstitution.compareStatement(statement, context);
 
-          context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);
+      if (derivedSubstitutionComparesToStatement) {
+        const derivedSubstitutionString = derivedSubstitution.getString();
 
-          statementUnifies = true;
-        }
+        context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);
 
-        return continuation(statementUnifies);
+        statementUnifies = true;
       }
 
-      const { StatementSubstitution } = elements,
-            statementSubstitution = (substitution !== null) ?
-                                      StatementSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, generalContext, specificContext) :
-                                        StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, generalContext, specificContext);
+      return continuation(statementUnifies);
+    }
 
-      statementSubstitution.validate(substitution, context, (statementSubstitution) => {
-        const derivedSubstitution = statementSubstitution;  ///
+    const { StatementSubstitution } = elements;
 
-        context.addDerivedSubstitution(derivedSubstitution);
+    let statementSubstitution;
 
-        const statementUnifies = true;
+    if (substitutionNode !== null) {
+      const context = generalContext, ///
+            substitution = context.findSubstitutionBySubstitutionNode(substitutionNode);
 
-        if (statementUnifies) {
-          context.debug(`...unified the '${statementString}' statement with the '${metavariableString}${substitutionString}' metavariable.`);
-        }
+      statementSubstitution = StatementSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, generalContext, specificContext);
+    } else {
+      statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, generalContext, specificContext);
+    }
+
+    statementSubstitution.validate(context, (statementSubstitution) => {
+      const derivedSubstitution = statementSubstitution;  ///
+
+      context.addDerivedSubstitution(derivedSubstitution);
+
+      const statementUnifies = true;
+
+      if (statementUnifies) {
+        context.debug(`...unified the '${statementString}' statement with the '${metavariableString}' metavariable.`);
+      }
 
-        return continuation(statementUnifies);
-      });
+      return continuation(statementUnifies);
     });
   }
 
@@ -592,7 +596,7 @@ export default define(class Metavariable extends Element {
     return referenceMetavariableCompares;
   }
 
-  compareStatementMetavariable(statement, generalContext, specificContext, continuation) {
+  compareStatementMetavariable(statement, generalContext, specificContext) {
     let statementMetavariableCompares = false;
 
     const context = specificContext,  ///
@@ -617,7 +621,7 @@ export default define(class Metavariable extends Element {
       context.debug(`...compared the '${statementString}' statement's metavariable to the '${metavariableString}' metavariable.`);
     }
 
-    continuation(statementMetavariableCompares);
+    return statementMetavariableCompares;
   }
 
   toJSON() {

package/src/element/proof.js

@@ -35,7 +35,7 @@ export default define(class Proof extends Element {
 
   verify(statement, context, continuation) {
     enclose((context) => {
-      this.derivation.verify(context, (derivationVerifies) => {
+      return this.derivation.verify(context, (derivationVerifies) => {
         let verifies = false;
 
         if (derivationVerifies) {

package/src/element/proofAssertion/premise.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { breakPointUtilities, continuationUtilities } from "occam-languages";
+import { breakPointUtilities } from "occam-languages";
 
 import ProofAssertion from "../proofAssertion";
 
@@ -75,13 +75,11 @@ export default define(class Premise extends ProofAssertion {
 
       context.debug(`Unable to verify the '${premiseString}' premise because it is nonsense.`);
 
-      continuation(verifies);
-
-      return;
+      return continuation(verifies);
     }
 
     declare((context) => {
-      this.validate(context, (validates) => {
+      return this.validate(context, (validates) => {
         let verifies = false;
 
         if (validates) {
@@ -92,7 +90,7 @@ export default define(class Premise extends ProofAssertion {
           context.debug(`...verified the '${premiseString}' premise.`);
         }
 
-        continuation(verifies);
+        return continuation(verifies);
       });
     }, context);
   });
@@ -106,7 +104,7 @@ export default define(class Premise extends ProofAssertion {
       const validateStatement = this.validateStatement.bind(this),
             validateProcedureCall = this.validateProcedureCall.bind(this);
 
-      exists([
+      return exists([
         validateStatement,
         validateProcedureCall
       ], context, (validates) => {
@@ -118,7 +116,7 @@ export default define(class Premise extends ProofAssertion {
           context.debug(`...validated the '${premiseString}' premise.`);
         }
 
-        continuation(validates);
+        return continuation(validates);
       });
     }, context);
   }
@@ -129,16 +127,14 @@ export default define(class Premise extends ProofAssertion {
     if (statement === null) {
       const statementValidates = false;
 
-      continuation(statementValidates);
-
-      return;
+      return continuation(statementValidates);
     }
 
     const premiseString = this.getString();
 
     context.trace(`Validating the '${premiseString}' premise's statsement...`);
 
-    statement.validate(context, (statement) => {
+    return statement.validate(context, (statement) => {
       let statementValidates = false;
 
       if (statement !== null) {
@@ -149,7 +145,7 @@ export default define(class Premise extends ProofAssertion {
         context.debug(`...validated the '${premiseString}' premise's statement.`);
       }
 
-      continuation(statementValidates);
+      return continuation(statementValidates);
     });
   }
 
@@ -159,21 +155,19 @@ export default define(class Premise extends ProofAssertion {
     if (procedureCall === null) {
       const procedureCallValidates = false;
 
-      continuation(procedureCallValidates);
-
-      return;
+      return continuation(procedureCallValidates);
     }
 
     const premiseString = this.getString();
 
     context.trace(`Validatting the '${premiseString}' premise's procedure call...`);
 
-    this.procedureCall.validate(context, (procedureCallValidates) => {
+    return procedureCall.validate(context, (procedureCallValidates) => {
       if (procedureCallValidates) {
         context.debug(`...validated the '${premiseString}' premise's procedure call.`);
       }
 
-      continuation(procedureCallValidates);
+      return continuation(procedureCallValidates);
     });
   }
 
@@ -235,9 +229,7 @@ export default define(class Premise extends ProofAssertion {
     if (subproofAssertion === null) {
       const subproofUnifies = false;
 
-      continuation(subproofUnifies);
-
-      return;
+      return continuation(subproofUnifies);
     }
 
     const premiseContext = this.getContext(), ///
@@ -245,7 +237,7 @@ export default define(class Premise extends ProofAssertion {
           specificContext = context; ///
 
     reconcile((context) => {
-      subproofAssertion.unifySubproof(subproof, generalContext, specificContext, (subproofUnifies) => {
+      return subproofAssertion.unifySubproof(subproof, generalContext, specificContext, (subproofUnifies) => {
         if (subproofUnifies) {
           context.commit();
         }
@@ -254,7 +246,7 @@ export default define(class Premise extends ProofAssertion {
           context.debug(`...unified the '${subproofString}' subproof with the '${premiseString}' premise.`);
         }
 
-        continuation(subproofUnifies);
+        return continuation(subproofUnifies);
       });
     }, context);
   }
@@ -273,7 +265,7 @@ export default define(class Premise extends ProofAssertion {
     reconcile((specificContext) => {
       const statement = proofAssertion.getStatement();
 
-      this.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
+      return this.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
         let proofAssertionUnifies = false;
 
         if (statementUnifies) {
@@ -286,7 +278,7 @@ export default define(class Premise extends ProofAssertion {
           context.debug(`...unified the '${proofAssertionString}' proof assertion with the '${premiseString}' premise.`);
         }
 
-        continuation(proofAssertionUnifies);
+        return continuation(proofAssertionUnifies);
       });
     }, specificContext);
   }

package/src/element/proofAssertion/step.js

@@ -143,7 +143,7 @@ export default define(class Step extends ProofAssertion {
       const unify = this.unify.bind(this),
             validate = this.validate.bind(this);
 
-      all([
+      return all([
         validate,
         unify
       ], context, (verifies) => {
@@ -151,7 +151,7 @@ export default define(class Step extends ProofAssertion {
           context.debug(`...verified the '${stepString}' step.`);
         }
 
-        continuation(verifies);
+        return continuation(verifies);
       });
     }, context);
   });
@@ -166,7 +166,7 @@ export default define(class Step extends ProofAssertion {
             validateReference = this.validateReference.bind(this),
             validateSignatureAssertion = this.validateSignatureAssertion.bind(this);
 
-      all([
+      return all([
         validateStatement,
         validateReference,
         validateSignatureAssertion
@@ -179,7 +179,7 @@ export default define(class Step extends ProofAssertion {
           context.debug(`...validated the '${stepString}' step.`);
         }
 
-        continuation(validates);
+        return continuation(validates);
       });
     }, context);
   }

package/src/element/proofAssertion/supposition.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { breakPointUtilities, continuationUtilities } from "occam-languages";
+import { breakPointUtilities } from "occam-languages";
 
 import ProofAssertion from "../proofAssertion";
 
@@ -75,13 +75,11 @@ export default define(class Supposition extends ProofAssertion {
 
       context.debug(`Unable to verify the '${suppositionString}' supposition because it is nonsense.`);
 
-      continuation(verifies);
-
-      return;
+      return continuation(verifies);
     }
 
     declare((context) => {
-      this.validate(context, (validates) => {
+      return this.validate(context, (validates) => {
         let verifies = false;
 
         if (validates) {
@@ -92,7 +90,7 @@ export default define(class Supposition extends ProofAssertion {
           context.debug(`...verified the '${suppositionString}' supposition.`);
         }
 
-        continuation(verifies);
+        return continuation(verifies);
       });
     }, context);
   });
@@ -106,7 +104,7 @@ export default define(class Supposition extends ProofAssertion {
       const validateStatement = this.validateStatement.bind(this),
             validateProcedureCall = this.validateProcedureCall.bind(this);
 
-      exists([
+      return exists([
         validateStatement,
         validateProcedureCall
       ], context, (validates) => {
@@ -118,7 +116,7 @@ export default define(class Supposition extends ProofAssertion {
           context.debug(`...validated the '${suppositionString}' supposition.`);
         }
 
-        continuation(validates);
+        return continuation(validates);
       });
     }, context);
   }
@@ -129,16 +127,14 @@ export default define(class Supposition extends ProofAssertion {
     if (statement === null) {
       const statementValidates = false;
 
-      continuation(statementValidates);
-
-      return;
+      return continuation(statementValidates);
     }
 
     const suppositionString = this.getString();
 
     context.trace(`Validating the '${suppositionString}' supposition's statsement...`);
 
-    statement.validate(context, (statement) => {
+    return statement.validate(context, (statement) => {
       let statementValidates = false;
 
       if (statement !== null) {
@@ -149,7 +145,7 @@ export default define(class Supposition extends ProofAssertion {
         context.debug(`...validated the '${suppositionString}' supposition's statement.`);
       }
 
-      continuation(statementValidates);
+      return continuation(statementValidates);
     });
   }
 
@@ -159,27 +155,23 @@ export default define(class Supposition extends ProofAssertion {
     if (procedureCall === null) {
       const procedureCallValidates = false;
 
-      continuation(procedureCallValidates);
-
-      return;
+      return continuation(procedureCallValidates);
     }
 
     const suppositionString = this.getString();
 
     context.trace(`Validatting the '${suppositionString}' supposition's procedure call...`);
 
-    this.procedureCall.validate(context, (procedureCallValidates) => {
+    procedureCall.validate(context, (procedureCallValidates) => {
       if (procedureCallValidates) {
         context.debug(`...validated the '${suppositionString}' supposition's procedure call.`);
       }
 
-      continuation(procedureCallValidates);
+      return continuation(procedureCallValidates);
     });
   }
 
-  unifyIndependently(context) {
-    let unifiesIndependently = false;
-
+  unifyIndependently(context, continuation) {
     const suppositionString = this.getString(); ///
 
     context.trace(`Unifying the '${suppositionString}' supposition independently...`);
@@ -191,28 +183,39 @@ export default define(class Supposition extends ProofAssertion {
       if (statement !== null) {
         const suppositionContext = this.getContext(), ///
               generalContext = suppositionContext,  ///
-              specificContext = context,  ///
-              statementUnifiesIndependently = statement.unifyIndependently(generalContext, specificContext);
+              specificContext = context;  ///
 
-        if (statementUnifiesIndependently) {
-          unifiesIndependently = true;
-        }
+        return statement.unifyIndependently(generalContext, specificContext, (statementUnifiesIndependently) => {
+          let unifiesIndependently = false;
+
+          if (statementUnifiesIndependently) {
+            unifiesIndependently = true;
+          }
+
+          if (unifiesIndependently) {
+            context.debug(`...unified the '${suppositionString}' supposition independently.`);
+          }
+
+          return continuation(unifiesIndependently);
+        });
       }
 
       if (procedureCall !== null) {
-        const procedureCallResolvedIndependently = procedureCall.unifyIndependently(context);
+        return procedureCall.unifyIndependently(context, (procedureCallResolvedIndependently) => {
+          let unifiesIndependently = false;
 
-        if (procedureCallResolvedIndependently) {
-          unifiesIndependently = true;
-        }
-      }
-    }, context);
+          if (procedureCallResolvedIndependently) {
+            unifiesIndependently = true;
+          }
 
-    if (unifiesIndependently) {
-      context.debug(`...unified the '${suppositionString}' supposition independently.`);
-    }
+          if (unifiesIndependently) {
+            context.debug(`...unified the '${suppositionString}' supposition independently.`);
+          }
 
-    return unifiesIndependently;
+          return continuation(unifiesIndependently);
+        });
+      }
+    }, context);
   }
 
   unifySubproof(subproof, context, continuation) {
@@ -226,9 +229,7 @@ export default define(class Supposition extends ProofAssertion {
     if (subproofAssertion === null) {
       const subproofUnifies = false;
 
-      continuation(subproofUnifies);
-
-      return;
+      return continuation(subproofUnifies);
     }
 
     const suppositionContext = this.getContext(), ///
@@ -236,7 +237,7 @@ export default define(class Supposition extends ProofAssertion {
           specificContext = context; ///
 
     reconcile((context) => {
-      subproofAssertion.unifySubproof(subproof, generalContext, specificContext, (subproofUnifies) => {
+      return subproofAssertion.unifySubproof(subproof, generalContext, specificContext, (subproofUnifies) => {
         if (subproofUnifies) {
           context.commit();
         }
@@ -245,7 +246,7 @@ export default define(class Supposition extends ProofAssertion {
           context.debug(`...unified the '${subproofString}' subproof with the '${suppositionString}' supposition.`);
         }
 
-        continuation(subproofUnifies);
+        return continuation(subproofUnifies);
       });
     }, context);
   }
@@ -264,7 +265,7 @@ export default define(class Supposition extends ProofAssertion {
     reconcile((specificContext) => {
       const statement = proofAssertion.getStatement();
 
-      this.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
+      return this.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
         let proofAssertionUnifies = false;
 
         if (statementUnifies) {
@@ -277,7 +278,7 @@ export default define(class Supposition extends ProofAssertion {
           context.debug(`...unified the '${proofAssertionString}' proof assertion with the '${suppositionString}' supposition.`);
         }
 
-        continuation(proofAssertionUnifies);
+        return continuation(proofAssertionUnifies);
       });
     }, specificContext);
   }