occam-furtle 3.0.461 → 3.0.462

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

@@ -38,7 +38,7 @@ export default define(class Terms extends Element {
 
   forEachTerm(callback) { this.array.forEach(callback); }
 
-  evaluate(context) {
+  evaluate(context, back,  forwarsd) {
     const valuesArray = this.mapTerm((term) => {
             const value = term.evaluate(context);
 
@@ -55,7 +55,7 @@ export default define(class Terms extends Element {
     const { Values } = elements,
           values = new Values(context, string, node, breakPoint, array);
 
-    return values;
+    return forwarsd(values);
   }
 
   static name = "Terms";

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

@@ -36,7 +36,7 @@ export default define(class Values extends Element {
 
   forEachValue(callback) { this.array.forEach(callback); }
 
-  evaluate(context) {
+  evaluate(context, back, forward) {
     const valuesArray = this.mapValue((value) => {
             value = value.evaluate(context);
 
@@ -52,7 +52,7 @@ export default define(class Values extends Element {
 
     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) {