occam-furtle 3.0.461 → 3.0.464

package/src/element/procedureCall.js

@@ -39,21 +39,22 @@ export default define(class ProcedureCall extends Element {
       const message = `The '${procedureCallString}' function is not present.'`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
-    const procedure = context.findProcedureByProcedureName(procedureName),
-          values = this.values.evaluate(context);
+    const procedure = context.findProcedureByProcedureName(procedureName);
 
-    return free((context) => {
-      return procedure.call(values, context, back, (value) => {
-        const valueString = value.getString();
+    return this.values.evaluate(context, back, (values) => {
+      return free((context) => {
+        return procedure.call(values, context, back, (value) => {
+          const valueString = value.getString();
 
-        context.debug(`...evaluated the '${procedureCallString}' function call as '${valueString}'.`);
+          context.debug(`...evaluated the '${procedureCallString}' function call as '${valueString}'.`);
 
-        return forward(value);
-      });
-    }, context);
+          return forward(value);
+        });
+      }, context);
+    });
   });
 
   static name = "ProcedureCall";

package/src/element/reduce.js

@@ -47,7 +47,7 @@ export default define(class Reduce extends Element {
             message = `The '${valueString}' value's '${valueType}' type should be '${LIST_TYPE_NAME}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     const primitiveValue = value.getPrimitiveValue(),
@@ -68,7 +68,7 @@ export default define(class Reduce extends Element {
       values.addValue(value);
 
       return this.anonymousProcedure.call(values, context, back, forward);
-    }, inivialValue, (value) => {
+    }, inivialValue, back, (value) => {
       const valueString = value.getString();
 
       context.trace(`...evaluated the '${reduceString}' reduce as '${valueString}'.`);

package/src/element/returnBlock.js

@@ -39,7 +39,7 @@ export default define(class ReturnBlock extends Element {
       const message = `The return block is nonsensical.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     return confine((context) => {

package/src/element/returnStatement.js

@@ -15,7 +15,7 @@ export default define(class ReturnStatement extends Element {
     return this.value;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const returnStatementString = this.getString();  ///
@@ -28,7 +28,7 @@ export default define(class ReturnStatement extends Element {
 
     context.debug(`...evaluated the '${returnStatementString}' return statement as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "ReturnStatement";

package/src/element/some.js

@@ -42,7 +42,7 @@ export default define(class Some extends Element {
             message = `The '${valueString}' value's '${valueType}' type should be '${LIST_TYPE_NAME}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     const primitiveValue = value.getPrimitiveValue(),
@@ -62,7 +62,7 @@ export default define(class Some extends Element {
                 message = `The '${valueString}' value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE_NAME}'.`,
                 exception = Exception.fromMessage(message);
 
-          throw exception;
+          return back(exception);
         }
 
         const primitiveValue = value.getPrimitiveValue(),

package/src/element/startsWith.js

@@ -24,7 +24,7 @@ export default define(class StartsWith extends Element {
     return this.substring;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const startsWithString = this.getString();  ///
@@ -41,7 +41,7 @@ export default define(class StartsWith extends Element {
             message = `The '${valueString}' value's '${valueType}' type should be '${STRING_TYPE_NAME}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     const string = value.getString(),
@@ -53,7 +53,7 @@ export default define(class StartsWith extends Element {
 
     context.debug(`...evaluated the '${startsWithString}' function as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "StartsWith";

package/src/element/term/bracketed.js

@@ -17,7 +17,7 @@ export default define(class BracketedTerm extends Element {
 
   getType() { return this.term.getType(); }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const bracketedTermString = this.getString(); ///
@@ -30,7 +30,7 @@ export default define(class BracketedTerm extends Element {
 
     context.debug(`...evaluated the '${bracketedTermString}' bracketed term as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "BracketedTerm";

package/src/element/term/comparison.js

@@ -28,7 +28,7 @@ export default define(class ComparisonTerm extends Element {
     return this.rightTerm;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const comparisonTermString = this.getString(); ///
@@ -49,7 +49,7 @@ export default define(class ComparisonTerm extends Element {
             message = `The '${leftValueString}' left term's type is '${leftValueTypeString}' whereas the '${rightValueString}' right term's type is '${rightValueTypeString}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     const leftValueEqualToRightValue = leftValue.isEqualTo(rightValue);
@@ -66,7 +66,7 @@ export default define(class ComparisonTerm extends Element {
 
     context.debug(`...evaluated the '${comparisonTermString}' comparison value as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "ComparisonTerm";

package/src/element/term/logical.js

@@ -34,7 +34,7 @@ export default define(class LogicalTerm extends Element {
     return this.rightTerm;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const logicalTermString = this.getString(); ///
@@ -53,7 +53,7 @@ export default define(class LogicalTerm extends Element {
             message = `The '${leftValueString}' left term's type is '${leftValueType}' when it should be of type '${BOOLEAN_TYPE_NAME}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     if (!rightValueTypeBooleanType) {
@@ -61,7 +61,7 @@ export default define(class LogicalTerm extends Element {
             message = `The '${rightValueString}' right term's type is '${rightValueType}' when it should be of type '${BOOLEAN_TYPE_NAME}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     const leftValuePrimitiveValue = leftValue.getPrimitiveValue(),
@@ -78,7 +78,7 @@ export default define(class LogicalTerm extends Element {
 
     context.debug(`...evaluated the '${logicalTermString}' logical value as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "LogicalTerm";

package/src/element/term/negated.js

@@ -24,7 +24,7 @@ export default define(class NegatedTerm extends Element {
     return this.term;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const negatedTermString = this.getString(); ///
@@ -41,7 +41,7 @@ export default define(class NegatedTerm extends Element {
             message = `The '${valueString}' left value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE_NAME}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     let boolean;
@@ -58,7 +58,7 @@ export default define(class NegatedTerm extends Element {
 
     context.debug(`...evaluated the '${negatedTermString}' negated value as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "NegatedTerm";

package/src/element/term.js

@@ -76,26 +76,22 @@ export default define(class Term extends Element {
     return boolean;
   }
 
-  evaluate(context) {
-    let value;
-
+  evaluate(context, back, forward) {
     if (false) {
       ///
     } else if (this.variable !== null) {
-      value = this.variable.evaluate(context);
+      return this.variable.evaluate(context, back, forward);
     } else if (this.primitive !== null) {
-      value = this.primitive.evaluate(context);
+      return this.primitive.evaluate(context, back, forward);
     } else if (this.negatedTerm !== null) {
-      value = this.negatedTerm.evaluate(context);
+      return this.negatedTerm.evaluate(context, back, forward);
     } else if (this.logicalTerm !== null) {
-      value = this.logicalTerm.evaluate(context);
+      return this.logicalTerm.evaluate(context, back, forward);
     } else if (this.bracketedTerm !== null) {
-      value = this.bracketedTerm.evaluate(context);
+      return this.bracketedTerm.evaluate(context, back, forward);
     } else if (this.comparisonTerm !== null) {
-      value = this.comparisonTerm.evaluate(context);
+      return this.comparisonTerm.evaluate(context, back, forward);
     }
-
-    return value;
   }
 
   isEqualTo(term) {

package/src/element/terms.js

@@ -1,12 +1,14 @@
 "use strict";
 
-import { Element } from "occam-languages";
+import { Element, continuationUtilities } from "occam-languages";
 
 import elements from "../elements";
 
 import { define } from "../elements";
 import { termsStringFromTermsArray, valuesStringFromValuesArray } from "../utilities/string";
 
+const { map } = continuationUtilities;
+
 export default define(class Terms extends Element {
   constructor(context, string, node, breakPoint, array) {
     super(context, string, node, breakPoint);
@@ -34,28 +36,27 @@ export default define(class Terms extends Element {
     this.array.push(term);
   }
 
-  mapTerm(callback) { return this.array.map(callback); }
-
-  forEachTerm(callback) { this.array.forEach(callback); }
+  mapTerm(callback, back, forward) {
+    return map(this.array, callback, back, forward);
+  }
 
-  evaluate(context) {
-    const valuesArray = this.mapTerm((term) => {
-            const value = term.evaluate(context);
+  evaluate(context, back, forwarsd) {
+    return this.mapTerm((term, back, forward) => {
+      return term.evaluate(context, back, forward);
+    }, back, (valuesArray) => {
+      const valuesString = valuesStringFromValuesArray(valuesArray, context),
+            string = valuesString, ///
+            array = valuesArray, ///
+            node = null,
+            breakPoint = null;
 
-            return value;
-          }),
-          valuesString = valuesStringFromValuesArray(valuesArray, context),
-          string = valuesString, ///
-          array = valuesArray, ///
-          node = null,
-          breakPoint = null;
-
-    context = null;
+      context = null;
 
-    const { Values } = elements,
-          values = new Values(context, string, node, breakPoint, array);
+      const { Values } = elements,
+            values = new Values(context, string, node, breakPoint, array);
 
-    return values;
+      return forwarsd(values);
+    });
   }
 
   static name = "Terms";

package/src/element/ternary.js

@@ -42,7 +42,7 @@ export default define(class Ternary extends Element {
             message = `The '${valueString}' value's type is '${valueType}' when it should be of type '${BOOLEAN_TYPE_NAME}'.`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     const primitiveValue = value.getPrimitiveValue(),

package/src/element/toInteger.js

@@ -20,7 +20,7 @@ export default define(class ToInteger extends Element {
     return this.variable;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const toIntegerString = this.getString();  ///
@@ -41,7 +41,7 @@ export default define(class ToInteger extends Element {
         const message = `Cannot evaluate the '${toIntegerString}' function because the '${valueTypeName}' type of its argument is not supported.`,
               exception = Exception.fromMessage(message);
 
-        throw exception;
+        return back(exception);
       }
 
       case STRING_TYPE_NAME:
@@ -53,7 +53,7 @@ export default define(class ToInteger extends Element {
           const message = `Cannot evaluate the '${toIntegerString}' function because the '${valueTypeName}' value is not an integer.`,
                 exception = Exception.fromMessage(message);
 
-          throw exception;
+          return back(exception);
         }
 
         integer = Number(valueString);
@@ -68,7 +68,7 @@ export default define(class ToInteger extends Element {
 
     context.debug(`...evaluated the '${toIntegerString}' function as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "ToInteger";

package/src/element/tryInteger.js

@@ -21,7 +21,7 @@ export default define(class TryInteger extends Element {
     return this.variable;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     let value;
 
     const tryIntegerString = this.getString();  ///
@@ -42,7 +42,7 @@ export default define(class TryInteger extends Element {
         const message = `Cannot evaluate the '${tryIntegerString}' function because the '${valueTypeName}' type of its argument is not supported.`,
               exception = Exception.fromMessage(message);
 
-        throw exception;
+        return back(exception);
       }
 
       case STRING_TYPE_NAME:
@@ -61,7 +61,7 @@ export default define(class TryInteger extends Element {
 
     context.debug(`...evaluated the '${tryIntegerString}' function as '${valueString}'.`);
 
-    return value;
+    return forward(value);
   }
 
   static name = "TryInteger";

package/src/element/value.js

@@ -50,18 +50,14 @@ export default define(class Value extends Element {
     return boolean;
   }
 
-  evaluate(context) {
-    let value;
-
+  evaluate(context, back, forward) {
     if (false) {
       ///
     } else if (this.variable !== null) {
-      value = this.variable.evaluate(context);
+      return this.variable.evaluate(context, back, forward);
     } else if (this.primitive !== null) {
-      value = this.primitive.evaluate(context);
+      return this.primitive.evaluate(context, back, forward);
     }
-
-    return value;
   }
 
   isEqualTo(value) {

package/src/element/values.js

@@ -1,10 +1,12 @@
 "use strict";
 
-import { Element } from "occam-languages";
+import { Element, continuationUtilities } from "occam-languages";
 
 import { define } from "../elements";
 import { valuesStringFromValuesArray } from "../utilities/string";
 
+const { map, forEach } = continuationUtilities;
+
 export default define(class Values extends Element {
   constructor(context, string, node, breakPoint, array) {
     super(context, string, node, breakPoint);
@@ -32,27 +34,30 @@ export default define(class Values extends Element {
     this.array.push(value);
   }
 
-  mapValue(callback) { return this.array.map(callback); }
-
-  forEachValue(callback) { this.array.forEach(callback); }
+  mapValue(callback, back, forward) {
+    return map(this.array, callback, back, forward);
+  }
 
-  evaluate(context) {
-    const valuesArray = this.mapValue((value) => {
-            value = value.evaluate(context);
+  forEachValue(callback) {
+    this.array.forEach(callback);
+  }
 
-            return value;
-          }),
-          valuesString = valuesStringFromValuesArray(valuesArray, context),
-          string = valuesString, ///
-          array = valuesArray, ///
-          node = null,
-          breakPoint = null;
+  evaluate(context, back, forward) {
+    return this.mapValue((value, back, forward) => {
+      return value.evaluate(context, back, forward);
+    }, back, (valuesArray) => {
+      const valuesString = valuesStringFromValuesArray(valuesArray, context),
+            string = valuesString, ///
+            array = valuesArray, ///
+            node = null,
+            breakPoint = null;
 
-    context = null;
+      context = null;
 
-    const values = new Values(context, string, node, breakPoint, array);
+      const values = new Values(context, string, node, breakPoint, array);
 
-    return values;
+      return forward(values);
+    });
   }
 
   static name = "Values";

package/src/element/variable.js

@@ -34,7 +34,7 @@ export default define(class Variable extends Element {
     return comparesToVariableName;
   }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     const variableString = this.getString(); ///
 
     context.trace(`Evaluating the '${variableString}' variable...`);
@@ -47,7 +47,7 @@ export default define(class Variable extends Element {
       const message = `The '${variableString}' variable is not present.'`,
             exception = Exception.fromMessage(message);
 
-      throw exception;
+      return back(exception);
     }
 
     const variable = context.findVariableByVariableName(variableName),
@@ -56,7 +56,7 @@ export default define(class Variable extends Element {
 
     context.debug(`...evaluated the '${variableString}' variable as the '${valueString}' value.`);
 
-    return value;
+    return forward(value);
   }
 
   assign(value, context, back, forward) {

package/src/nominalValueProperties.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { continuationUtilities } from "occam-languages";
+
 import elements from "./elements";
 import Exception from "./exception";
 import NominalValueProperty from "./nominalValueProperty";
@@ -8,6 +10,8 @@ import { nominalValuePropertiesStringFromNominalValuePropertiesArray } from "./u
 import { LIST_TYPE_NAME, STRING_TYPE_NAME, BOOLEAN_TYPE_NAME, NOMINAL_VALUE_TYPE_NAME } from "./typeNames";
 import { CONTENT_PARAMETER_NAME, TERMINAL_PARAMETER_NAME, CHILD_NODES_PARAMETER_NAME, NO_WHITESPACE_PARAMETER_NAME } from "./parameterNames";
 
+const { some } = continuationUtilities;
+
 class NominalValueProperties {
   constructor(string, array) {
     this.string = string;
@@ -22,36 +26,36 @@ class NominalValueProperties {
     return this.array;
   }
 
-  someNominalValueProperty(callback) { return this.array.some(callback); }
+  someNominalValueProperty(callback, back, forward) {
+    return some(this.array, callback, back, forward);
+  }
 
-  compareNamedBinding(namedBinding, context) {
+  compareNamedBinding(namedBinding, context, back, forward) {
     const namedBindingString = namedBinding.getString(),
           nominalValuePropertiesString = this.string; ///
 
     context.trace(`Comparing the '${namedBindingString}' named binding with the '${nominalValuePropertiesString}' node properties...`);
 
-    const namedBindingsCompare = this.someNominalValueProperty((nominalValueProperty) => {
-      const namedBindingComparesToNominalValueProperty = nominalValueProperty.compareNamedBinding(namedBinding, context);
+    return this.someNominalValueProperty((nominalValueProperty, back, forward) => {
+      return nominalValueProperty.compareNamedBinding(namedBinding, context, back, forward);
+    }, back, (namedBindingsCompare) => {
+      if (!namedBindingsCompare) {
+        const message = `The '${namedBindingString}' named binding does not compmare to any of the '${nominalValuePropertiesString}' node properties.`,
+              exception = Exception.fromMessage(message);
 
-      if (namedBindingComparesToNominalValueProperty) {
-        return true;
+        return back(exception);
       }
-    });
 
-    if (!namedBindingsCompare) {
-      const message = `The '${namedBindingString}' named binding does not compmare to any of the '${nominalValuePropertiesString}' node properties.`,
-            exception = Exception.fromMessage(message);
+      context.debug(`...compared the '${namedBindingString}' named binding with the '${nominalValuePropertiesString}' node properties.`);
 
-      throw exception;
-    }
-
-    context.debug(`...compared the '${namedBindingString}' named binding with the '${nominalValuePropertiesString}' node properties.`);
+      return forward();
+    });
   }
 
-  compareNamedBindings(namedBindings, context) {
-    namedBindings.forEachNamedBinding((namedBinding) => {
-      this.compareNamedBinding(namedBinding, context);
-    });
+  compareNamedBindings(namedBindings, context, back, forward) {
+    return namedBindings.forEachNamedBinding((namedBinding, back, forward) => {
+      return this.compareNamedBinding(namedBinding, context, back, forward);
+    }, back, forward);
   }
 
   static fromNothing() {

package/src/nominalValueProperty.js

@@ -21,7 +21,7 @@ export default class NominalValueProperty {
     return this.name;
   }
 
-  compareNamedBinding(namedBinding, context) {
+  compareNamedBinding(namedBinding, context, back, forward) {
     let namedBindingCompares = false;
 
     const nominalValuePropertyString = this.string, ///
@@ -42,7 +42,7 @@ export default class NominalValueProperty {
       context.debug(`...compared the '${nominalValuePropertyString}' node property with the '${namedBindingString}' named binding.`);
     }
 
-    return namedBindingCompares;
+    return forward(namedBindingCompares);
   }
 
   static name = "Parameter";