occam-furtle 2.0.86 → 2.0.89

package/src/dom/value/bracketed.js

@@ -46,19 +46,25 @@ export default domAssigned(class BracketedValue {
     const valueBracketedValueNode = valueBracketedValueNodeQuery(valueNode);
 
     if (valueBracketedValueNode !== null) {
-      const { Value } = dom,
-            bracketedValueNode = valueBracketedValueNode, ///
-            valueNode = valueNodeQuery(bracketedValueNode),
-            value = Value.fromValueNode(valueNode, context),
-            string = stringFromValue(value, context);
+      const bracketedValueNode = valueBracketedValueNode; ///
 
-      bracketedValue = new BracketedValue(string, value);
+      bracketedValue = bracketedValueFromBracketedValueNode(bracketedValueNode, context);
     }
 
     return bracketedValue;
   }
 });
 
+function bracketedValueFromBracketedValueNode(bracketedValueNode, context) {
+  const { Value, BracketedValue } = dom,
+        valueNode = valueNodeQuery(bracketedValueNode),
+        value = Value.fromValueNode(valueNode, context),
+        string = stringFromValue(value, context),
+        bracketedValue = new BracketedValue(string, value);
+
+  return bracketedValue;
+}
+
 function stringFromValue(value, context) {
   const valueString = value.asString(context),
         string = `(${valueString})`;

package/src/dom/value/negated.js

@@ -8,7 +8,7 @@ import { domAssigned } from "../../dom";
 import { BOOLEAN_TYPE } from "../../types";
 
 const valueNodeQuery = nodeQuery("/negatedValue/value"),
-      negatedValueNodeQuery = nodeQuery("/value/negatedValue");
+      valueNegatedValueNodeQuery = nodeQuery("/value/negatedValue");
 
 export default domAssigned(class NegatedValue {
   constructor(string, type, value) {
@@ -66,22 +66,29 @@ export default domAssigned(class NegatedValue {
   static fromValueNode(valueNode, context) {
     let negatedValue = null;
 
-    const negatedValueNode = negatedValueNodeQuery(valueNode);
+    const valueNegatedValueNode = valueNegatedValueNodeQuery(valueNode);
 
-    if (negatedValueNode !== null) {
-      const { Value } = dom,
-            type = BOOLEAN_TYPE,
-            valueNode = valueNodeQuery(negatedValueNode),
-            value = Value.fromValueNode(valueNode, context),
-            string = stringFromValue(value, context);
+    if (valueNegatedValueNode !== null) {
+      const negatedValueNode = valueNegatedValueNode; ///
 
-      negatedValue = new NegatedValue(string, type, value);
+      negatedValue = negatedValueFromNegatedValueNode(negatedValueNode, context);
     }
 
     return negatedValue;
   }
 });
 
+function negatedValueFromNegatedValueNode(negatedValueNode, context) {
+  const { Value, NegatedValue } = dom,
+        valueNode = valueNodeQuery(negatedValueNode),
+        value = Value.fromValueNode(valueNode, context),
+        type = BOOLEAN_TYPE,
+        string = stringFromValue(value, context),
+        negatedValue = new NegatedValue(string, type, value);
+
+  return negatedValue;
+}
+
 function stringFromValue(value, context) {
   const valueString = value.asString(context),
         string = `!${valueString}`;

package/src/dom/value.js

@@ -15,14 +15,13 @@ const { match } = arrayUtilities;
 const reduceValueNodeQuery = nodeQuery("/reduce/value"),
       ternaryValueNodeQuery = nodeQuery("/ternary/value"),
       numberTerminalNodeQuery = nodeQuery("/value/@number"),
-      conditionValueNodeQuery = nodeQuery("/condition/value"),
       primitiveTerminalNodeQuery = nodeQuery("/value/@primitive"),
       returnStatementValueNodeQuery = nodeQuery("/returnStatement/value"),
       stringLiteralTerminalNodeQuery = nodeQuery("/value/@string-literal"),
       variableAssignmentValueNodeQuery = nodeQuery("/variableAssignment/value");
 
 export default domAssigned(class Value {
-  constructor(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall) {
+  constructor(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, returnBlock, procedureCall, negatedValue, bitwiseValue, bracketedValue) {
     this.node = node;
     this.nodes = nodes;
     this.number = number;
@@ -36,10 +35,11 @@ export default domAssigned(class Value {
     this.nodeQuery = nodeQuery;
     this.nodesQuery = nodesQuery;
     this.comparison = comparison;
+    this.returnBlock = returnBlock;
+    this.procedureCall = procedureCall;
     this.negatedValue = negatedValue;
     this.bitwiseValue = bitwiseValue;
     this.bracketedValue = bracketedValue;
-    this.procedureCall = procedureCall;
   }
 
   getNode() {
@@ -94,6 +94,14 @@ export default domAssigned(class Value {
     return this.comparison;
   }
 
+  getReturnBlock() {
+    return this.returnBlock;
+  }
+
+  getProcedureCall() {
+    return this.procedureCall;
+  }
+
   getNegatedValue() {
     return this.negatedValue;
   }
@@ -106,10 +114,6 @@ export default domAssigned(class Value {
     return this.bracketedValue;
   }
 
-  getProcedureCall() {
-    return this.procedureCall;
-  }
-
   getType() {
     let type;
 
@@ -141,14 +145,16 @@ export default domAssigned(class Value {
       type = this.nodesQuery.getType();
     } else if (this.comparison !== null) {
       type = this.comparison.getType();
+    } else if (this.returnBlock !== null) {
+      type = this.returnBlock.getType();
+    } else if (this.procedureCall !== null) {
+      type = this.procedureCall.getType();
     } else if (this.negatedValue !== null) {
       type = this.negatedValue.getType();
     } else if (this.bitwiseValue !== null) {
       type = this.bitwiseValue.getType();
     } else if (this.bracketedValue !== null) {
       type = this.bracketedValue.getType();
-    } else if (this.procedureCall !== null) {
-      type = this.procedureCall.getType();
     }
 
     return type;
@@ -185,14 +191,16 @@ export default domAssigned(class Value {
       string = this.nodesQuery.getString();
     } else if (this.comparison !== null) {
       string = this.comparison.getString();
+    } else if (this.returnBlock !== null) {
+      string = this.returnBlock.getString();
+    } else if (this.procedureCall !== null) {
+      string = this.procedureCall.getString();
     } else if (this.negatedValue !== null) {
       string = this.negatedValue.getString();
     } else if (this.bitwiseValue !== null) {
       string = this.bitwiseValue.getString();
     } else if (this.bracketedValue !== null) {
       string = this.bracketedValue.getString();
-    } else if (this.procedureCall !== null) {
-      string = this.procedureCall.getString();
     }
 
     return string;
@@ -225,14 +233,16 @@ export default domAssigned(class Value {
       value = this.nodesQuery.evaluate(context);
     } else if (this.comparison !== null) {
       value = this.comparison.evaluate(context);
+    } else if (this.returnBlock !== null) {
+      value = this.returnBlock.evaluate(context);
+    } else if (this.procedureCall !== null) {
+      value = this.procedureCall.evaluate(context);
     } else if (this.negatedValue !== null) {
       value = this.negatedValue.evaluate(context);
     } else if (this.bitwiseValue !== null) {
       value = this.bitwiseValue.evaluate(context);
     } else if (this.bracketedValue !== null) {
       value = this.bracketedValue.evaluate(context);
-    } else if (this.procedureCall !== null) {
-      value = this.procedureCall.evaluate(context);
     }
 
     return value;
@@ -305,11 +315,12 @@ export default domAssigned(class Value {
           nodeQuery = null,
           nodesQuery = null,
           comparison = null,
+          returnBlock = null,
+          procedureCall = null,
           negatedValue = null,
           bitwiseValue = null,
           bracketedValue = null,
-          procedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, returnBlock, procedureCall, negatedValue, bitwiseValue, bracketedValue);
 
     return value;
   }
@@ -327,11 +338,12 @@ export default domAssigned(class Value {
           nodeQuery = null,
           nodesQuery = null,
           comparison = null,
+          returnBlock = null,
+          procedureCall = null,
           negatedValue = null,
           bitwiseValue = null,
           bracketedValue = null,
-          procedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, returnBlock, procedureCall, negatedValue, bitwiseValue, bracketedValue);
 
     return value;
   }
@@ -349,11 +361,12 @@ export default domAssigned(class Value {
           nodeQuery = null,
           nodesQuery = null,
           comparison = null,
+          returnBlock = null,
+          procedureCall = null,
           negatedValue = null,
           bitwiseValue = null,
           bracketedValue = null,
-          procedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, returnBlock, procedureCall, negatedValue, bitwiseValue, bracketedValue);
 
     return value;
   }
@@ -371,11 +384,12 @@ export default domAssigned(class Value {
           nodeQuery = null,
           nodesQuery = null,
           comparison = null,
+          returnBlock = null,
+          procedureCall = null,
           negatedValue = null,
           bitwiseValue = null,
           bracketedValue = null,
-          procedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, returnBlock, procedureCall, negatedValue, bitwiseValue, bracketedValue);
 
     return value;
   }
@@ -402,30 +416,10 @@ export default domAssigned(class Value {
     return value;
   }
 
-  static fromConditionNode(conditionNode, context) {
-    let value = null;
-
-    const conditionValueNode = conditionValueNodeQuery(conditionNode);
-
-    if (conditionValueNode !== null) {
-      const valueNode = conditionValueNode; ///
-
-      value = valueFromValueNode(valueNode, context);
-    }
-
-    return value;
-  }
-
   static fromReturnStatementNode(returnStatementNode, context) {
-    let value = null;
-
-    const returnStatementValueNode = returnStatementValueNodeQuery(returnStatementNode);
-
-    if (returnStatementValueNode !== null) {
-      const valueNode = returnStatementValueNode; ///
-
-      value = valueFromValueNode(valueNode, context);
-    }
+    const returnStatementValueNode = returnStatementValueNodeQuery(returnStatementNode),
+          valueNode = returnStatementValueNode, ///
+          value = valueFromValueNode(valueNode, context);
 
     return value;
   }
@@ -512,7 +506,7 @@ function booleanAsString(boolean) {
 }
 
 function valueFromValueNode(valueNode, context) {
-  const { Some, Every, Reduce, Value, Ternary, Variable, NodeQuery, NodesQuery, Comparison, NegatedValue, BitwiseValue, BracketedValue, ProcedureCall } = dom,
+  const { Some, Every, Reduce, Value, Ternary, Variable, NodeQuery, NodesQuery, Comparison, ReturnBlock, ProcedureCall, NegatedValue, BitwiseValue, BracketedValue } = dom,
         node = nodeFromValueNode(valueNode, context),
         nodes = nodesFromValueNode(valueNode, context),
         number = numberFromValueNode(valueNode, context),
@@ -526,11 +520,12 @@ function valueFromValueNode(valueNode, context) {
         nodeQuery = NodeQuery.fromValueNode(valueNode, context),
         nodesQuery = NodesQuery.fromValueNode(valueNode, context),
         comparison = Comparison.fromValueNode(valueNode, context),
+        returnBlock = ReturnBlock.fromValueNode(valueNode, context),
+        procedureCall = ProcedureCall.fromValueNode(valueNode, context),
         negatedValue = NegatedValue.fromValueNode(valueNode, context),
         bitwiseValue = BitwiseValue.fromValueNode(valueNode, context),
         bracketedValue = BracketedValue.fromValueNode(valueNode, context),
-        procedureCall = ProcedureCall.fromValueNode(valueNode, context),
-        value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall);
+        value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, returnBlock, procedureCall, negatedValue, bitwiseValue, bracketedValue);
 
   return value;
 }

package/src/dom/values.js

@@ -5,7 +5,7 @@ import dom from "../dom";
 import { domAssigned } from "../dom";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const valuesNodeQuery = nodeQuery("/value/procedureCall/values"),
+const procedureCallValuesNodeQuery = nodeQuery("/procedureCall/values"),
       valueNodesQuery = nodesQuery("/values/value");
 
 export default domAssigned(class Values {
@@ -80,24 +80,10 @@ export default domAssigned(class Values {
     return values;
   }
 
-  static fromValuesNode(valuesNode, context) {
-    let values = null;
-
-    if (valuesNode !== null) {
-      values = valuesFromValuesNode(valuesNode, context);
-    }
-
-    return values;
-  }
-
-  static fromValueNode(valueNode, context) {
-    let values = null;
-
-    const valuesNode = valuesNodeQuery(valueNode);
-
-    if (valuesNode !== null) {
-      values = valuesFromValuesNode(valuesNode, context);
-    }
+  static fromProcedureCallNode(procedureCallNode, context) {
+    const procedureCallValuesNode = procedureCallValuesNodeQuery(procedureCallNode),
+          valuesNode = procedureCallValuesNode, ///
+          values = valuesFromValuesNode(valuesNode, context);
 
     return values;
   }

package/src/dom/variable.js

@@ -52,8 +52,9 @@ export default domAssigned(class Variable {
 
     context.trace(`Evaluating the '${variableString}' variable...`);
 
-    const variableName = this.name, ///
-          variablePresent = context.isVariablePresentByVariableName(variableName);
+    const nested = true,
+          variableName = this.name, ///
+          variablePresent = context.isVariablePresentByVariableName(variableName, nested);
 
     if (!variablePresent) {
       const message = `The '${variableString}; variable is not present.'`,
@@ -72,10 +73,11 @@ export default domAssigned(class Variable {
   }
 
   assign(value, context) {
-    const valueString = value.asString(context), ///
+    const nested = false,
+          valueString = value.asString(context), ///
           variableName = this.name, ///
           variableString = this.string, ///
-          variablePresent = context.isVariablePresentByVariableName(variableName);
+          variablePresent = context.isVariablePresentByVariableName(variableName, nested);
 
     context.trace(`Assigning the ${valueString} value to the '${variableString}' variable...`);