occam-furtle 2.0.331 → 2.0.335

package/src/utilities/primitive.js

@@ -2,17 +2,16 @@
 
 import elements from "../elements";
 
+import { NODE_TYPE, NODES_TYPE, STRING_TYPE, BOOLEAN_TYPE } from "../types";
 import { primtiveStringFromNode, primtiveStringFromNodes, primtiveStringFromBoolean, primtiveStringFromStringLiteral } from "../utilities/string";
 
 export function primitiveFromNode(node, context) {
   const { Primitive } = elements,
         primitiveString = primtiveStringFromNode(node, context),
         string = primitiveString,  ///
-        nodes = null,
-        number = null,
-        boolean = null,
-        stringLiteral = null,
-        primitive = new Primitive(string, node, nodes, number, boolean, stringLiteral);
+        type = NODE_TYPE,
+        value = node, ///
+        primitive = new Primitive(string, type, value);
 
   return primitive;
 }
@@ -21,11 +20,9 @@ export function primitiveFromNodes(nodes, context) {
   const { Primitive } = elements,
         primitiveString = primtiveStringFromNodes(nodes, context),
         string = primitiveString,  ///
-        node = null,
-        number = null,
-        boolean = null,
-        stringLiteral = null,
-        primitive = new Primitive(string, node, nodes, number, boolean, stringLiteral);
+        type = NODES_TYPE,
+        value = nodes,  ///
+        primitive = new Primitive(string, type, value);
 
   return primitive;
 }
@@ -34,11 +31,9 @@ export function primitiveFromBoolean(boolean, context) {
   const { Primitive } = elements,
         primitiveString = primtiveStringFromBoolean(boolean),
         string = primitiveString,  ///
-        node = null,
-        nodes = null,
-        number = null,
-        stringLiteral = null,
-        primitive = new Primitive(string, node, nodes, number, boolean, stringLiteral);
+        type = BOOLEAN_TYPE,
+        value = boolean,  ///
+        primitive = new Primitive(string, type, value);
 
   return primitive;
 }
@@ -47,11 +42,9 @@ export function primitiveFromStringLiteral(stringLiteral, context) {
   const { Primitive } = elements,
         primitiveString = primtiveStringFromStringLiteral(stringLiteral),
         string = primitiveString,  ///
-        node = null,
-        nodes = null,
-        number = null,
-        boolean = null,
-        primitive = new Primitive(string, node, nodes, number, boolean, stringLiteral);
+        type = STRING_TYPE,
+        value = stringLiteral,  ///
+        primitive = new Primitive(string, type, value);
 
   return primitive;
 }

package/src/utilities/string.js

@@ -5,6 +5,13 @@ import nullNode from "../nullNode";
 import { NULL } from "../constants";
 import { stringFromStringLiteral } from "./stringLiteral";
 
+export function ternaryStringFromTerm(term) {
+  const termString = term.getString(),
+        ternaryString = `if (${termString}) { ... } else { ... }`;
+
+  return ternaryString;
+}
+
 export function variableStringFromName(name) {
   const variableString = name;  ///
 
@@ -53,12 +60,26 @@ export function primtiveStringFromStringLiteral(stringLiteral) {
   return primtiveString;
 }
 
-export function variableAssignmentStringFromVariable(expression, variable) {
-  const type = variable.getType(),
-        variableString = variable.getString(),
-        variableAssignmentString = `${type} ${variableString} = ... ;`;
+export function termStringFromPrimitiveAndProperties(primitive, properties) {
+  let termString;
 
-  return variableAssignmentString;
+  if (false) {
+    ///
+  } else if (primitive !== null) {
+    const primitiveString = primitive.toString();
+
+    termString = primitiveString; ///
+  } else {
+    properties.forEach((property) => {
+      if (property !== null) {
+        const propertyString = property.getString();
+
+        termString = propertyString;  ///
+      }
+    });
+  }
+
+  return termString;
 }
 
 export function procedureDeclarationStringFromProcedure(procedure) {
@@ -103,6 +124,13 @@ export function expressionStringFromPrimitiveAndProperties(primitive, properties
   return expressionString;
 }
 
+export function variableAssignmentStringFromTypeAndVariable(type, variable) {
+  const variableString = variable.getString(),
+        variableAssignmentString = `${type} ${variableString} = ... ;`;
+
+  return variableAssignmentString;
+}
+
 export function someStringFromVariableAndAnonymousProcedure(variable, anonymousProcedure) {
   const variableString = variable.getString(),
         anonymousProcedureString = anonymousProcedure.getString(),
@@ -137,27 +165,29 @@ export function procedureStringFromTypeLabelParametersAndReturnBlock(type, label
   return procedureString;
 }
 
-export function variableAssignmentStringFromVariableAssignmentsArray(variableAssignmentsArray) {
-  const variableAssignmentsString = variableAssignmentsArray.reduce((variableAssignmentsString, variableAssignment) => {
+export function anonymousProcedureStringFromTypeParametersAndReturnBlock(type, parameters, returnBlock) {
+  const typeString = type,  ///
+        parametersString = parameters.getString(),
+        returnBlockString = returnBlock.getString(),
+        anonymousProcedureString = `${typeString} (${parametersString}) ${returnBlockString}`;
+
+  return anonymousProcedureString;
+}
+
+export function variableAssignmentStringFromTypeAndVariableAssignmentsArray(type, variableAssignmentsArray) {
+  let variableAssignmentsString = variableAssignmentsArray.reduce((variableAssignmentsString, variableAssignment) => {
     const variableAssignmentString = variableAssignmentStringFromVariableAssignment(variableAssignment);
 
     variableAssignmentsString = (variableAssignmentsString === null) ?
-                                  variableAssignmentString :
-                                   `${variableAssignmentsString}, ${variableAssignmentString}`;
+      variableAssignmentString :
+      `${variableAssignmentsString}, ${variableAssignmentString}`;
 
     return variableAssignmentsString;
   }, null); ///
 
-  return variableAssignmentsString;
-}
+  variableAssignmentsString = `${type} ${variableAssignmentsString}`; ///
 
-export function anonymousProcedureStringFromTypeParametersAndReturnBlock(type, parameters, returnBlock) {
-  const typeString = type,  ///
-        parametersString = parameters.getString(),
-        returnBlockString = returnBlock.getString(),
-        anonymousProcedureString = `${typeString} (${parametersString}) ${returnBlockString}`;
-
-  return anonymousProcedureString;
+  return variableAssignmentsString;
 }
 
 export function reduceStringFromVariableInitialExpressionAndAnonymousProcedure(variable, initialExpression, anonymousProcedure) {

package/test/main.js

@@ -40,116 +40,3 @@ console.log(boolean);
 //
 //   console.log(message);
 // }
-
-/*
-That's fine. I've come across this problem before. It's simple enough to set a flag, in fact, or, as you say, simply detect whether or not a debugger is being used.
-
-
-
-You've mentioned imports so let's cover that off.
-
-
-
-I have the source code in a src/ directory and this gets transpiled to a lib/d directory. I run my tests in a test/ directory and, because I'm running them directly on Node, I have never switched over to ES6 import syntax and use require() calls in the old-fashioned way.
-
-
-
-You can see my test here to give you an idea:
-
-
-
-+++
-
-
-
-"use strict";
-
-
-
-const ReleaseContext = require("./context/release");
-
-
-
-const { termsFromFileContext } = require("./helpers/terms"),
-
-      { furtleFileFromNothing } = require("./helpers/furtle"),
-
-      { procedureFromReleaseContext } = require("./helpers/procedure"),
-
-      { nominalFileContextFromReleaseContext } = require("./helpers/nominal");
-
-
-
-let fileContext,
-
-    releaseContext;
-
-
-
-releaseContext = ReleaseContext.fromNothing();
-
-
-
-const furtleFile = furtleFileFromNothing(),
-
-      file = furtleFile;  ///
-
-
-
-releaseContext.addFile(file);
-
-
-
-releaseContext.verify();
-
-
-
-const nominalFileContext = nominalFileContextFromReleaseContext(releaseContext);
-
-
-
-fileContext = nominalFileContext; ///
-
-
-
-releaseContext.addFileContext(fileContext);
-
-
-
-const free = true,
-
-      terms = termsFromFileContext(fileContext, free),
-
-      procedure = procedureFromReleaseContext(releaseContext);
-
-
-
-// try {
-
-const context = fileContext,  ///
-
-      expression = procedure.call(terms, context),
-
-      boolean = expression.getBoolean();
-
-
-
-console.log(boolean);
-
-// } catch (exception) {
-
-//   const message = exception.getMessage();
-
-//
-
-//   console.log(message);
-
-// }
-
-
-
-+++
-
-
-
- */