fez-lisp 1.1.1 → 1.1.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "fez-lisp",
   "description": "Lisp interpreted & compiled to JavaScript",
   "author": "AT290690",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "module",
   "main": "index.js",
   "keywords": [

package/src/compiler.js

@@ -8,7 +8,63 @@ import {
   WORD
 } from './keywords.js'
 import { leaf, isLeaf } from './parser.js'
-import { deepRename, lispToJavaScriptVariableName } from './utils.js'
+import { deepRename } from './utils.js'
+const earMuffsToLodashes = (name) => name.replace(new RegExp(/\*/g), '_')
+const dotNamesToEmpty = (name) => name.replace(new RegExp(/\./g), '')
+const commaToLodash = (name) => name.replace(new RegExp(/\,/g), '_')
+const arrowFromTo = (name) => name.replace(new RegExp(/->/g), '-to-')
+const moduleNameToLodashes = (name) => name.replace(new RegExp(/:/g), '_')
+const questionMarkToPredicate = (name) =>
+  name.replace(new RegExp(/\?/g), 'Predicate')
+const exclamationMarkMarkToEffect = (name) =>
+  name.replace(new RegExp(/\!/g), 'Effect')
+const toCamelCase = (name) => {
+  let out = name[0]
+  for (let i = 1; i < name.length; ++i) {
+    const current = name[i],
+      prev = name[i - 1]
+    if (current === '-') continue
+    else if (prev === '-') out += current.toUpperCase()
+    else out += current
+  }
+  return out
+}
+const keywordToHelper = (name) => {
+  switch (name) {
+    case KEYWORDS.ADDITION:
+      return '__add'
+    case KEYWORDS.MULTIPLICATION:
+      return '__mult'
+    case KEYWORDS.SUBTRACTION:
+      return '__sub'
+    case KEYWORDS.GREATHER_THAN:
+      return '__gt'
+    case KEYWORDS.EQUAL:
+      return '__eq'
+    case KEYWORDS.GREATHER_THAN_OR_EQUAL:
+      return '__gteq'
+    case KEYWORDS.LESS_THAN:
+      return '__lt'
+    case KEYWORDS.LESS_THAN_OR_EQUAL:
+      return '__lteq'
+    default:
+      return name
+  }
+}
+const lispToJavaScriptVariableName = (name) =>
+  toCamelCase(
+    arrowFromTo(
+      dotNamesToEmpty(
+        exclamationMarkMarkToEffect(
+          questionMarkToPredicate(
+            commaToLodash(
+              moduleNameToLodashes(earMuffsToLodashes(keywordToHelper(name)))
+            )
+          )
+        )
+      )
+    )
+  )
 const Helpers = {
   __string: `__string=(...args)=>{const str=args.flat();str.isString=true;return str}`,
   __add: `__add=(...numbers)=>{return numbers.reduce((a,b)=>a+b,0)}`,
@@ -309,10 +365,7 @@ const compile = (tree, Drill) => {
         return `${camelCased}(${parseArgs(Arguments, Drill)});`
       }
     }
-  } else if (first[TYPE] === ATOM)
-    return typeof first[VALUE] === 'string'
-      ? `\`${first[VALUE]}\``
-      : first[VALUE]
+  } else if (first[TYPE] === ATOM) return first[VALUE]
   else if (first[TYPE] === WORD) {
     const camelCased = lispToJavaScriptVariableName(token)
     if (camelCased in Helpers) Drill.Helpers.add(camelCased)

package/src/utils.js

@@ -204,51 +204,6 @@ export const fez = (source, options = {}) => {
     return err
   }
 }
-
-export const earMuffsToLodashes = (name) => name.replace(new RegExp(/\*/g), '_')
-export const dotNamesToEmpty = (name) => name.replace(new RegExp(/\./g), '')
-export const colonNamesTo$ = (name) => name.replace(new RegExp(/\:/g), '$')
-export const commaToLodash = (name) => name.replace(new RegExp(/\,/g), '_')
-export const arrowFromTo = (name) => name.replace(new RegExp(/->/g), '-to-')
-export const moduleNameToLodashes = (name) =>
-  name.replace(new RegExp(/:/g), '_')
-export const questionMarkToLodash = (name) =>
-  name.replace(new RegExp(/\?/g), 'Predicate')
-export const exclamationMarkMarkToLodash = (name) =>
-  name.replace(new RegExp(/\!/g), 'Effect')
-export const toCamelCase = (name) => {
-  let out = name[0]
-  for (let i = 1; i < name.length; ++i) {
-    const current = name[i],
-      prev = name[i - 1]
-    if (current === '-') continue
-    else if (prev === '-') out += current.toUpperCase()
-    else out += current
-  }
-  return out
-}
-export const keywordToHelper = (name) => {
-  switch (name) {
-    case KEYWORDS.ADDITION:
-      return '__add'
-    case KEYWORDS.MULTIPLICATION:
-      return '__mult'
-    case KEYWORDS.SUBTRACTION:
-      return '__sub'
-    case KEYWORDS.GREATHER_THAN:
-      return '__gt'
-    case KEYWORDS.EQUAL:
-      return '__eq'
-    case KEYWORDS.GREATHER_THAN_OR_EQUAL:
-      return '__gteq'
-    case KEYWORDS.LESS_THAN:
-      return '__lt'
-    case KEYWORDS.LESS_THAN_OR_EQUAL:
-      return '__lteq'
-    default:
-      return name
-  }
-}
 export const deepRename = (name, newName, tree) => {
   if (!isLeaf(tree))
     for (const leaf of tree) {
@@ -296,19 +251,3 @@ export const tree = (source, std) =>
   std
     ? shake(LISP.parse(removeNoCode(source)), std)
     : LISP.parse(removeNoCode(source))
-export const lispToJavaScriptVariableName = (name) =>
-  toCamelCase(
-    arrowFromTo(
-      dotNamesToEmpty(
-        colonNamesTo$(
-          exclamationMarkMarkToLodash(
-            questionMarkToLodash(
-              commaToLodash(
-                moduleNameToLodashes(earMuffsToLodashes(keywordToHelper(name)))
-              )
-            )
-          )
-        )
-      )
-    )
-  )