fez-lisp 1.5.40 → 1.5.42

package/src/compiler.js

@@ -145,8 +145,6 @@ const comp = (tree, Drill) => {
   if (isLeaf(tree)) head = tree
   else {
     head = tree[0]
-    if (head == undefined) return '[];'
-
     tail = tree.slice(1)
   }
   const token = head[VALUE]

package/src/evaluator.js

@@ -16,7 +16,6 @@ export const evaluate = (exp, env = keywords) => {
   if (isLeaf(exp)) head = exp
   else {
     head = exp[0]
-    if (head == undefined) return []
     tail = exp.slice(1)
   }
   const value = head[VALUE]

package/src/macros.js

@@ -16,7 +16,7 @@ import {
   VALUE,
   WORD
 } from './keywords.js'
-import { hasBlock, stringifyArgs } from './utils.js'
+import { getSuffix, hasBlock, stringifyArgs } from './utils.js'
 export const SUGGAR = {
   // Syntactic suggars
   PIPE: '|>',
@@ -524,7 +524,7 @@ export const deSuggarAst = (ast, scope) => {
                     const name = exp[1][VALUE]
                     const prefix = name.split(':')[0]
                     if (prefix === OPTIMIZATIONS.RECURSION) {
-                      if (name[name.length - 1] === PREDICATE_SUFFIX) {
+                      if (getSuffix(name) === PREDICATE_SUFFIX) {
                         throw new TypeError(
                           `Optimized (lambda) ${name} can't be a (Predicate) as it will return a (lambda). Remove the (${PREDICATE_SUFFIX}) from the name`
                         )
@@ -625,7 +625,7 @@ export const deSuggarAst = (ast, scope) => {
                       ]
                       deSuggarAst(exp[exp.length - 1])
                     } else if (prefix === OPTIMIZATIONS.CACHE) {
-                      if (name[name.length - 1] === PREDICATE_SUFFIX) {
+                      if (getSuffix(name) === PREDICATE_SUFFIX) {
                         throw new TypeError(
                           `Optimized (lambda) ${name} can't be a (Predicate) as it will return a (lambda). Remove the (${PREDICATE_SUFFIX}) from the name`
                         )

package/src/parser.js

@@ -1,7 +1,6 @@
 import { APPLY, ATOM, TYPE, WORD, VALUE } from './keywords.js'
 export const leaf = (type, value) => [type, value]
 export const isLeaf = ([car]) => car === APPLY || car === ATOM || car === WORD
-export const toPair = (exp) => []
 export const LISP = {
   parse: (source) => {
     const tree = []
@@ -30,14 +29,13 @@ export const LISP = {
     return tree
   },
   stringify: (array) => {
-    if (array == undefined) return '()'
-    else if (typeof array === 'function') return '(lambda)'
+    if (typeof array === 'function') return '(lambda)'
     else if (typeof array === 'boolean') return +array
     else if (typeof array === 'object')
       if (Array.isArray(array))
         return array.length
           ? `(array ${array.map(LISP.stringify).join(' ')})`
-          : '()'
+          : '(array)'
       else
         return `(array ${array
           .map(([key, value]) => `("${key}" ${LISP.stringify(value)})`)
@@ -48,7 +46,6 @@ export const LISP = {
     const dfs = (exp) => {
       let out = ''
       const [head, ...tail] = isLeaf(exp) ? [exp] : exp
-      if (head == undefined) return (out += '(array)')
       switch (head[TYPE]) {
         case WORD:
           out += head[VALUE]
@@ -110,9 +107,6 @@ export const AST = {
     const dfs = (exp) => {
       let out = ''
       const [head, ...tail] = isLeaf(exp) ? [exp] : exp
-      if (head == undefined)
-        return (out +=
-          '(Expression::Apply(vec![Expression::Word("array".to_string())]))')
       switch (head[TYPE]) {
         case WORD:
           out += `Expression::Word("${head[VALUE]}".to_string())`

package/src/utils.js

@@ -19,6 +19,7 @@ export const formatCallstack = (callstack) =>
 export const formatErrorWithCallstack = (error, callstack) => {
   return `${error.message}\n${formatCallstack(callstack)}`
 }
+export const getSuffix = (str) => str[str.length - 1]
 export const removeNoCode = (source) =>
   source
     .replace(/(;.+|;)/g, '')