occam-nominal 1.0.307 → 1.0.310

package/src/element/assertion/contained.js

@@ -164,9 +164,7 @@ export default define(class ContainedAssertion extends Assertion {
 
       context.debug(`The '${frameString}' frame is not singular.`);
 
-      continuation(frameValidates);
-
-      return;
+      return continuation(frameValidates);
     }
 
     this.frame.validate(context, (frame) => {
@@ -212,9 +210,7 @@ export default define(class ContainedAssertion extends Assertion {
     if (!stated) {
       const validatesWhenStated = false;
 
-      continuation(validatesWhenStated);
-
-      return;
+      return continuation(validatesWhenStated);
     }
 
     let validatesWhenStated;
@@ -229,7 +225,7 @@ export default define(class ContainedAssertion extends Assertion {
       context.debug(`...validated the '${containedAssertionString}' stated contained assertion.`);
     }
 
-    continuation(validatesWhenStated);
+    return continuation(validatesWhenStated);
   }
 
   validateWhenDerived(context, continuation) {
@@ -238,9 +234,7 @@ export default define(class ContainedAssertion extends Assertion {
     if (stated) {
       const validatesWhenDerived = false;
 
-      continuation(validatesWhenDerived);
-
-      return;
+      return continuation(validatesWhenDerived);
     }
 
     const containedAssertionString = this.getString(); ///

package/src/element/assertion/subproof.js

@@ -65,9 +65,7 @@ export default define(class SubproofAssertion extends Assertion {
 
       context.debug(`...the '${subproofAssertionString}' subproof assertion is already valid.`);
 
-      continuation(subproofAssertion);
-
-      return;
+      return continuation(subproofAssertion);
     }
 
     let subproofAssertion = null;
@@ -91,12 +89,12 @@ export default define(class SubproofAssertion extends Assertion {
         context.debug(`...validated the '${subproofAssertionString}' subproof assertion.`);
       }
 
-      continuation(subproofAssertion);
+      return continuation(subproofAssertion);
     });
   }
 
   validateStatements(context, continuation) {
-    every(this.statements, (statement, continuation) => {
+    return every(this.statements, (statement, continuation) => {
       descend((context) => {
         statement.validate(context, (statement) => {
           let statementValidates = false;
@@ -105,7 +103,7 @@ export default define(class SubproofAssertion extends Assertion {
             statementValidates = true;
           }
 
-          continuation(statementValidates);
+          return continuation(statementValidates);
         });
       }, context);
     }, continuation);
@@ -152,9 +150,7 @@ export default define(class SubproofAssertion extends Assertion {
       let subproofUnifies = false;
 
       if (!lastStepUnifies) {
-        continuation(subproofUnifies);
-
-        return;
+        return continuation(subproofUnifies);
       }
 
       const suppositions = subproof.getSuppositions();
@@ -168,7 +164,7 @@ export default define(class SubproofAssertion extends Assertion {
           context.debug(`...unified the '${subproofString}' subproof with the '${subproofAssertionString}' subproof assertion.`);
         }
 
-        continuation(subproofUnifies);
+        return continuation(subproofUnifies);
       });
     });
   }
@@ -201,7 +197,7 @@ export default define(class SubproofAssertion extends Assertion {
           context.debug(`...unified the '${lastStepString}' last step with the '${deducedStatementString}' deduced statement.`)
         }
 
-        continuation(lastStepUnifies);
+        return continuation(lastStepUnifies);
       });
     }, specificContext);
   }
@@ -266,7 +262,7 @@ export default define(class SubproofAssertion extends Assertion {
           context.debug(`...unified the '${suppositionString}' supposition with the '${supposedStatementString}' supposed statement.`)
         }
 
-        continuation(suppositionUnifies);
+        return continuation(suppositionUnifies);
       });
     }, specificContext);
   }
@@ -279,17 +275,15 @@ export default define(class SubproofAssertion extends Assertion {
     if (suppositionsLength !== supposedStatementsLength) {
       const suppositionsUnify = false;
 
-      continuation(suppositionsUnify);
-
-      return;
+      return continuation(suppositionsUnify);
     }
 
     let index = -1;
 
-    backwardsEvery(suppositions, (supposition, continuation) => {
+    return backwardsEvery(suppositions, (supposition, continuation) => {
       index++;
 
-      this.unifySupposition(supposition, index, generalContext, specificContext, continuation);
+      return this.unifySupposition(supposition, index, generalContext, specificContext, continuation);
     }, continuation);
   }
 

package/src/element/combinator/bracketed.js

@@ -22,7 +22,7 @@ export default define(class BracketedCombinator extends Combinator {
         context.debug(`...unified the '${statementString}' statement with the bracketed combinator.`);
       }
 
-      continuation(statementUnifies);
+      return continuation(statementUnifies);
     });
   }
 

package/src/element/combinator.js

@@ -95,7 +95,7 @@ export default define(class Combinator extends Element {
         context.debug(`...unified the '${statementString}' statement with the '${combinatorString}' combinator.`);
       }
 
-      continuation(statementUnifies);
+      return continuation(statementUnifies);
     });
   }
 

package/src/element/declaration/combinator.js

@@ -44,7 +44,7 @@ export default define(class CombinatorDeclaration extends Declaration {
         context.debug(`...verified the '${combinatorDeclarationString}' combinator declaration.`);
       }
 
-      continuation(verifies);
+      return continuation(verifies);
     });
   });
 
@@ -58,7 +58,7 @@ export default define(class CombinatorDeclaration extends Declaration {
         context.debug(`...verified the '${combinatorDeclarationString}' combinator declaration's combinator.`);
       }
 
-      continuation(combinatorVerifies);
+      return continuation(combinatorVerifies);
     });
   }
 

package/src/element/declaration/metavariable.js

@@ -49,7 +49,7 @@ export default define(class MetavariableDeclaration extends Declaration {
       context.debug(`...verified the '${metavariableDeclarationString}' metavariable declaration.`);
     }
 
-    continuation(verifies);
+    return continuation(verifies);
   });
 
   verifyMetaType(context) {

package/src/element/declaration/variable.js

@@ -59,7 +59,7 @@ export default define(class VariableDeclaration extends Declaration {
         context.debug(`...verified the '${variableDeclarationString}' variable declaration.`);
       }
 
-      continuation(verifies);
+      return continuation(verifies);
     });
   });
 
@@ -100,7 +100,7 @@ export default define(class VariableDeclaration extends Declaration {
       context.debug(`...verified the '${variableDeclarationString}' variable declaration's type.`);
     }
 
-    continuation(typeVerifies);
+    return continuation(typeVerifies);
   }
 
   verifyVariable(context, continuation) {
@@ -124,7 +124,7 @@ export default define(class VariableDeclaration extends Declaration {
       context.debug(`...verified the '${variableDeclarationString}' variable declaration's '${variableString}' variable.`);
     }
 
-    continuation(variableVerifies);
+    return continuation(variableVerifies);
   }
 
   static name = "VariableDeclaration";

package/src/element/deduction.js

@@ -44,9 +44,7 @@ export default define(class Deduction extends Element {
 
       context.debug(`Unable to verify the '${deductionString}' deduction because it is nonsense.`);
 
-      continuation(verifies);
-
-      return;
+      return continuation(verifies);
     }
 
     declare((context) => {
@@ -62,7 +60,7 @@ export default define(class Deduction extends Element {
             context.debug(`...verified the '${deductionString}' deduction.`);
           }
 
-          continuation(verifies);
+          return continuation(verifies);
         });
       }, context);
     }, context);
@@ -89,7 +87,7 @@ export default define(class Deduction extends Element {
           context.debug(`...validated the '${deductionString}' deduction.`);
         }
 
-        continuation(validates);
+        return continuation(validates);
       });
     }, context);
   }
@@ -158,7 +156,7 @@ export default define(class Deduction extends Element {
         context.debug(`...unified the '${statementString}' statement with the '${deductionString}' deduction's statement.`);
       }
 
-      continuation(statementUnifies);
+      return continuation(statementUnifies);
     });
   }
 

package/src/element/derivation.js

@@ -35,7 +35,7 @@ export default define(class Derivation extends Element {
   }
 
   verify(context, continuation) {
-    every(this.subproofOrProofAssertions, (subproofOrProofAssertion, continuation) => {
+    return every(this.subproofOrProofAssertions, (subproofOrProofAssertion, continuation) => {
       subproofOrProofAssertion.verify(context, (subproofOrProofAssertionVerifies) => {
         if (subproofOrProofAssertionVerifies) {
           context.assignAssignments();
@@ -43,7 +43,7 @@ export default define(class Derivation extends Element {
           context.addSubproofOrProofAssertion(subproofOrProofAssertion);
         }
 
-        continuation(subproofOrProofAssertionVerifies);
+        return continuation(subproofOrProofAssertionVerifies);
       });
     }, continuation);
   }

package/src/element/equality.js

@@ -227,9 +227,7 @@ export default define(class Equality extends Element {
     if (!stated) {
       const validatesWhenStated = false;
 
-      continuation(validatesWhenStated);
-
-      return;
+      return continuation(validatesWhenStated);
     }
 
     let validatesWhenStated;
@@ -244,7 +242,7 @@ export default define(class Equality extends Element {
       context.debug(`...validated the '${equalityString}' stated equality.`);
     }
 
-    continuation(validatesWhenStated);
+    return continuation(validatesWhenStated);
   }
 
   validateWhenDerived(context, continuation) {

package/src/element/frame.js

@@ -221,8 +221,8 @@ export default define(class Frame extends Element {
 
     const assumptions = [];
 
-    every(this.assumptions, (assumption) => {
-      this.validateAssumption(assumption, assumptions, context, continuation);
+    return every(this.assumptions, (assumption) => {
+      return this.validateAssumption(assumption, assumptions, context, continuation);
     }, (assumptionsValidate) => {
       if (assumptionsValidate) {
         this.assumptions = assumptions;
@@ -235,8 +235,8 @@ export default define(class Frame extends Element {
   }
 
   validatMetavariable(context, continuation) {
-    if (this.metavariable !== null) {
-      const metavariableValidates = true;
+    if (this.metavariable === null) {
+      const metavariableValidates = true; ///
 
       return continuation(metavariableValidates);
     }

package/src/element/goal.js

@@ -89,9 +89,7 @@ export default define(class Goal extends Element {
 
       context.debug(`...the '${goalString}' goal is already valid.`);
 
-      continuation(goal);
-
-      return;
+      return continuation(goal);
     }
 
     const validateStatement = this.validateStatement.bind(this),
@@ -104,9 +102,7 @@ export default define(class Goal extends Element {
       if (!validates) {
         const goal = null;
 
-        continuation(goal);
-
-        return;
+        return continuation(goal);
       }
 
       const validatesWhenStated = this.validateWhenStated.bind(this),
@@ -181,9 +177,7 @@ export default define(class Goal extends Element {
     if (!stated) {
       const validatesWhenStated = false;
 
-      continuation(validatesWhenStated);
-
-      return;
+      return continuation(validatesWhenStated);
     }
 
     let validatesWhenStated;
@@ -198,7 +192,7 @@ export default define(class Goal extends Element {
       context.debug(`...validated the '${goalString}' stated goal.`);
     }
 
-    continuation(validatesWhenStated);
+    return continuation(validatesWhenStated);
   }
 
   validateWhenDerived(context, continuation) {

package/src/element/judgement.js

@@ -167,8 +167,8 @@ export default define(class Judgement extends Element {
       return;
     }
 
-    const validateFrame = this.validateFrame.bind(this),
-          validateGoal = this.validateGoal.bind(this);
+    const validateGoal = this.validateGoal.bind(this),
+          validateFrame = this.validateFrame.bind(this);
 
     all([
       validateFrame,
@@ -256,9 +256,7 @@ export default define(class Judgement extends Element {
     if (!stated) {
       const validatesWhenStated = false;
 
-      continuation(validatesWhenStated);
-
-      return;
+      return continuation(validatesWhenStated);
     }
 
     let validatesWhenStated;
@@ -273,7 +271,7 @@ export default define(class Judgement extends Element {
       context.debug(`...validated the '${judgementString}' stated judgement.`);
     }
 
-    continuation(validatesWhenStated);
+    return continuation(validatesWhenStated);
   }
 
   validateWhenDerived(context, continuation) {

package/src/element/label.js

@@ -63,9 +63,7 @@ export default define(class Label extends Element {
 
       context.debug(`The '${labelString}' label is already present.`);
 
-      continuation(verifies);
-
-      return;
+      return continuation(verifies);
     }
 
     this.validate((validates) => {
@@ -79,7 +77,7 @@ export default define(class Label extends Element {
         context.debug(`...verified the '${labelString}' label.`);
       }
 
-      continuation(verifies);
+      return continuation(verifies);
     });
   }
 
@@ -103,7 +101,7 @@ export default define(class Label extends Element {
           context.debug(`...validated the '${labelString}' label.`);
         }
 
-        continuation(validates);
+        return continuation(validates);
       });
     }, context);
   }
@@ -126,7 +124,7 @@ export default define(class Label extends Element {
         context.debug(`...validated the '${labelString}' label's metavariable.'`);
       }
 
-      continuation(metavariableValidates);
+      return continuation(metavariableValidates);
     });
   }