fez-lisp 1.4.2 → 1.4.4

package/src/keywords.js

@@ -39,7 +39,8 @@ export const KEYWORDS = {
   CALL_FUNCTION: 'apply',
   DEFINE_VARIABLE: 'let',
 
-  SET_ARRAY: 'set!'
+  SET_ARRAY: 'set!',
+  ERROR: 'throw'
 }
 
 export const TYPES = {
@@ -53,8 +54,7 @@ export const RUNTIME_TYPES = {
 }
 export const DEBUG = {
   LOG: 'log',
-  ASSERT: 'assert',
-  ERROR: 'error'
+  ASSERT: 'assert'
 }
 
 export const SPECIAL_FORMS_SET = new Set(Object.values(KEYWORDS))

package/src/utils.js

@@ -317,10 +317,10 @@ const identity = (name) => [
     [1, 'x']
   ]
 ]
-export const callStack = [KEYWORDS.CALL_FUNCTION]
+export const callStack = [KEYWORDS.BLOCK]
 export const debug = (ast) => {
   callStack.length = 0
-  callStack.push(KEYWORDS.CALL_FUNCTION)
+  callStack.push(KEYWORDS.BLOCK)
   try {
     const debugEnv = {
       ...keywords,
@@ -387,22 +387,6 @@ export const debug = (ast) => {
         } else console.log(expression)
         return expression
       },
-      [DEBUG.ERROR]: (args, env) => {
-        if (args.length !== 1)
-          throw new RangeError(
-            `Invalid number of arguments to (${DEBUG.ERROR}) (= 1 required) (${
-              DEBUG.ERROR
-            } ${stringifyArgs(args)})`
-          )
-        const expression = evaluate(args[0], env)
-        if (!Array.isArray(expression))
-          throw new TypeError(
-            `Argument of (${DEBUG.ERROR}) must be an (${
-              DEBUG.ARRAY_TYPE
-            }) but got (${expression}) (${DEBUG.ERROR} ${stringifyArgs(args)})`
-          )
-        throw new Error(expression.map((x) => String.fromCharCode(x)).join(''))
-      },
       [DEBUG.ASSERT]: (args, env) => {
         if (args.length < 2)
           throw new RangeError(
@@ -432,12 +416,12 @@ export const debug = (ast) => {
             )
           if (condition) {
             const error = args[i + 1]
-            if (error[0][TYPE] === APPLY && error[0][VALUE] === DEBUG.ERROR)
+            if (error[0][TYPE] === APPLY && error[0][VALUE] === KEYWORDS.ERROR)
               return evaluate(error, env)
             else
               throw new TypeError(
                 `Concequence of (${DEBUG.ASSERT}) must be (${
-                  DEBUG.ERROR
+                  KEYWORDS.ERROR
                 }) but got (${DEBUG.ASSERT} ${stringifyArgs(args)})`
               )
           }
@@ -451,17 +435,15 @@ export const debug = (ast) => {
       error.message.includes('Maximum call stack size exceeded') ||
       error.message.includes('too much recursion')
     if (!isMaxCallStack) {
-      error.message += `\n\nscope:\n(${callStack.at(-1)})`
+      error.message += `\n${callStack
+        .reverse()
+        .map((x, i) => `\x1b[33m${Array(i + 2).join('.')}\x1b[31m(${x} \x1b[39m...\x1b[31m)`)
+        .join('\n')}`
       throw error
     } else logError(error.message)
   }
   const block = ast[1][1]
   const temp = block.shift()
-  block.unshift(
-    temp,
-    identity(DEBUG.LOG),
-    identity(DEBUG.ERROR),
-    identity(DEBUG.ASSERT)
-  )
+  block.unshift(temp, identity(DEBUG.LOG), identity(DEBUG.ASSERT))
   return compile(ast)
 }