occam-furtle 3.0.237 → 3.0.239

package/src/node/primitive.js

@@ -1,30 +1,29 @@
 "use strict";
 
+import { NominalValue } from "occam-nominal";
 import { NonTerminalNode } from "occam-languages";
 
-import nullNode from "../nullNode";
-
 import { NULL, TRUE, FALSE } from "../constants";
-import { NODE_TYPE, STRING_TYPE, NUMBER_TYPE, BOOLEAN_TYPE } from "../types";
+import { STRING_TYPE, NUMBER_TYPE, BOOLEAN_TYPE, NOMINAL_VALUE_TYPE } from "../types";
 import { NULL_TOKEN_TYPE, NUMBER_TOKEN_TYPE, BOOLEAN_TOKEN_TYPE, STRING_LITERAL_TOKEN_TYPE } from "../tokenTypes";
 
 export default class PrimitiveNode extends NonTerminalNode {
   getType() {
     let type;
 
-    const node = this.getNode(),
-          number = this.getNumber(),
+    const number = this.getNumber(),
           boolean = this.getBoolean(),
+          nominalvalue = this.getNominaValue(),
           stringLiteral = this.getStringLiteral();
 
     if (false) {
       ///
-    } else if (node !== null) {
-      type = NODE_TYPE;
     } else if (number !== null) {
       type = NUMBER_TYPE;
     } else if (boolean !== null) {
       type = BOOLEAN_TYPE;
+    } else if (nominalvalue !== null) {
+      type = NOMINAL_VALUE_TYPE;
     } else if (stringLiteral !== null) {
       type = STRING_TYPE;
     }
@@ -35,19 +34,19 @@ export default class PrimitiveNode extends NonTerminalNode {
   getValue() {
     let value;
 
-    const node = this.getNode(),
-          number = this.getNumber(),
+    const number = this.getNumber(),
           boolean = this.getBoolean(),
+          nominalValue = this.getNominaValue(),
           stringLiteral = this.getStringLiteral();
 
     if (false) {
       ///
-    } else if (node !== null) {
-      value = node; ///
     } else if (number !== null) {
       value = number; ///
     } else if (boolean !== null) {
       value = boolean;  ///
+    } else if (nominalValue !== null) {
+      value = nominalValue; ///
     } else if (stringLiteral !== null) {
       value = stringLiteral;  ///
     }
@@ -55,24 +54,6 @@ export default class PrimitiveNode extends NonTerminalNode {
     return value;
   }
 
-  getNode() {
-    let node = null;
-
-    const tokenType = NULL_TOKEN_TYPE;
-
-    this.someTerminalNode((terminalNode) => {
-      const content = terminalNode.getContent();
-
-      if (content === NULL) {
-        node = nullNode;
-
-        return true;
-      }
-    }, tokenType);
-
-    return node;
-  }
-
   getNumber() {
     let number = null;
 
@@ -115,6 +96,24 @@ export default class PrimitiveNode extends NonTerminalNode {
     return boolean;
   }
 
+  getNominaValue() {
+    let nominalValue = null;
+
+    const tokenType = NULL_TOKEN_TYPE;
+
+    this.someTerminalNode((terminalNode) => {
+      const content = terminalNode.getContent();
+
+      if (content === NULL) {
+        nominalValue = NominalValue.fromNothing();
+
+        return true;
+      }
+    }, tokenType);
+
+    return nominalValue;
+  }
+
   getStringLiteral() {
     let stringLiteral = null;
 

package/src/nodeProperties.js

@@ -3,8 +3,8 @@
 import Exception from "./exception";
 import NodeProperty from "./nodeProperty";
 
-import { NODES_TYPE, STRING_TYPE, BOOLEAN_TYPE } from "./types";
 import { nodePropertiesStringFromNodePropertiesArray } from "./utilities/string";
+import { STRING_TYPE, BOOLEAN_TYPE, NOMINAL_VALUES_TYPE } from "./types";
 import { CONTENT_PARAMETER_NAME, TERMINAL_PARAMETER_NAME, CHILD_NODES_PARAMETER_NAME } from "./parameterNames";
 
 class NodeProperties {
@@ -71,7 +71,7 @@ function nodePropertiesArrayFromNothing() {
   const types = [
           STRING_TYPE,
           BOOLEAN_TYPE,
-          NODES_TYPE,
+          NOMINAL_VALUES_TYPE
         ],
         names = [
           CONTENT_PARAMETER_NAME,

package/src/types.js

@@ -1,7 +1,7 @@
 "use strict";
 
-export const NODE_TYPE = "Node";
-export const NODES_TYPE = "Nodes";
 export const STRING_TYPE = "String";
 export const NUMBER_TYPE = "Number";
 export const BOOLEAN_TYPE = "Boolean";
+export const NOMINAL_VALUE_TYPE = "Node"; ///
+export const NOMINAL_VALUES_TYPE = "Nodes"; ///

package/src/utilities/nominal.js

@@ -0,0 +1,27 @@
+"use strict";
+
+import { NominalValue } from "occam-nominal";
+
+import { termFromNominalValue, termFromNominalValues } from "../utilities/term";
+
+export function termFromNodeAndNominalValue(node, nominalValue) {
+  const context = nominalValue.getContext();
+
+  nominalValue = NominalValue.fromNode(node, context);
+
+  const term = termFromNominalValue(nominalValue);
+
+  return term;
+}
+
+export function termFromNodesAndNominalValue(nodes, nominalValue) {
+  const context = nominalValue.getContext(),
+        nominalValues = nodes.map((node) => {
+          const nominalValue = NominalValue.fromNode(node, context);
+
+          return nominalValue;
+        }),
+        term = termFromNominalValues(nominalValues);
+
+  return term;
+}

package/src/utilities/primitive.js

@@ -2,19 +2,18 @@
 
 import elements from "../elements";
 
-import { NODE_TYPE, NODES_TYPE, STRING_TYPE, BOOLEAN_TYPE } from "../types";
-import { primtiveStringFromNode, primtiveStringFromNodes, primtiveStringFromBoolean, primtiveStringFromStringLiteral } from "../utilities/string";
+import { STRING_TYPE, BOOLEAN_TYPE, NOMINAL_VALUE_TYPE, NOMINAL_VALUES_TYPE } from "../types";
+import { primtiveStringFromBoolean, primtiveStringFromNominalValue, primtiveStringFromNominalValues, primtiveStringFromStringLiteral } from "../utilities/string";
 
-export function primitiveFromNode(node, context) {
+export function primitiveFromBoolean(boolean, context) {
   const { Primitive } = elements,
-        primitiveString = primtiveStringFromNode(node, context),
+        primitiveString = primtiveStringFromBoolean(boolean),
         string = primitiveString,  ///
-        type = NODE_TYPE,
-        value = node, ///
+        type = BOOLEAN_TYPE,
+        value = boolean,  ///
+        node = null,
         breakPoint = null;
 
-  node = null;
-
   context = null;
 
   const primitive = new Primitive(context, string, node, breakPoint, type, value);
@@ -22,34 +21,30 @@ export function primitiveFromNode(node, context) {
   return primitive;
 }
 
-export function primitiveFromNodes(nodes, context) {
+export function primitiveFromNominalValue(nominalValue) {
   const { Primitive } = elements,
-        primitiveString = primtiveStringFromNodes(nodes, context),
+        primitiveString = primtiveStringFromNominalValue(nominalValue),
         string = primitiveString,  ///
-        type = NODES_TYPE,
-        value = nodes,  ///
+        type = NOMINAL_VALUE_TYPE,
+        value = nominalValue, ///
+        breakPoint = null,
         node = null,
-        breakPoint = null;
-
-  context = null;
-
-  const primitive = new Primitive(context, string, node, breakPoint, type, value);
+        context = null,
+        primitive = new Primitive(context, string, node, breakPoint, type, value);
 
   return primitive;
 }
 
-export function primitiveFromBoolean(boolean, context) {
+export function primitiveFromNominalValues(nominalValues) {
   const { Primitive } = elements,
-        primitiveString = primtiveStringFromBoolean(boolean),
+        primitiveString = primtiveStringFromNominalValues(nominalValues),
         string = primitiveString,  ///
-        type = BOOLEAN_TYPE,
-        value = boolean,  ///
+        type = NOMINAL_VALUES_TYPE,
+        value = nominalValues,  ///
         node = null,
-        breakPoint = null;
-
-  context = null;
-
-  const primitive = new Primitive(context, string, node, breakPoint, type, value);
+        breakPoint = null,
+        context = null,
+        primitive = new Primitive(context, string, node, breakPoint, type, value);
 
   return primitive;
 }
@@ -71,8 +66,8 @@ export function primitiveFromStringLiteral(stringLiteral, context) {
 }
 
 export default {
-  primitiveFromNode,
-  primitiveFromNodes,
   primitiveFromBoolean,
+  primitiveFromNominalValue,
+  primitiveFromNominalValues,
   primitiveFromStringLiteral
 };

package/src/utilities/string.js

@@ -1,8 +1,5 @@
 "use strict";
 
-import nullNode from "../nullNode";
-
-import { NULL } from "../constants";
 import { stringFromStringLiteral } from "./stringLiteral";
 
 export function ternaryStringFromTerm(term) {
@@ -18,21 +15,6 @@ export function variableStringFromName(name) {
   return variableString;
 }
 
-export function primtiveStringFromNode(node, context) {
-  const primtiveString = (node === nullNode) ?
-                             NULL :
-                               context.nodeAsString(node);
-
-  return primtiveString;
-}
-
-export function primtiveStringFromNodes(nodes, context) {
-  const string = context.nodesAsString(nodes),
-        primtiveString = string;  ///
-
-  return primtiveString;
-}
-
 export function termStringFromProperties(properties) {
   let termString;
 
@@ -67,6 +49,13 @@ export function termsStringFromTermsArray(termsArray) {
   return termsString;
 }
 
+export function primtiveStringFromNominalValue(nominalValue) {
+  const string = nominalValue.getString(),
+        primtiveString = string;  ///
+
+  return primtiveString;
+}
+
 export function expressionStringFromProperties(properties) {
   let expressionString;
 
@@ -88,6 +77,20 @@ export function primtiveStringFromStringLiteral(stringLiteral) {
   return primtiveString;
 }
 
+export function primtiveStringFromNominalValues(nominalValues) {
+  const primtiveString = nominalValues.reduce((primitiveString, nominalValue) => {
+    const nominalValueString = nominalValue.getString();
+
+    primitiveString = (primitiveString !== null) ?
+                       `${primitiveString}, ${nominalValueString}` :
+                          nominalValueString; ///
+
+    return primitiveString;
+  }, null);
+
+  return primtiveString;
+}
+
 export function nodePropertyStringFromNameAndType(name, type) {
   const typeString = type,  ///
         nameString = name,  ///

package/src/utilities/term.js

@@ -2,28 +2,24 @@
 
 import elements from "../elements";
 
-import { primitiveFromNode, primitiveFromNodes, primitiveFromBoolean, primitiveFromStringLiteral } from "../utilities/primitive";
+import { primitiveFromBoolean, primitiveFromNominalValue, primitiveFromNominalValues, primitiveFromStringLiteral } from "../utilities/primitive";
 
-export function termFromNode(node, context) {
+export function termFromPrimitive(primitive) {
   const { Term } = elements,
-        variable = null,
-        primitive = primitiveFromNode(node, context),
+        context = null,
         string = primitive.getString(),
-        breakPoint = null;
-
-  node = null;
-
-  context = null;
-
-  const term = new Term(context, string, node, breakPoint, variable, primitive);
+        node = null,
+        breakPoint = null,
+        variable = null,
+        term = new Term(context, string, node, breakPoint, variable, primitive);
 
   return term;
 }
 
-export function termFromNodes(nodes, context) {
+export function termFromBoolean(boolean, context) {
   const { Term } = elements,
         variable = null,
-        primitive = primitiveFromNodes(nodes, context),
+        primitive = primitiveFromBoolean(boolean, context),
         string = primitive.getString(),
         node = null,
         breakPoint = null;
@@ -35,17 +31,28 @@ export function termFromNodes(nodes, context) {
   return term;
 }
 
-export function termFromBoolean(boolean, context) {
+export function termFromNominalValue(nominalValue) {
   const { Term } = elements,
         variable = null,
-        primitive = primitiveFromBoolean(boolean, context),
+        primitive = primitiveFromNominalValue(nominalValue),
         string = primitive.getString(),
+        breakPoint = null,
         node = null,
-        breakPoint = null;
+        context = null,
+        term = new Term(context, string, node, breakPoint, variable, primitive);
 
-  context = null;
+  return term;
+}
 
-  const term = new Term(context, string, node, breakPoint, variable, primitive);
+export function termFromNominalValues(nominalValues) {
+  const { Term } = elements,
+        variable = null,
+        primitive = primitiveFromNominalValues(nominalValues),
+        string = primitive.getString(),
+        node = null,
+        breakPoint = null,
+        context = null,
+        term = new Term(context, string, node, breakPoint, variable, primitive);
 
   return term;
 }
@@ -65,22 +72,10 @@ export function termFromStringLiteral(stringLiteral, context) {
   return term;
 }
 
-export function termFromPrimitive(primitive) {
-  const { Term } = elements,
-        context = null,
-        string = primitive.getString(),
-        node = null,
-        breakPoint = null,
-        variable = null,
-        term = new Term(context, string, node, breakPoint, variable, primitive);
-
-  return term;
-}
-
 export default {
-  termFromNode,
-  termFromNodes,
   termFromBoolean,
+  termFromNominalValue,
+  termFromNominalValues,
   termFromStringLiteral,
   termFromPrimitive
 };

package/src/utilities/terms.js

@@ -2,28 +2,26 @@
 
 import elements from "../elements";
 
-import { termFromNode } from "../utilities/term";
+import { termFromNominalValue } from "../utilities/term";
 import { termsStringFromTermsArray } from "../utilities/string";
 
-export function termsFromNodes(nodes, context) {
+export function termsFromNominalValues(nominalValues) {
   const { Terms } = elements,
-        termsArray = termsArrayFromNodes(nodes, context),
+        termsArray = termsArrayFromNominalValues(nominalValues),
         termsString = termsStringFromTermsArray(termsArray),
         string = termsString, ///
         array = termsArray,  ///
         node = null,
-        breakPoint = null;
-
-  context = null;
-
-  const terms = new Terms(context, string, node, breakPoint, array);
+        breakPoint = null,
+        context = null,
+        terms = new Terms(context, string, node, breakPoint, array);
 
   return terms;
 }
 
-function termsArrayFromNodes(nodes, context) {
-  const termsArray = nodes.map((node) => {
-    const term = termFromNode(node, context);
+function termsArrayFromNominalValues(nominalValues) {
+  const termsArray = nominalValues.map((nominalValue) => {
+    const term = termFromNominalValue(nominalValue);
 
     return term;
   });

package/lib/nullNode.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-class NullNode {
-    static fromNothing() {
-        const nullNode = new NullNode();
-        return nullNode;
-    }
-}
-const nullNode = NullNode.fromNothing();
-const _default = nullNode;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9udWxsTm9kZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuY2xhc3MgTnVsbE5vZGUge1xuICBzdGF0aWMgZnJvbU5vdGhpbmcoKSB7XG4gICAgY29uc3QgbnVsbE5vZGUgPSBuZXcgTnVsbE5vZGUoKTtcblxuICAgIHJldHVybiBudWxsTm9kZTtcbiAgfVxufVxuXG5jb25zdCBudWxsTm9kZSA9IE51bGxOb2RlLmZyb21Ob3RoaW5nKCk7XG5cbmV4cG9ydCBkZWZhdWx0IG51bGxOb2RlO1xuIl0sIm5hbWVzIjpbIk51bGxOb2RlIiwiZnJvbU5vdGhpbmciLCJudWxsTm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBWUE7OztlQUFBOzs7QUFWQSxNQUFNQTtJQUNKLE9BQU9DLGNBQWM7UUFDbkIsTUFBTUMsV0FBVyxJQUFJRjtRQUVyQixPQUFPRTtJQUNUO0FBQ0Y7QUFFQSxNQUFNQSxXQUFXRixTQUFTQyxXQUFXO01BRXJDLFdBQWVDIn0=

package/src/nullNode.js

@@ -1,13 +0,0 @@
-"use strict";
-
-class NullNode {
-  static fromNothing() {
-    const nullNode = new NullNode();
-
-    return nullNode;
-  }
-}
-
-const nullNode = NullNode.fromNothing();
-
-export default nullNode;