occam-furtle 2.0.340 → 3.0.1

package/src/utilities/string.js

@@ -33,6 +33,20 @@ export function primtiveStringFromNodes(nodes, context) {
   return primtiveString;
 }
 
+export function termStringFromProperties(properties) {
+  let termString;
+
+  properties.forEach((property) => {
+    if (property !== null) {
+      const propertyString = property.getString();
+
+      termString = propertyString;  ///
+    }
+  });
+
+  return termString;
+}
+
 export function primtiveStringFromBoolean(boolean) {
   const expresssionString = `${boolean}`;
 
@@ -53,6 +67,20 @@ export function termsStringFromTermsArray(termsArray) {
   return termsString;
 }
 
+export function expressionStringFromProperties(properties) {
+  let expressionString;
+
+  properties.forEach((property) => {
+    if (property !== null) {
+      const propertyString = property.getString();
+
+      expressionString = propertyString;  ///
+    }
+  });
+
+  return expressionString;
+}
+
 export function primtiveStringFromStringLiteral(stringLiteral) {
   const string = stringFromStringLiteral(stringLiteral),
         primtiveString = string;  ///
@@ -60,26 +88,12 @@ export function primtiveStringFromStringLiteral(stringLiteral) {
   return primtiveString;
 }
 
-export function termStringFromPrimitiveAndProperties(primitive, properties) {
-  let termString;
-
-  if (false) {
-    ///
-  } else if (primitive !== null) {
-    const primitiveString = primitive.getString();
-
-    termString = primitiveString; ///
-  } else {
-    properties.forEach((property) => {
-      if (property !== null) {
-        const propertyString = property.getString();
-
-        termString = propertyString;  ///
-      }
-    });
-  }
+export function nodePropertyStringFromNameAndType(name, type) {
+  const typeString = type,  ///
+        nameString = name,  ///
+        nodePropertyString = `${typeString} ${nameString}`;
 
-  return termString;
+  return nodePropertyString;
 }
 
 export function procedureDeclarationStringFromProcedure(procedure) {
@@ -102,26 +116,18 @@ export function returnBlockStringFromReturnStatementNode(returnStatement) {
   return returnBlockString;
 }
 
-export function expressionStringFromPrimitiveAndProperties(primitive, properties) {
-  let expressionString;
+export function nodePropertiesStringFromNodePropertiesArray(nodePropertiesArray) {
+  const nodePropertiesString = nodePropertiesArray.reduce((nodePropertiesString, nodeProperty) => {
+      const nodePropertyString = nodeProperty.getString();
 
-  if (false) {
-    ///
-  } else if (primitive !== null) {
-    const primitiveString = primitive.getString();
+      nodePropertiesString = (nodePropertiesString === null) ?
+                               nodePropertyString :
+                                `${nodePropertiesString}, ${nodePropertyString}`;
 
-    expressionString = primitiveString; ///
-  } else {
-    properties.forEach((property) => {
-      if (property !== null) {
-        const propertyString = property.getString();
+      return nodePropertiesString;
+    }, null);
 
-        expressionString = propertyString;  ///
-      }
-    });
-  }
-
-  return expressionString;
+  return nodePropertiesString;
 }
 
 export function variableAssignmentStringFromTypeAndVariable(type, variable) {

package/src/utilities/term.js

@@ -8,8 +8,13 @@ export function termFromNode(node, context) {
   const { Term } = elements,
         variable = null,
         primitive = primitiveFromNode(node, context),
-        string = primitive.getString(),
-        term = new Term(string, variable, primitive);
+        string = primitive.getString();
+
+  node = null;
+
+  context = null;
+
+  const term = new Term(context, string, node, variable, primitive);
 
   return term;
 }
@@ -19,7 +24,11 @@ export function termFromNodes(nodes, context) {
         variable = null,
         primitive = primitiveFromNodes(nodes, context),
         string = primitive.getString(),
-        term = new Term(string, variable, primitive);
+        node = null;
+
+  context = null;
+
+  const term = new Term(context, string, node, variable, primitive);
 
   return term;
 }
@@ -29,7 +38,11 @@ export function termFromBoolean(boolean, context) {
         variable = null,
         primitive = primitiveFromBoolean(boolean, context),
         string = primitive.getString(),
-        term = new Term(string, variable, primitive);
+        node = null;
+
+  context = null;
+
+  const term = new Term(context, string, node, variable, primitive);
 
   return term;
 }
@@ -39,7 +52,11 @@ export function termFromStringLiteral(stringLiteral, context) {
         variable = null,
         primitive = primitiveFromStringLiteral(stringLiteral, context),
         string = primitive.getString(),
-        term = new Term(string, variable, primitive);
+        node = null;
+
+  context = null;
+
+  const term = new Term(context, string, node, variable, primitive);
 
   return term;
 }

package/src/utilities/terms.js

@@ -10,8 +10,12 @@ export function termsFromNodes(nodes, context) {
         termsArray = termsArrayFromNodes(nodes, context),
         termsString = termsStringFromTermsArray(termsArray),
         string = termsString, ///
-        array = termsArray, ///
-        terms = new Terms(string, array);
+        array = termsArray,  ///
+        node = null;
+
+  context = null;
+
+  const terms = new Terms(context, string, node, array);
 
   return terms;
 }
@@ -23,8 +27,12 @@ export function termsFromExpression(term, context) {
         ],
         termsString = termsStringFromTermsArray(termsArray),
         string = termsString, ///
-        array = termsArray, ///
-        terms = new Primitives(string, array);
+        array = termsArray,  ///
+        node = null;
+
+  context = null;
+
+  const terms = new Primitives(context, string, node, array);
 
   return terms;
 }

package/test/helpers/furtle.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { File } = require("occam-entities"),
+const { File } = require("occam-model"),
       { fileSystemUtilities } = require("necessary");
 
 const { readFile } = fileSystemUtilities;

package/test/helpers/nominal.js

@@ -1,9 +1,8 @@
 "use strict";
 
+const { NominalFileContext } = require("../../lib/index"); ///
 const { lexersUtilities, parsersUtilities } = require("occam-custom-grammars");
 
-const FileContext = require("../context/file");
-
 const { combinedCustomGrammarFromNothing } = require("../helpers/grammar");
 
 const { nominalLexerFromCombinedCustomGrammar } = lexersUtilities,
@@ -21,7 +20,7 @@ function nominalFileContextFromReleaseContext(releaseContext) {
         node = parser.parse(tokens),
         context = releaseContext, ///
         filePath = "lemmas.nml",
-        fileContext = FileContext.fromNodeTokensAndFilePath(node, tokens, filePath, context),
+        fileContext = NominalFileContext.fromFilePathNodeAndTokens(filePath, tokens, node, context),
         nominalFileContext = fileContext;  ///
 
   return nominalFileContext;

package/test/main.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const ReleaseContext = require("./context/release");
+const { ReleaseContext } = require("../lib/index"); ///
 
 const { termsFromFileContext } = require("./helpers/terms"),
       { furtleFileFromNothing } = require("./helpers/furtle"),
@@ -31,8 +31,9 @@ const free = true,
 
 // try {
 const context = fileContext,  ///
-      expression = procedure.call(terms, context),
-      boolean = expression.getBoolean();
+      term = procedure.call(terms, context),
+      primitiveValue = term.getPrimitiveValue(),
+      boolean = primitiveValue; ///
 
 console.log(boolean);
 // } catch (exception) {

package/test/context/file.js

@@ -1,127 +0,0 @@
-"use strict";
-
-const { nodeUtilities, contextUtilities } = require("../../lib/index");
-
-const { nodeAsString, nodesAsString } = nodeUtilities,
-      { chainContext, lineIndexFromNodeAndTokens } = contextUtilities;
-
-class FileContext {
-  constructor(context, filePath, lineIndex, node, tokens) {
-    this.context = context;
-    this.filePath = filePath;
-    this.lineIndex = lineIndex;
-    this.node = node;
-    this.tokens = tokens;
-
-    return chainContext(this);
-  }
-
-  getContext() {
-    return this.context;
-  }
-
-  getFilePath() {
-    return this.filePath;
-  }
-
-  getLineIndex() {
-    return this.lineIndex;
-  }
-
-  getNode() {
-    return this.node;
-  }
-
-  getTokens() {
-    return this.tokens;
-  }
-
-  getVariables() {
-    const variables = [];
-
-    return variables;
-  }
-
-  getProcedures() {
-    const procedures = [];
-
-    return procedures;
-  }
-
-  nodeAsString(node) {
-    const string = nodeAsString(node, this.tokens);
-
-    return string;
-  }
-
-  nodesAsString(nodes) {
-    const string = nodesAsString(nodes, this.tokens);
-
-    return string;
-  }
-
-  trace(message, node = null) {
-    const level = TRACE_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  debug(message, node = null) {
-    const level = DEBUG_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  info(message, node = null) {
-    const level = INFO_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  warning(message, node = null) {
-    const level = WARNING_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  error(message, node = null) {
-    const level = ERROR_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  writeToLog(level, message, node) {
-    const lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex),
-      filePath = (lineIndex === null) ?
-        this.filePath :
-        null;
-
-    this.context.writeToLog(level, message, filePath, lineIndex);
-
-    this.lineIndex = lineIndex;
-  }
-
-  getFileContext() {
-    const fileContext = this; ///
-
-    return fileContext;
-  }
-
-  getDepth() {
-    let depth = this.context.getDepth();
-
-    depth++;
-
-    return depth;
-  }
-
-  static fromNodeTokensAndFilePath(node, tokens, filePath, context) {
-    const lineIndex = null,
-          fileContext = new FileContext(context, filePath, lineIndex, node, tokens);
-
-    return fileContext;
-  }
-}
-
-module.exports = FileContext;
-

package/test/context/release.js

@@ -1,151 +0,0 @@
-"use strict";
-
-const { arrayUtilities } =require("necessary");
-
-const { Log, FileContext } =require("../../lib/index");  ///
-
-const { LEVELS } =require("../helpers/constants");
-
-const { push } = arrayUtilities,
-      [ TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL ] = LEVELS;
-
-class ReleaseContext {
-  constructor(log, files, fileContexts) {
-    this.log = log;
-    this.files = files;
-    this.fileContexts = fileContexts;
-  }
-
-  getLog() {
-    return this.log;
-  }
-
-  getFiles() {
-    return this.files;
-  }
-
-  getFileContexts() {
-    return this.fileContexts;
-  }
-
-  addFile(file) {
-    this.files.push(file);
-  }
-
-  addFileContext(fileContext) {
-    this.fileContexts.push(fileContext);
-  }
-
-  getProcedures(includeDependencies = true) {
-    const procedures = [];
-
-    this.fileContexts.forEach((fileContext) => {
-      const includeRelease = false,
-            fileContextProcedures = fileContext.getProcedures(includeRelease);
-
-      push(procedures, fileContextProcedures);
-    });
-
-    return procedures;
-  }
-
-  findFile(filePath) {
-    const file = this.files.find((file) => {
-      const filePathMatches = file.matchFilePath(filePath);
-
-      if (filePathMatches) {
-        return true;
-      }
-    }) || null;
-
-    return file;
-  }
-
-  findProcedureByName(name) {
-    const procedures = this.getProcedures(),
-          procedure = procedures.find((procedure) => {
-            const nameMatches = procedure.matchName(name);
-
-            if (nameMatches) {
-              return true;
-            }
-          }) || null;
-
-    return procedure;
-  }
-
-  isProcedurePresentByName(name) {
-    const procedure = this.findProcedureByName(name),
-          procedurePresent = (procedure !== null);
-
-    return procedurePresent;
-  }
-
-  trace(message, filePath = null, lineIndex = null) {
-    const level = TRACE_LEVEL;
-
-    this.writeToLog(level, message, filePath, lineIndex);
-  }
-
-  debug(message, filePath = null, lineIndex = null) {
-    const level = DEBUG_LEVEL
-
-    this.writeToLog(level, message, filePath, lineIndex);
-  }
-
-  info(message, filePath = null, lineIndex = null) {
-    const level = INFO_LEVEL;
-
-    this.writeToLog(level, message, filePath, lineIndex);
-  }
-
-  warning(message, filePath = null, lineIndex = null) {
-    const level = WARNING_LEVEL;
-
-    this.writeToLog(level, message, filePath, lineIndex);
-  }
-
-  error(message, filePath = null, lineIndex = null) {
-    const level = ERROR_LEVEL;
-
-    this.writeToLog(level, message, filePath, lineIndex);
-  }
-
-  writeToLog(level, message, filePath, lineIndex) {
-    this.log.write(level, message, filePath, lineIndex);
-  }
-
-  getFileContext() {
-    const fileContext = null;
-
-    return fileContext;
-  }
-
-  getDepth() {
-    const depth = -1;
-
-    return depth;
-  }
-
-  verify() {
-    this.files.forEach((file) => {
-      const context = this, ///
-            fileContext = FileContext.fromFile(file, context);
-
-      fileContext.verify();
-
-      this.fileContexts.push(fileContext);
-    });
-  }
-
-  static fromNothing() {
-    const log = Log.fromNothing(),
-          files = [],
-          fileContexts = [],
-          releaseContext = new ReleaseContext(log, files, fileContexts);
-
-    return releaseContext;
-  }
-}
-
-module.exports = ReleaseContext;

package/test/helpers/constants.js

@@ -1,17 +0,0 @@
-"use strict";
-
-const { levels } = require("necessary");
-
-const { TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL } = levels;
-
-const LEVELS = [
-  TRACE_LEVEL,
-  DEBUG_LEVEL,
-  INFO_LEVEL,
-  WARNING_LEVEL,
-  ERROR_LEVEL
-];
-
-module.exports = {
-  LEVELS
-};