occam-furtle 3.0.521 → 3.0.524

package/src/utilities/element.js

@@ -10,6 +10,8 @@ import { ternaryStringFromTerm,
          termStringFromProperties,
          valueStringFromProperties,
          expressionStringFromProperties,
+         allStringFromVariableAndValues,
+         referencesStringFromReferencesArray,
          returnBlockStringFromReturnStatementNode,
          variableAssignmentStringFromTypeAndVariable,
          someStringFromVariableAndAnonymousProcedure,
@@ -19,6 +21,23 @@ import { ternaryStringFromTerm,
          procedureStringFromTypeLabelExportedParametersAndReturnBlock,
          reduceStringFromVariableInitialExpressionAndAnonymousProcedure } from "../utilities/string";
 
+export function allFromAllNode(someNode, context) {
+  const { All } = elements,
+        node = someNode,  ///
+        values = valuesFromAllNode(someNode, context),
+        variable = variableFromAllNode(someNode, context),
+        references = referencesFromAllNode(someNode, context),
+        allString = allStringFromVariableAndValues(variable, values),
+        string = allString,  ///
+        breakPoint = null;
+
+  context = null;
+
+  const all = new All(context, string, node, breakPoint, values, variable, references);
+
+  return all;
+}
+
 export function someFromSomeNode(someNode, context) {
   const { Some } = elements,
         node = someNode,  ///
@@ -141,18 +160,21 @@ export function labelFromLabelNode(labelNode, context) {
   return label;
 }
 
-export function labelFromReferenceNode(referenceNode, context) {
-  const { Label } = elements,
-        node = referenceNode,
-        string = context.nodeAsString(node),
-        breakPoint = null,
-        name = nameFromReferenceNode(referenceNode, context);
+export function existsFromExistsNode(someNode, context) {
+  const { Exists } = elements,
+        node = someNode,  ///
+        values = valuesFromExistsNode(someNode, context),
+        variable = variableFromExistsNode(someNode, context),
+        references = referencesFromExistsNode(someNode, context),
+        existsString = existsStringFromVariableAndValues(variable, values),
+        string = existsString,  ///
+        breakPoint = null;
 
   context = null;
 
-  const label = new Label(context, string, node, breakPoint, name);
+  const exists = new Exists(context, string, node, breakPoint, values, variable, references);
 
-  return label;
+  return exists;
 }
 
 export function valuesFromValuesNode(valuesNode, context) {
@@ -221,6 +243,20 @@ export function ternaryFromTernaryNode(ternaryNode, context) {
   return ternary;
 }
 
+export function labelFromReferenceNode(referenceNode, context) {
+  const { Label } = elements,
+        node = referenceNode,
+        string = context.nodeAsString(node),
+        breakPoint = null,
+        name = nameFromReferenceNode(referenceNode, context);
+
+  context = null;
+
+  const label = new Label(context, string, node, breakPoint, name);
+
+  return label;
+}
+
 export function containsFromContainsNode(containsNode, context) {
   const { Contains } = elements,
         node = containsNode, ///
@@ -453,6 +489,8 @@ export function expressionFromExpressionNode(expressionNode, context) {
         some = someFromExpressionNode(expressionNode, context),
         every = everyFromExpressionNode(expressionNode, context),
         reduce = reduceFromExpressionNode(expressionNode, context),
+        all = allFromExpressionNode(expressionNode, context),
+        exists = existsFromExpressionNode(expressionNode, context),
         ternary = ternaryFromExpressionNode(expressionNode, context),
         nodeQuery = nodeQueryFromExpressionNode(expressionNode, context),
         nodesQuery = nodesQueryFromExpressionNode(expressionNode, context),
@@ -469,6 +507,8 @@ export function expressionFromExpressionNode(expressionNode, context) {
           some,
           every,
           reduce,
+          all,
+          exists,
           ternary,
           nodeQuery,
           nodesQuery,
@@ -487,7 +527,7 @@ export function expressionFromExpressionNode(expressionNode, context) {
 
   context = null;
 
-  const expression = new Expression(context, string, node, breakPoint, term, some, every, reduce, ternary, nodeQuery, nodesQuery, lengthOf, toInteger, tryInteger, contains, endsWith, startsWith, returnBlock, procedureCall);
+  const expression = new Expression(context, string, node, breakPoint, term, some, every, reduce, all, exists, ternary, nodeQuery, nodesQuery, lengthOf, toInteger, tryInteger, contains, endsWith, startsWith, returnBlock, procedureCall);
 
   return expression;
 }
@@ -506,6 +546,23 @@ export function tryIntegerFromTryIntegerNode(tryIntegerNode, context) {
   return tryInteger;
 }
 
+export function referencesFromReferencesNode(referencesNode, context) {
+  const { References } = elements,
+        node = referencesNode, ///
+        referenceNodes = referencesNode.getReferenceNodes(),
+        referencesArray = referencesArrayFromReferenceNodes(referenceNodes, context),
+        referencesString = referencesStringFromReferencesArray(referencesArray),
+        string = referencesString,  ///
+        array = referencesArray, ///
+        breakPoint = null;
+
+  context = null;
+
+  const references = new References(context, string, node, breakPoint, array);
+
+  return references;
+}
+
 export function returnBlockFromReturnBlockNode(returnBlockNode, context) {
   const { ReturnBlock } = elements,
         node = returnBlockNode, ///
@@ -752,12 +809,26 @@ export function nameFromTypeNode(typeNode, context) {
   return name;
 }
 
+export function valuesFromAllNode(allNode, context) {
+  const valuesNode = allNode.getValuesNode(), ///
+        values = valuesFromValuesNode(valuesNode, context);
+
+  return values;
+}
+
 export function nameFromLabelNode(labelNode, context) {
   const name = labelNode.getName();
 
   return name;
 }
 
+export function variableFromAllNode(allNode, context) {
+  const variableNode = allNode.getVariableNode(), ///
+        variable = variableFromVariableNode(variableNode, context);
+
+  return variable;
+}
+
 export function valueFromReduceNode(reduceNode, context) {
   const valueNode = reduceNode.getValueNode(),
         value = valueFromValueNode(valueNode, context);
@@ -790,8 +861,15 @@ export function typeFromBindingNode(bindingNode, context) {
   return type;
 }
 
+export function valuesFromExistsNode(existsNode, context) {
+  const valuesNode = existsNode.getValuesNode(), ///
+        values = valuesFromValuesNode(valuesNode, context);
+
+  return values;
+}
+
 export function variableFromSomeNode(someNode, context) {
-  const variableNode = someNode.getVariableNode(), ///
+  const variableNode = someNode.getVariableNode(),
         variable = variableFromVariableNode(variableNode, context);
 
   return variable;
@@ -821,6 +899,13 @@ export function typeFromVariableNode(variableNode, context) {
   return type;
 }
 
+export function referencesFromAllNode(allNode, context) {
+  const referencesNode = allNode.getReferencesNode(),
+        references = referencesFromReferencesNode(referencesNode, context);
+
+  return references;
+}
+
 export function typeFromProcedureNode(procedureNode, context) {
   const typeNode = procedureNode.getTypeNode(),
         type = typeFromTypeNode(typeNode, context);
@@ -892,6 +977,18 @@ export function variableFromValueNode(valueNode, context) {
   return variable;
 }
 
+export function allFromExpressionNode(expressionNode, context) {
+  let all = null;
+
+  const allNode = expressionNode.getAllNode();
+
+  if (allNode !== null) {
+    all = allFromAllNode(allNode, context);
+  }
+
+  return all;
+}
+
 export function primitiveFromValueNode(valueNode, context) {
   let primitive = null;
 
@@ -911,10 +1008,17 @@ export function variableFromReduceNode(reduceNode, context) {
   return variable;
 }
 
+export function variableFromExistsNode(existsNode, context) {
+  const variableNode = existsNode.getVariableNode(), ///
+        variable = variableFromVariableNode(variableNode, context);
+
+  return variable;
+}
+
 export function queryFromNodeQueryNode(nodeQueryNode, context) {
   const string = nodeQueryNode.getString(),
-    expressionString = string,  ///
-    query = Query.fromExpressionString(expressionString);
+        expressionString = string,  ///
+        query = Query.fromExpressionString(expressionString);
 
   return query;
 }
@@ -1019,6 +1123,18 @@ export function termFromNegatedTermNode(negatedTermNode, context) {
   return term;
 }
 
+export function existsFromExpressionNode(expressionNode, context) {
+  let exists = null;
+
+  const existsNode = expressionNode.getExistsNode();
+
+  if (existsNode !== null) {
+    exists = existsFromExistsNode(existsNode, context);
+  }
+
+  return exists;
+}
+
 export function argumentTypeFromTypeNode(typeNode, context) {
   let argumentType = null;
 
@@ -1033,9 +1149,16 @@ export function argumentTypeFromTypeNode(typeNode, context) {
   return argumentType;
 }
 
+export function referencesFromExistsNode(existsNode, context) {
+  const referencesNode = existsNode.getReferencesNode(),
+        references = referencesFromReferencesNode(referencesNode, context);
+
+  return references;
+}
+
 export function variableFromLengthOfNode(lengthOfNode, context) {
   const variableNode = lengthOfNode.getVariableNode(),
-    variable = variableFromVariableNode(variableNode, context);
+        variable = variableFromVariableNode(variableNode, context);
 
   return variable;
 }
@@ -1139,7 +1262,7 @@ export function variableFromToIntegerNode(toIntegerNode, context) {
 
 export function termFromBracketedTermNode(bracketedTermNode, context) {
   const termNode = bracketedTermNode.getTermNode(),
-    term = termFromTermNode(termNode, context);
+        term = termFromTermNode(termNode, context);
 
   return term;
 }
@@ -1632,6 +1755,16 @@ export function bindingsArrayFromBindingsNode(bindingsNode, context) {
   return bindingsArray;
 }
 
+export function referencesArrayFromReferenceNodes(referenceNodes, context) {
+  const referencesArray = referenceNodes.map((referenceNode) => { ///
+    const reference = referenceFromReferenceNode(referenceNode, context);
+
+    return reference;
+  });
+
+  return referencesArray;
+}
+
 export function parametersArrayFromParametersNode(parametersNode, context) {
   const parameterNodes = parametersNode.getParameterNodes(),
         parametersArray = parameterNodes.map((parameterNode) => { ///

package/src/utilities/string.js

@@ -2,6 +2,7 @@
 
 import { EXPORT, EMPTY_STRING } from "../constants";
 import { stringFromStringLiteral } from "./stringLiteral";
+import {referenceFromReferenceNode} from "./element";
 
 export function ternaryStringFromTerm(term) {
   const termString = term.getString(),
@@ -84,11 +85,14 @@ export function valuesStringFromValuesArray(valuesArray) {
   return valuesString;
 }
 
-export function primtiveStringFromNominalValue(nominalValue) {
-  const string = nominalValue.getString(),
-        primtiveString = string;  ///
+export function allStringFromVariableAndValues(variable, values) {
+  const variableString = variable.getString(),
+        valuesString = values.getString(),
+        allString = (valuesString !== EMPTY_STRING) ?
+                     `all(${variableString}, ${valuesString})` :
+                       `all(${variableString})`;
 
-  return primtiveString;
+  return allString;
 }
 
 export function expressionStringFromProperties(properties) {
@@ -105,6 +109,13 @@ export function expressionStringFromProperties(properties) {
   return expressionString;
 }
 
+export function primtiveStringFromNominalValue(nominalValue) {
+  const string = nominalValue.getString(),
+        primtiveString = string;  ///
+
+  return primtiveString;
+}
+
 export function primtiveStringFromStringLiteral(stringLiteral) {
   const string = stringFromStringLiteral(stringLiteral),
         primtiveString = string;  ///
@@ -119,8 +130,8 @@ export function primtiveStringFromNominalValues(nominalValues) {
     const nominalValueString = nominalValue.getString();
 
     primitiveString = (primitiveString !== null) ?
-                       `${primitiveString}, ${nominalValueString}` :
-                          nominalValueString; ///
+                       `${primitiveString}, '${nominalValueString}'` :
+                        `'${nominalValueString}'`;
 
     return primitiveString;
   }, null);
@@ -130,6 +141,30 @@ export function primtiveStringFromNominalValues(nominalValues) {
   return primtiveString;
 }
 
+export function existsStringFromVariableAndValues(variable, values) {
+  const variableString = variable.getString(),
+        valuesString = values.getString(),
+        existsString = (valuesString !== EMPTY_STRING) ?
+                        `exists(${variableString}, ${valuesString})` :
+                          `exists(${variableString})`;
+
+  return existsString;
+}
+
+export function referencesStringFromReferencesArray(referencesArray) {
+  const referencesString = referencesArray.reduce((referencesString, reference) => {
+    const referenceString = reference.getString();
+
+    referencesString = (referencesString === null) ?
+                         referenceString :
+                          `${referencesString}, ${referenceString}`;
+
+    return referencesString;
+  }, null); ///
+
+  return referencesString;
+}
+
 export function returnBlockStringFromReturnStatementNode(returnStatement) {
   const returnStatementString = returnStatement.getString(),
         returnBlockString = `{ ... ${returnStatementString} }`;
@@ -157,6 +192,14 @@ export function typeStringFromTypeNameAndArgumentTypeName(typeName, argumentType
   return typeString;
 }
 
+export function procedureCallStringFromReferenceAndValues(reference, values) {
+  const valuesString = values.getString(),
+        referenceString = reference.getString(),
+        procedureCallString = `${referenceString}(${valuesString})`;
+
+  return procedureCallString;
+}
+
 export function variableAssignmentStringFromTypeAndVariable(type, variable) {
   const typeString = type.getString(),
         variableString = variable.getString(),