fez-lisp 1.5.40 → 1.5.41

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/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, '')