occam-furtle 2.0.78 → 2.0.82

package/src/dom/parameter/named.js

@@ -80,14 +80,26 @@ export default domAssigned(class NamedParameter {
     const type = typeFromNamedParameterNode(namedParameterNode, context),
           name = nameFromNamedParameterNode(namedParameterNode, context),
           asName = asNameFromNamedParameterNode(namedParameterNode, context),
-          node = namedParameterNode, //
-          string = context.nodeAsString(node),
+          string = stringFromTypeNameAndAsName(type, name, asName, context),
           namedParameter = new NamedParameter(string, type, name, asName);
 
     return namedParameter;
   }
 });
 
+function stringFromTypeNameAndAsName(type, name, asName, context) {
+  let string;
+
+  string = `${type} ${name}`;
+
+  if (asName !== null) {
+    string = `${string} As ${asName}`;
+  }
+
+  return string;
+}
+
+
 function typeFromNamedParameterNode(namedParameterNode, context) {
   const typeTerminalNode = typeTerminalNodeQuery(namedParameterNode),
         typeTerminalNodeContent = typeTerminalNode.getContent(),

package/src/dom/parameters/named.js

@@ -107,16 +107,30 @@ export default domAssigned(class NamedParameters {
   static fromObjectAssignmentNode(objectAssignmentNode, context) {
     const objectAssignmentNamedParametersNode = objectAssignmentNamedParametersNodeQuery(objectAssignmentNode),
           parametersNode = objectAssignmentNamedParametersNode,  ///
-          node = parametersNode,  ///
-          string = context.nodeAsString(node),
           namedParameterNodes = namedParameterNodesQuery(parametersNode),
           array = arrayFromNamedParameterNodes(namedParameterNodes, context),
+          string = stringFromArray(array, context),
           namedParameters = new NamedParameters(string, array);
 
     return namedParameters;
   }
 });
 
+function stringFromArray(array, context) {
+  const namedParametersSString = array.reduce((namedParametersSString, namedParameter) => {
+          const namedParameterString = namedParameter.getString();
+
+          namedParametersSString = (namedParametersSString === null) ?
+                                     namedParameterString :
+                                      `${namedParametersSString}, ${namedParameterString}`;
+
+          return namedParametersSString;
+        }, null),
+        string = namedParametersSString;  ///
+
+  return string;
+}
+
 function arrayFromNamedParameterNodes(namedParameterNodes, context) {
   const { NamedParameter } = dom,
         array = namedParameterNodes.map((namedParameterNode) => { ///

package/src/dom/procedure/anonymous.js

@@ -10,6 +10,8 @@ import { variablesFromValuesAndParameters } from "../procedure";
 const parametersNodeQuery = nodeQuery("/anonymousProcedure/parameters"),
       typeTerminalNodeQuery = nodeQuery("/anonymousProcedure/@type"),
       someAnonymousProcedureNodeQuery = nodeQuery("/some/anonymousProcedure"),
+      everyAnonymousProcedureNodeQuery = nodeQuery("/every/anonymousProcedure"),
+      reduceAnonymousProcedureNodeQuery = nodeQuery("/reduce/anonymousProcedure"),
       anonymousProcedureCallAnonymousProcedureNodeQuery = nodeQuery("/anonymousProcedureCall/anonymousProcedure");
 
 export default domAssigned(class AnonymousProcedure {
@@ -71,6 +73,22 @@ export default domAssigned(class AnonymousProcedure {
     return anonymousProcedure;
   }
 
+  static fromEveryNode(everyNode, context) {
+    const everyAnonymousProcedureNode = everyAnonymousProcedureNodeQuery(everyNode),
+          anonymousProcedureNode = everyAnonymousProcedureNode,  ///
+          anonymousProcedure = anonymousProcedureFromAnonymousProcedureNode(anonymousProcedureNode, context);
+
+    return anonymousProcedure;
+  }
+
+  static fromReduceNode(reduceNode, context) {
+    const reduceAnonymousProcedureNode = reduceAnonymousProcedureNodeQuery(reduceNode),
+          anonymousProcedureNode = reduceAnonymousProcedureNode,  ///
+          anonymousProcedure = anonymousProcedureFromAnonymousProcedureNode(anonymousProcedureNode, context);
+
+    return anonymousProcedure;
+  }
+
   static fromAnonymousProcedureCallNode(anonymousProcedureCallNode, context) {
     const anonymousProcedureCallAnonymousProcedureNode = anonymousProcedureCallAnonymousProcedureNodeQuery(anonymousProcedureCallNode),
           anonymousProcedureNode = anonymousProcedureCallAnonymousProcedureNode,  ///

package/src/dom/procedureCall/anonymous.js

@@ -48,10 +48,9 @@ export default domAssigned(class AnonymousProcedureCall {
 
     if (anonymousProcedureCallNode !== null) {
       const { Values, AnonymousProcedure } = dom,
-            node = anonymousProcedureCallNode, ///
-            string = context.nodeAsString(node),
             anonymousProcedure = AnonymousProcedure.fromAnonymousProcedureCallNode(anonymousProcedureCallNode, context),
-            values = Values.fromAnonymousProcedureCallNode(anonymousProcedureCallNode, context);
+            values = Values.fromAnonymousProcedureCallNode(anonymousProcedureCallNode, context),
+            string = stringFromAnonymousProcedureAndValues(anonymousProcedure, values, context);
 
       anonymousProcedureCall = new AnonymousProcedureCall(string, anonymousProcedure, values);
     }
@@ -59,3 +58,11 @@ export default domAssigned(class AnonymousProcedureCall {
     return anonymousProcedureCall;
   }
 });
+
+function stringFromAnonymousProcedureAndValues(anonymousProcedure, values, context) {
+  const anonymousProcedureString = anonymousProcedure.getString(),
+        valuesString = values.getString(),
+        string = `(${anonymousProcedureString})(${valuesString})`;
+
+  return string;
+}

package/src/dom/reduce.js

@@ -0,0 +1,117 @@
+"use strict";
+
+import dom from "../dom";
+import Exception from "../exception";
+
+import { nodeQuery } from "../utilities/query";
+import { domAssigned } from "../dom";
+import { NODES_TYPE, BOOLEAN_TYPE } from "../types";
+
+const variableNodeQuery = nodeQuery("/reduce/variable"),
+      parametersNodeQuery = nodeQuery("/reduce/anonymousProcedure/parameters"),
+      valueReduceNodeQuery = nodeQuery("/value/reduce"),
+      initialValueNodeQuery = nodeQuery("/reduce/value"); ///
+
+export default domAssigned(class Reduce {
+  constructor(string, variable, initialValue, anonymousProcedure) {
+    this.string = string;
+    this.variable = variable;
+    this.initialValue = initialValue;
+    this.anonymousProcedure = anonymousProcedure;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getVariable() {
+    return this.variable;
+  }
+
+  getInitialValue() {
+    return this.initialValue;
+  }
+
+  getAnonymousProcedure() {
+    return this.anonymousProcedure;
+  }
+
+  evaluate(context) {
+    let value;
+
+    const reduceString = this.getString();
+
+    context.trace(`Evaluating the '${reduceString}' reduce...`);
+
+    value = this.variable.evaluate(context);
+
+    const valueType = value.getType();
+
+    if (valueType !== NODES_TYPE) {
+      const valueString = value.asString(context),
+            message = `The ${valueString} value's '${valueType}' type should be '${NODES_TYPE}'.`,
+            exception = Exception.fromMessage(message);
+
+      throw exception;
+    }
+
+    const nodes = value.getNodes(),
+          initialValue = this.initialValue.evaluate(context);
+
+    value = nodes.reduce((currentValue, node) => {
+      let value;
+
+      const { Value, Values } = dom;
+
+      value = currentValue; ///
+
+      const values = Values.fromValue(value, context);
+
+      value = Value.fromNode(node, context);
+
+      values.addValue(value);
+
+      value = this.anonymousProcedure.call(values, context);
+
+      return value;
+    }, initialValue);
+
+    context.trace(`...evaluated the '${reduceString}' reduce.`);
+
+    return value;
+  }
+
+  static name = "Reduce";
+
+  static fromValueNode(valueNode, context) {
+    let reduce = null;
+
+    const valueReduceNode = valueReduceNodeQuery(valueNode);
+
+    if (valueReduceNode !== null) {
+      const { Value, Variable, AnonymousProcedure } = dom,
+            reduceNode = valueReduceNode, ///
+            string = stringFromReduceNode(reduceNode, context),
+            value = Value.fromReduceNode(reduceNode, context),
+            variable = Variable.fromReduceNode(reduceNode, context),
+            initialValue = value, ///
+            anonymousProcedure = AnonymousProcedure.fromReduceNode(reduceNode, context);
+
+      reduce = new Reduce(string, variable, initialValue, anonymousProcedure);
+    }
+
+    return reduce;
+  }
+});
+
+function stringFromReduceNode(reduceNode, context) {
+  const variableNode = variableNodeQuery(reduceNode),
+        parametersNode = parametersNodeQuery(reduceNode),
+        initialValueNode = initialValueNodeQuery(reduceNode),
+        variableString = context.nodeAsString(variableNode),
+        parametersString = context.nodeAsString(parametersNode),
+        initialValueString = context.nodeAsString(initialValueNode),
+        string = `Reduce(${variableString}, (${parametersString}) { ... }, ${initialValueString})`;
+
+  return string;
+}

package/src/dom/statement/return.js

@@ -40,11 +40,17 @@ export default domAssigned(class ReturnStatement {
   static fromReturnBlockNode(returnBlockNode, context) {
     const { Value } = dom,
           returnStatementNode = returnStatementNodeQuery(returnBlockNode),
-          node = returnStatementNode, ///
-          string = context.nodeAsString(node),
           value = Value.fromReturnStatementNode(returnStatementNode, context),
+          string = stringFromValue(value, context),
           returnStatement = new ReturnStatement(string, value);
 
     return returnStatement;
   }
 });
+
+function stringFromValue(value, context) {
+  const valueString = value.asString(context),
+        string = `Return ${valueString};`;
+
+  return string;
+}

package/src/dom/ternary.js

@@ -7,8 +7,7 @@ import { nodeQuery } from "../utilities/query";
 import { domAssigned } from "../dom";
 import { BOOLEAN_TYPE } from "../types";
 
-const valueNodeQuery = nodeQuery("/ternary/value[0]"),
-      ifValueNodeQuery = nodeQuery("/ternary/value[1]"),
+const ifValueNodeQuery = nodeQuery("/ternary/value[1]"),
       ternaryNodeQuery = nodeQuery("/value/ternary"),
       elseValueNodeQuery = nodeQuery("/ternary/value[2]");
 
@@ -75,12 +74,12 @@ export default domAssigned(class Ternary {
 
     if (ternaryNode !== null) {
       const { Value } = dom,
-            string = stringFromTernaryNode(ternaryNode, context),
             ifValueNode = ifValueNodeQuery(ternaryNode),
             elseValueNode = elseValueNodeQuery(ternaryNode),
             value = Value.fromTernaryNode(ternaryNode, context),
             ifValue = Value.fromValueNode(ifValueNode, context),
-            elseValue = Value.fromValueNode(elseValueNode, context);
+            elseValue = Value.fromValueNode(elseValueNode, context),
+            string = stringFromValueIfValueAndElseValue(value, ifValue, elseValue, context);
 
       ternary = new Ternary(string, value, ifValue, elseValue);
     }
@@ -89,17 +88,11 @@ export default domAssigned(class Ternary {
   }
 });
 
-function stringFromTernaryNode(ternaryNode, context) {
-  let string;
-
-  const valueNode = valueNodeQuery(ternaryNode),
-        ifValueNode = ifValueNodeQuery(ternaryNode),
-        elseValueNode = elseValueNodeQuery(ternaryNode),
-        ifValueString = context.nodeAsString(ifValueNode),
-        elseValueString = context.nodeAsString(elseValueNode),
-        valueString = context.nodeAsString(valueNode);
-
-  string = `If (${valueString}) ${ifValueString} ${elseValueString}`;
+function stringFromValueIfValueAndElseValue(value, ifValue, elseValue, context) {
+  const valueString = value.getString(),
+        ifValueString = ifValue.getString(),
+        elseValueString = elseValue.getString(),
+        string = `If (${valueString}) ${ifValueString} ${elseValueString}`;
 
   return string;
 }

package/src/dom/value/bitwise.js

@@ -5,8 +5,8 @@ import Exception from "../../exception";
 
 import { nodeQuery } from "../../utilities/query";
 import { domAssigned } from "../../dom";
-import { DISJUNCTION } from "../../constants";
 import { BOOLEAN_TYPE } from "../../types";
+import { CONJUNCTION, DISJUNCTION } from "../../constants";
 
 const terminalNodeQuery = nodeQuery("/bitwiseValue/@*"),
       leftValueNodeQuery = nodeQuery("/bitwiseValue/value[0]"),
@@ -93,14 +93,13 @@ export default domAssigned(class BitwiseValue {
 
     if (bitwiseValueNode !== null) {
       const { Value } = dom,
-            node = bitwiseValueNode,  //
-            string = context.nodeAsString(node),
             type = BOOLEAN_TYPE,
             leftValueNode = leftValueNodeQuery(bitwiseValueNode),
             rightValueNode = rightValueNodeQuery(bitwiseValueNode),
             disjoint = disjointFromBitwiseValueNode(bitwiseValueNode, context),
             leftValue = Value.fromValueNode(leftValueNode, context),
-            rightValue = Value.fromValueNode(rightValueNode, context);
+            rightValue = Value.fromValueNode(rightValueNode, context),
+            string = stringFromTypeDisjointLeftValueAndRightValue(disjoint, leftValue, rightValue, context);
 
       bitwiseValue = new BitwiseValue(string, type, disjoint, leftValue, rightValue);
     }
@@ -116,3 +115,14 @@ function disjointFromBitwiseValueNode(bitwiseValueNode, context) {
 
   return disjoint;
 }
+
+function stringFromTypeDisjointLeftValueAndRightValue(disjoint, leftValue, rightValue, context) {
+  const operatorString = disjoint ?
+                           DISJUNCTION :
+                             CONJUNCTION,
+        leftValueString = leftValue.asString(context),
+        rightValueString = rightValue.asString(context),
+        string = `${leftValueString} ${operatorString} ${rightValueString}`;
+
+  return string;
+}

package/src/dom/value/bracketed.js

@@ -48,10 +48,9 @@ export default domAssigned(class BracketedValue {
     if (valueBracketedValueNode !== null) {
       const { Value } = dom,
             bracketedValueNode = valueBracketedValueNode, ///
-            node = bracketedValueNode,  ///
-            string = context.nodeAsString(node),
             valueNode = valueNodeQuery(bracketedValueNode),
-            value = Value.fromValueNode(valueNode, context);
+            value = Value.fromValueNode(valueNode, context),
+            string = stringFromValue(value, context);
 
       bracketedValue = new BracketedValue(string, value);
     }
@@ -59,3 +58,10 @@ export default domAssigned(class BracketedValue {
     return bracketedValue;
   }
 });
+
+function stringFromValue(value, context) {
+  const valueString = value.asString(context),
+        string = `(${valueString})`;
+
+  return string;
+}

package/src/dom/value/negated.js

@@ -70,11 +70,10 @@ export default domAssigned(class NegatedValue {
 
     if (negatedValueNode !== null) {
       const { Value } = dom,
-            node = negatedValueNode,  //
-            string = context.nodeAsString(node),
             type = BOOLEAN_TYPE,
             valueNode = valueNodeQuery(negatedValueNode),
-            value = Value.fromValueNode(valueNode, context);
+            value = Value.fromValueNode(valueNode, context),
+            string = stringFromValue(value, context);
 
       negatedValue = new NegatedValue(string, type, value);
     }
@@ -82,3 +81,10 @@ export default domAssigned(class NegatedValue {
     return negatedValue;
   }
 });
+
+function stringFromValue(value, context) {
+  const valueString = value.asString(context),
+        string = `!${valueString}`;
+
+  return string;
+}

package/src/dom/value.js

@@ -12,7 +12,8 @@ import { NODE_TYPE, NODES_TYPE, NUMBER_TYPE, STRING_TYPE, BOOLEAN_TYPE } from ".
 
 const { match } = arrayUtilities;
 
-const ternaryValueNodeQuery = nodeQuery("/ternary/value"),
+const reduceValueNodeQuery = nodeQuery("/reduce/value"),
+      ternaryValueNodeQuery = nodeQuery("/ternary/value"),
       numberTerminalNodeQuery = nodeQuery("/value/@number"),
       conditionValueNodeQuery = nodeQuery("/condition/value"),
       primitiveTerminalNodeQuery = nodeQuery("/value/@primitive"),
@@ -22,13 +23,15 @@ const ternaryValueNodeQuery = nodeQuery("/ternary/value"),
       variableAssignmentValueNodeQuery = nodeQuery("/variableAssignment/value");
 
 export default domAssigned(class Value {
-  constructor(node, nodes, number, string, boolean, some, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall) {
+  constructor(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall) {
     this.node = node;
     this.nodes = nodes;
     this.number = number;
     this.string = string;
     this.boolean = boolean;
     this.some = some;
+    this.every = every;
+    this.reduce = reduce;
     this.ternary = ternary;
     this.variable = variable;
     this.nodeQuery = nodeQuery;
@@ -65,6 +68,14 @@ export default domAssigned(class Value {
     return this.some;
   }
 
+  getEvery() {
+    return this.every;
+  }
+
+  getReduce() {
+    return this.reduce;
+  }
+
   getTernary() {
     return this.ternay;
   }
@@ -122,6 +133,10 @@ export default domAssigned(class Value {
       type = BOOLEAN_TYPE;
     } else if (this.some !== null) {
       type = this.some.getType();
+    } else if (this.every !== null) {
+      type = this.every.getType();
+    } else if (this.reduce !== null) {
+      type = this.reduce.getType();
     } else if (this.ternary !== null) {
       type = this.ternary.getType();
     } else if (this.variable !== null) {
@@ -157,33 +172,37 @@ export default domAssigned(class Value {
     } else if (this.nodes !== null) {
       string = nodesAsString(this.nodes, context);
     } else if (this.number !== null) {
-      string = numberAsString(this.number, context);
+      string = numberAsString(this.number);
     } else if (this.string !== null) {
-      string = stringAsString(this.string, context)
+      string = stringAsString(this.string)
     } else if (this.boolean !== null) {
-      string = booleanAsString(this.boolean, context)
+      string = booleanAsString(this.boolean)
     } else if (this.some !== null) {
-      string = this.some.asString(context);
+      string = this.some.getString();
+    } else if (this.every !== null) {
+      string = this.every.getString();
+    } else if (this.reduce !== null) {
+      string = this.reduce.getString();
     } else if (this.ternary !== null) {
-      string = this.ternary.asString(context);
+      string = this.ternary.getString();
     } else if (this.variable !== null) {
-      string = this.variable.asString(context);
+      string = this.variable.getString();
     } else if (this.nodeQuery !== null) {
-      string = this.nodeQuery.asString(context);
+      string = this.nodeQuery.getString();
     } else if (this.nodesQuery !== null) {
-      string = this.nodesQuery.asString(context);
+      string = this.nodesQuery.getString();
     } else if (this.comparison !== null) {
-      string = this.comparison.asString(context);
+      string = this.comparison.getString();
     } else if (this.negatedValue !== null) {
-      string = this.negatedValue.asString(context);
+      string = this.negatedValue.getString();
     } else if (this.bitwiseValue !== null) {
-      string = this.bitwiseValue.asString(context);
+      string = this.bitwiseValue.getString();
     } else if (this.bracketedValue !== null) {
-      string = this.bracketedValue.asString(context);
+      string = this.bracketedValue.getString();
     } else if (this.procedureCall !== null) {
-      string = this.procedureCall.asString(context);
+      string = this.procedureCall.getString();
     } else if (this.anonymousProcedureCall !== null) {
-      string = this.anonymousProcedureCall.asString(context);
+      string = this.anonymousProcedureCall.getString();
     }
 
     return string;
@@ -202,6 +221,10 @@ export default domAssigned(class Value {
       value = this;
     } else if (this.some !== null) {
       value = this.some.evaluate(context);
+    } else if (this.every !== null) {
+      value = this.every.evaluate(context);
+    } else if (this.reduce !== null) {
+      value = this.reduce.evaluate(context);
     } else if (this.ternary !== null) {
       value = this.ternary.evaluate(context);
     } else if (this.variable !== null) {
@@ -287,6 +310,8 @@ export default domAssigned(class Value {
           string = null,
           boolean = null,
           some = null,
+          every = null,
+          reduce = null,
           ternary = null,
           variable = null,
           nodeQuery = null,
@@ -297,7 +322,7 @@ export default domAssigned(class Value {
           bracketedValue = null,
           procedureCall = null,
           anonymousProcedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
 
     return value;
   }
@@ -309,6 +334,8 @@ export default domAssigned(class Value {
           boolean = null,
           ternary = null,
           some = null,
+          every = null,
+          reduce = null,
           variable = null,
           nodeQuery = null,
           nodesQuery = null,
@@ -318,7 +345,7 @@ export default domAssigned(class Value {
           bracketedValue = null,
           procedureCall = null,
           anonymousProcedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
 
     return value;
   }
@@ -329,6 +356,8 @@ export default domAssigned(class Value {
           number = null,
           boolean = null,
           some = null,
+          every = null,
+          reduce = null,
           ternary = null,
           variable = null,
           nodeQuery = null,
@@ -339,7 +368,7 @@ export default domAssigned(class Value {
           bracketedValue = null,
           procedureCall = null,
           anonymousProcedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
 
     return value;
   }
@@ -350,6 +379,8 @@ export default domAssigned(class Value {
           number = null,
           string = null,
           some = null,
+          every = null,
+          reduce = null,
           ternary = null,
           variable = null,
           nodeQuery = null,
@@ -360,7 +391,7 @@ export default domAssigned(class Value {
           bracketedValue = null,
           procedureCall = null,
           anonymousProcedureCall = null,
-          value = new Value(node, nodes, number, string, boolean, some, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
+          value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
 
     return value;
   }
@@ -371,6 +402,14 @@ export default domAssigned(class Value {
     return value;
   }
 
+  static fromReduceNode(reduceNode, context) {
+    const reduceValueNode = reduceValueNodeQuery(reduceNode),
+          valueNode = reduceValueNode, ///
+          value = valueFromValueNode(valueNode, context);
+
+    return value;
+  }
+
   static fromTernaryNode(ternaryNode, context) {
     const ternaryValueNode = ternaryValueNodeQuery(ternaryNode),
           valueNode = ternaryValueNode, ///
@@ -474,7 +513,7 @@ function nodesAsString(nodes, context) {
   return string;
 }
 
-function numberAsString(number, context) {
+function numberAsString(number) {
   let string;
 
   string = `${number}`;
@@ -482,13 +521,13 @@ function numberAsString(number, context) {
   return string;
 }
 
-function stringAsString(string, context) {
+function stringAsString(string) {
   string = `"${string}"`; ///
 
   return string;
 }
 
-function booleanAsString(boolean, context) {
+function booleanAsString(boolean) {
   let string;
 
   string = `'${boolean}'`;
@@ -497,13 +536,15 @@ function booleanAsString(boolean, context) {
 }
 
 function valueFromValueNode(valueNode, context) {
-  const { Some, Value, Ternary, Variable, NodeQuery, NodesQuery, Comparison, NegatedValue, BitwiseValue, BracketedValue, ProcedureCall, AnonymousProcedureCall } = dom,
+  const { Some, Every, Reduce, Value, Ternary, Variable, NodeQuery, NodesQuery, Comparison, NegatedValue, BitwiseValue, BracketedValue, ProcedureCall, AnonymousProcedureCall } = dom,
         node = nodeFromValueNode(valueNode, context),
         nodes = nodesFromValueNode(valueNode, context),
         number = numberFromValueNode(valueNode, context),
         string = stringFromValueNode(valueNode, context),
         boolean = booleanFromValueNode(valueNode, context),
         some = Some.fromValueNode(valueNode, context),
+        every = Every.fromValueNode(valueNode, context),
+        reduce = Reduce.fromValueNode(valueNode, context),
         ternary = Ternary.fromValueNode(valueNode, context),
         variable = Variable.fromValueNode(valueNode, context),
         nodeQuery = NodeQuery.fromValueNode(valueNode, context),
@@ -514,7 +555,7 @@ function valueFromValueNode(valueNode, context) {
         bracketedValue = BracketedValue.fromValueNode(valueNode, context),
         procedureCall = ProcedureCall.fromValueNode(valueNode, context),
         anonymousProcedureCall = AnonymousProcedureCall.fromValueNode(valueNode, context),
-        value = new Value(node, nodes, number, string, boolean, some, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
+        value = new Value(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, negatedValue, bitwiseValue, bracketedValue, procedureCall, anonymousProcedureCall);
 
   return value;
 }

package/src/dom/values.js

@@ -35,6 +35,10 @@ export default domAssigned(class Values {
     return value;
   }
 
+  addValue(value) {
+    this.array.push(value);
+  }
+
   mapValue(callback) { return this.array.map(callback); }
 
   forEachValue(callback) { this.array.forEach(callback); }