occam-nominal 1.0.310 → 1.0.317

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-nominal",
   "author": "James Smith",
-  "version": "1.0.310",
+  "version": "1.0.317",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-nominal",
   "description": "Occam's Nominal language.",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "necessary": "^17.5.2",
-    "occam-furtle": "^3.0.403",
+    "occam-furtle": "^3.0.405",
     "occam-grammar-utilities": "^8.1.17",
     "occam-languages": "^2.1.33",
     "occam-query": "^4.1.198"

package/src/context/liminal.js

@@ -1,12 +1,14 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
+import { continuationUtilities } from "occam-languages";
 import { metavariableNodesFromDerivedSubstitutions } from "../utilities/substitutions";
 
 import Context from "../context";
 import elements from "../elements";
 
-const { push, find, first } = arrayUtilities;
+const { forEach } = continuationUtilities,
+      { push, find, first } = arrayUtilities;
 
 export default class LiminalContext extends Context {
   constructor(context, derivedSubstitutions) {
@@ -86,23 +88,25 @@ export default class LiminalContext extends Context {
     });
   }
 
-  resolveDerivedSubstitutions() {
+  resolveDerivedSubstitutions(continuation) {
     const context = this, ///
           derivedSubstitutions = this.getDerivedSubstitutions(),
           metavariableNodes = metavariableNodesFromDerivedSubstitutions(derivedSubstitutions);
 
-    metavariableNodes.forEach((metavariableNode) => {
+    return forEach(metavariableNodes, (metavariableNode, continuation) => {
       const complexDerivedSubstitutions = this.findComplexDerivedSubstitutionsByMetavariableNode(metavariableNode);
 
-      complexDerivedSubstitutions.forEach((complexDerivedSubstitution) => {
+      return forEach(complexDerivedSubstitutions, (complexDerivedSubstitution, continuation) => {
         const derivedSubstitution = complexDerivedSubstitution, ///
               resolved = derivedSubstitution.isResolved();
 
-        if (!resolved) {
-          derivedSubstitution.resolve(context);
+        if (resolved) {
+          return continuation();
         }
-      });
-    });
+
+        return derivedSubstitution.resolve(context, continuation);
+      }, continuation);
+    }, continuation);
   }
 
   areDerivedSubstitutionsResolved() {
@@ -238,16 +242,14 @@ export default class LiminalContext extends Context {
     return complexDerivedSubstitution;
   }
 
-  findDerivedSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution) {
-    const substitutionA = substitution, ///
-          derivedSubstitution = this.findDerivedSubstitution((derivedSubstitution) => {  ///
+  findDerivedSubstitutionByMetavariableNodeAndSubstitutionNode(metavariableNode, substitutionNode) {
+    const derivedSubstitution = this.findDerivedSubstitution((derivedSubstitution) => {  ///
             const metavariableNodeMatches = derivedSubstitution.matchMetavariableNode(metavariableNode);
 
             if (metavariableNodeMatches) {
-              const substitutionB = derivedSubstitution, ///
-                    substitutionBEqualToSubstitutionA = substitutionB.isEqualTo(substitutionA);
+              const substitutionNodeMatches = derivedSubstitution.matchSubstitutionNode(substitutionNode);
 
-              if (substitutionBEqualToSubstitutionA) {
+              if (substitutionNodeMatches) {
                 return true;
               }
             }
@@ -263,8 +265,8 @@ export default class LiminalContext extends Context {
     return derivedSubstitutionPresent;
   }
 
-  isDerivedSubstitutionPresentByMetavariableNodeAndSubstitution(metavariableNode, substitution) {
-    const derivedSubstitution = this.findDerivedSubstitutionByMetavariableNodeAndSubstitution(metavariableNode, substitution),
+  isDerivedSubstitutionPresentByMetavariableNodeAndSubstitutionNode(metavariableNode, substitutionNode) {
+    const derivedSubstitution = this.findDerivedSubstitutionByMetavariableNodeAndSubstitutionNode(metavariableNode, substitutionNode),
           derivedSubstitutionPresent = (derivedSubstitution !== null);
 
     return derivedSubstitutionPresent;

package/src/context/phaneric.js

@@ -6,7 +6,7 @@ import Context from "../context";
 
 import { EMPTY_STRING } from "../constants";
 
-const { last } = arrayUtilities;
+const { first } = arrayUtilities;
 
 export default class PhanericContext extends Context {
   constructor(context, contexts) {
@@ -34,8 +34,8 @@ export default class PhanericContext extends Context {
   }
 
   static fromContexts(contexts) {
-    const lastContext = last(contexts),
-          context = lastContext,  ///
+    const firstContext = first(contexts),
+          context = firstContext,  ///
           phanericContext = new PhanericContext(context, contexts);
 
     return phanericContext;

package/src/context.js

@@ -547,9 +547,9 @@ export default class Context extends ContextBase {
     return derivedSubstitutionPresent;
   }
 
-  isDerivedSubstitutionPresentByMetavariableNodeAndSubstitution(metavariableNode, substitution) {
+  isDerivedSubstitutionPresentByMetavariableNodeAndSubstitutionNode(metavariableNode, substitutionNode) {
     const context = this.getContext(),
-          derivedSubstitutionPresent = context.isDerivedSubstitutionPresentByMetavariableNodeAndSubstitution(metavariableNode, substitution);
+          derivedSubstitutionPresent = context.isDerivedSubstitutionPresentByMetavariableNodeAndSubstitutionNode(metavariableNode, substitutionNode);
 
     return derivedSubstitutionPresent;
   }

package/src/element/assertion/contained.js

@@ -69,7 +69,7 @@ export default define(class ContainedAssertion extends Assertion {
           validateFrame = this.validateFrame.bind(this),
           validateStatement = this.validateStatement.bind(this);
 
-    all([
+    return all([
       validateTerm,
       validateFrame,
       validateStatement
@@ -83,7 +83,7 @@ export default define(class ContainedAssertion extends Assertion {
       const validatesWhenStated = this.validateWhenStated.bind(this),
             validatesWhenDerived = this.validateWhenDerived.bind(this);
 
-      exists([
+      return exists([
         validatesWhenStated,
         validatesWhenDerived
       ], context, (validates) => {
@@ -180,7 +180,7 @@ export default define(class ContainedAssertion extends Assertion {
         context.debug(`...validates the'${continaedAssertionString}' continaed assertion's '${frameString}' frame.`);
       }
 
-      continuation(frameValidates);
+      return continuation(frameValidates);
     });
   }
 
@@ -200,7 +200,7 @@ export default define(class ContainedAssertion extends Assertion {
         context.debug(`...validated the '${statementString}' statement.`);
       }
 
-      continuation(statementValidates);
+      return continuation(statementValidates);
     });
   }
 
@@ -241,18 +241,16 @@ export default define(class ContainedAssertion extends Assertion {
 
     context.trace(`Validating the '${containedAssertionString}' derived contained assertion...`);
 
-    validateWhenDerived(this.term, this.frame, this.statement, this.negated, context, (validatesWhenDerived) => {
+    return validateWhenDerived(this.term, this.frame, this.statement, this.negated, context, (validatesWhenDerived) => {
       if (validatesWhenDerived) {
         context.debug(`...validated the '${containedAssertionString}' derived contained assertion.`);
       }
 
-      continuation(validatesWhenDerived);
+      return continuation(validatesWhenDerived);
     });
   }
 
   unifyIndependently(generalContext, specificContext, continuation) {
-    let unifiesIndependently = false;
-
     const context = specificContext,  ///
           containedAssertionString = this.getString(); ///
 
@@ -260,18 +258,21 @@ export default define(class ContainedAssertion extends Assertion {
 
     const term = termFromTermAndSubstitutions(this.term, context),
           frame = frameFromFrameAndSubstitutions(this.frame, context),
-          statement = statementFromStatementAndSubstitutions(this.statement, context),
-          validatesWhenDerived = validateWhenDerived(term, frame, statement, this.negated, context);
+          statement = statementFromStatementAndSubstitutions(this.statement, context);
 
-    if (validatesWhenDerived) {
-      unifiesIndependently = true;
-    }
+    return validateWhenDerived(term, frame, statement, this.negated, context, (validatesWhenDerived) => {
+      let unifiesIndependently = false;
 
-    if (unifiesIndependently) {
-      context.debug(`...unified the '${containedAssertionString}' contained assertion independently.`);
-    }
+      if (validatesWhenDerived) {
+        unifiesIndependently = true;
+      }
 
-    return unifiesIndependently;
+      if (unifiesIndependently) {
+        context.debug(`...unified the '${containedAssertionString}' contained assertion independently.`);
+      }
+
+      return continuation(unifiesIndependently);
+    });
   }
 
   static name = "ContainedAssertion";
@@ -338,5 +339,5 @@ function validateWhenDerived(term, frame, statement, negated, context, continuat
     }
   }
 
-  continuation(validatesWhenDerived);
+  return continuation(validatesWhenDerived);
 }

package/src/element/assertion/defined.js

@@ -60,7 +60,7 @@ export default define(class DefinedAssertion extends Assertion {
     const validateTerm = this.validateTerm.bind(this),
           validateFrame = this.validateFrame.bind(this);
 
-    all([
+    return all([
       validateTerm,
       validateFrame
     ], context, (validaets) => {
@@ -73,7 +73,7 @@ export default define(class DefinedAssertion extends Assertion {
       const validatesWhenStated = this.validateWhenStated.bind(this),
             validatesWhenDerived = this.validateWhenDerived.bind(this);
 
-      exists([
+      return exists([
         validatesWhenStated,
         validatesWhenDerived
       ], context, (validates) => {
@@ -211,36 +211,37 @@ export default define(class DefinedAssertion extends Assertion {
 
     context.trace(`Validating the '${definedAssertionString}' derived defined assertion...`);
 
-    validateWhenDerived(this.term, this.frame, this.negated, context, (validatesWhenDerived) => {
+    return validateWhenDerived(this.term, this.frame, this.negated, context, (validatesWhenDerived) => {
       if (validatesWhenDerived) {
         context.debug(`...validates the '${definedAssertionString}' derived defined assertion.`);
       }
 
-      continuation(validatesWhenDerived);
+      return continuation(validatesWhenDerived);
     });
   }
 
   unifyIndependently(generalContext, specificContext, continuation) {
-    let unifiesIndependently = false;
-
     const context = specificContext, ///
           definedAssertionString = this.getString(); ///
 
     context.trace(`Unifying the '${definedAssertionString}' defined assertion independently...`);
 
     const term = termFromTermAndSubstitutions(this.term, context),
-          frame = frameFromFrameAndSubstitutions(this.frame, context),
-          validatesWhenDerived = validateWhenDerived(term, frame, this.negated, context);
+          frame = frameFromFrameAndSubstitutions(this.frame, context);
 
-    if (validatesWhenDerived) {
-      unifiesIndependently = true;
-    }
+    return validateWhenDerived(term, frame, this.negated, context, (validatesWhenDerived) => {
+      let unifiesIndependently = false;
 
-    if (unifiesIndependently) {
-      context.debug(`...unified the '${definedAssertionString}' defined assertion independently.`);
-    }
+      if (validatesWhenDerived) {
+        unifiesIndependently = true;
+      }
+
+      if (unifiesIndependently) {
+        context.debug(`...unified the '${definedAssertionString}' defined assertion independently.`);
+      }
 
-    return unifiesIndependently;
+      return continuation(unifiesIndependently);
+    });
   }
 
   static name = "DefinedAssertion";
@@ -342,4 +343,3 @@ function validateWhenDerived(term, frame, negated, context, continuation) {
 
   continuation(validatesWhenDerived);
 }
-

package/src/element/conclusion.js

@@ -44,14 +44,12 @@ export default define(class Conclusion extends Element {
 
       context.debug(`Unable to verify the '${conclusionString}' conclusion because it is nonsense.`);
 
-      continuation(verifies);
-
-      return;
+      return continuation(verifies);
     }
 
     declare((context) => {
       elide((context) => {
-        this.validate(context, (validates) => {
+        return this.validate(context, (validates) => {
           let verifies = false;
 
           if (validates) {
@@ -62,7 +60,7 @@ export default define(class Conclusion extends Element {
             context.debug(`...verified the '${conclusionString}' conclusion.`);
           }
 
-          continuation(verifies);
+          return continuation(verifies);
         });
       }, context);
     }, context);
@@ -74,7 +72,7 @@ export default define(class Conclusion extends Element {
     context.trace(`Validating the '${conclusionString}' conclusion...`);
 
     attempt((context) => {
-      this.validateStatement(context, (statementValidates) => {
+      return this.validateStatement(context, (statementValidates) => {
         let validates = false;
 
         if (statementValidates) {
@@ -89,7 +87,7 @@ export default define(class Conclusion extends Element {
           context.debug(`...validated the '${conclusionString}' conclusion.`);
         }
 
-        continuation(validates);
+        return continuation(validates);
       });
     }, context);
   }
@@ -99,7 +97,7 @@ export default define(class Conclusion extends Element {
 
     context.trace(`Validating the '${conclusionString}' conclusion's statement...`);
 
-    this.statement.validate(context, (statement) => {
+    return this.statement.validate(context, (statement) => {
       let statementValidates = false;
 
       if (statement !== null) {
@@ -110,7 +108,7 @@ export default define(class Conclusion extends Element {
         context.trace(`...validated the '${conclusionString}' conclusion's statement.`);
       }
 
-      continuation(statementValidates);
+      return continuation(statementValidates);
     });
   }
 
@@ -128,7 +126,7 @@ export default define(class Conclusion extends Element {
     reconcile((specificContext) => {
       const statement = step.getStatement();
 
-      this.statement.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
+      return this.statement.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
         let stepUnifies = false;
 
         if (statementUnifies) {
@@ -141,7 +139,7 @@ export default define(class Conclusion extends Element {
           context.debug(`...unified the '${stepString}' step with the '${conclusionString}' conclusion.`);
         }
 
-        continuation(stepUnifies);
+        return continuation(stepUnifies);
       });
     }, specificContext);
   }

package/src/element/declaration/variable.js

@@ -45,7 +45,7 @@ export default define(class VariableDeclaration extends Declaration {
     const typeVerifies = this.verifyType.bind(this),
           variableVerifies = this.verifyVariable.bind(this);
 
-    all([
+    return all([
       typeVerifies,
       variableVerifies
     ],  context, (verifies) => {

package/src/element/deduction.js

@@ -72,7 +72,7 @@ export default define(class Deduction extends Element {
     context.trace(`Validating the '${deductionString}' deduction...`);
 
     attempt((context) => {
-      this.validateStatement(context, (statementValidates) => {
+      return this.validateStatement(context, (statementValidates) => {
         let validates = false;
 
         if (statementValidates) {
@@ -97,7 +97,7 @@ export default define(class Deduction extends Element {
 
     context.trace(`Validating the '${deductionString}' deduction's statement...`);
 
-    this.statement.validate(context, (statement) => {
+    return this.statement.validate(context, (statement) => {
       let statementValidates = false;
 
       if (statement !== null) {
@@ -108,7 +108,7 @@ export default define(class Deduction extends Element {
         context.trace(`...validated the '${deductionString}' deduction's statement.`);
       }
 
-      continuation(statementValidates);
+      return continuation(statementValidates);
     });
   }
 
@@ -126,7 +126,7 @@ export default define(class Deduction extends Element {
     reconcile((specificContext) => {
       const statement = step.getStatement();
 
-      this.statement.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
+      return this.statement.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
         let stepUnifies = false;
 
         if (statementUnifies) {
@@ -139,7 +139,7 @@ export default define(class Deduction extends Element {
           context.debug(`...unified the '${stepString}' step with the '${deductionString}' deduction.`);
         }
 
-        continuation(stepUnifies);
+        return continuation(stepUnifies);
       });
     }, specificContext);
   }
@@ -151,7 +151,7 @@ export default define(class Deduction extends Element {
 
     context.trace(`Unifying the '${statementString}' statement with the '${deductionString}' deduction's statement...`);
 
-    this.statement.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
+    return this.statement.unifyStatement(statement, generalContext, specificContext, (statementUnifies) => {
       if (statementUnifies) {
         context.debug(`...unified the '${statementString}' statement with the '${deductionString}' deduction's statement.`);
       }

package/src/element/equality.js

@@ -150,7 +150,7 @@ export default define(class Equality extends Element {
       const validatesWhenStated = this.validateWhenStated.bind(this),
             validatesWhenDerived = this.validateWhenDerived.bind(this);
 
-      exists([
+      return exists([
         validatesWhenStated,
         validatesWhenDerived
       ], context, (validates) => {
@@ -168,7 +168,7 @@ export default define(class Equality extends Element {
           context.debug(`...validated the '${equalityString}' equality.`);
         }
 
-        continuation(equqlity);
+        return continuation(equqlity);
       });
     });
   }

package/src/element/frame.js

@@ -157,7 +157,7 @@ export default define(class Frame extends Element {
     const validatMetavariable = this.validatMetavariable.bind(this),
           validateAssumptions = this.validateAssumptions.bind(this);
 
-    all([
+    return all([
       validatMetavariable,
       validateAssumptions
     ], context, (validates) => {
@@ -170,7 +170,7 @@ export default define(class Frame extends Element {
       const validatesWhenStated = this.validateWhenStated.bind(this),
             validatesWhenDerived = this.validateWhenDerived.bind(this);
 
-      exists([
+      return exists([
         validatesWhenStated,
         validatesWhenDerived
       ], context, (validates) => {
@@ -215,6 +215,14 @@ export default define(class Frame extends Element {
   }
 
   validateAssumptions(context, continuation) {
+    const assumptionsLength = this.assumptions.length;
+
+    if (assumptionsLength === 0) {
+      const assumptionsValidate = true;
+
+      return continuation(assumptionsValidate);
+    }
+
     const frameString = this.getString();
 
     context.trace(`Validating the '${frameString}' frame's assumptions...`);

package/src/element/goal.js

@@ -95,7 +95,7 @@ export default define(class Goal extends Element {
     const validateStatement = this.validateStatement.bind(this),
           validateReference = this.validateReference.bind(this);
 
-    all([
+    return all([
       validateReference,
       validateStatement
     ], context, (validates) => {
@@ -108,7 +108,7 @@ export default define(class Goal extends Element {
       const validatesWhenStated = this.validateWhenStated.bind(this),
             validatesWhenDerived = this.validateWhenDerived.bind(this);
 
-      exists([
+      return exists([
         validatesWhenStated,
         validatesWhenDerived
       ], context, (validates) => {
@@ -124,7 +124,7 @@ export default define(class Goal extends Element {
           context.debug(`...validated the '${goalString}' goal.`);
         }
 
-        continuation(goal);
+        return continuation(goal);
       });
     });
   }
@@ -147,7 +147,7 @@ export default define(class Goal extends Element {
         context.debug(`...validated the '${goalString}' goal's reference.`);
       }
 
-      continuation(referenceValidates);
+      return continuation(referenceValidates);
     });
   }
 
@@ -167,7 +167,7 @@ export default define(class Goal extends Element {
         context.debug(`...validated the '${goalString}' goal's statement.`);
       }
 
-      continuation(statementValidates);
+      return continuation(statementValidates);
     });
   }
 
@@ -201,9 +201,7 @@ export default define(class Goal extends Element {
     if (stated) {
       const validatesWhenDerived = false;
 
-      continuation(validatesWhenDerived);
-
-      return;
+      return continuation(validatesWhenDerived);
     }
 
     let validatesWhenDerived = false;

package/src/element/judgement.js

@@ -162,30 +162,26 @@ export default define(class Judgement extends Element {
 
       context.debug(`...the '${judgementString}' judgement is already valid.`);
 
-      continuation(judgement);
-
-      return;
+      return continuation(judgement);
     }
 
     const validateGoal = this.validateGoal.bind(this),
           validateFrame = this.validateFrame.bind(this);
 
-    all([
+    return all([
       validateFrame,
       validateGoal
     ], context, (validates) => {
       if (!validates) {
         const judgement = null;
 
-        continuation(judgement);
-
-        return;
+        return continuation(judgement);
       }
 
       const validateWhenStated = this.validateWhenStated.bind(this),
             validateWhenDerived = this.validateWhenDerived.bind(this);
 
-      exists([
+      return exists([
         validateWhenStated,
         validateWhenDerived
       ], context, (validates) => {
@@ -201,7 +197,7 @@ export default define(class Judgement extends Element {
           context.debug(`...validated the '${judgementString}' judgement.`);
         }
 
-        continuation(judgement);
+        return continuation(judgement);
       });
     });
   }
@@ -224,7 +220,7 @@ export default define(class Judgement extends Element {
         context.debug(`...validated the '${judgementString}' judgement's goal.`);
       }
 
-      continuation(goalValidates);
+      return continuation(goalValidates);
     });
   }
 
@@ -246,7 +242,7 @@ export default define(class Judgement extends Element {
         context.trace(`...validated the '${judgementString}' judgement's frame.`);
       }
 
-      continuation(frameValidates);
+      return continuation(frameValidates);
     });
   }