fez-lisp 1.6.35 → 1.6.37

package/package.json

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

package/src/debugger.js

@@ -13,10 +13,17 @@ import {
   FALSE,
   STATIC_TYPES,
   DEBUG,
-  SPECIAL_FORMS_SET
+  SPECIAL_FORMS_SET,
+  RUNTIME_TYPES
 } from './keywords.js'
 import { isLeaf, LISP } from './parser.js'
-import { definedTypes, filteredDefinedTypes, withCtxTypes } from './types.js'
+import {
+  definedTypes,
+  filteredDefinedTypes,
+  formatType,
+  SPECIAL_FORM_TYPES,
+  withCtxTypes
+} from './types.js'
 import {
   isForbiddenVariableName,
   removeNoCode,
@@ -848,6 +855,7 @@ const keywords = {
   [DEBUG.LOG]: (args, env) => evaluate(args[0], env)
 }
 const debugStack = []
+let isDebugging = false
 const evaluate = (exp, env = keywords) => {
   const [head, ...tail] = isLeaf(exp) ? [exp] : exp
   if (head == undefined) return []
@@ -861,16 +869,12 @@ const evaluate = (exp, env = keywords) => {
     case APPLY:
       res = env[value](tail, env)
       if (
+        isDebugging &&
         value !== KEYWORDS.BLOCK &&
         value !== KEYWORDS.CALL_FUNCTION &&
         value !== KEYWORDS.ANONYMOUS_FUNCTION &&
         value !== KEYWORDS.DEFINE_VARIABLE
       ) {
-        // debugStack.push(
-        //   `\x1b[31m${LISP.source(exp)}\x1b[32m\n${
-        //     typeof res === 'function' ? '(lambda)' : serialise(res)
-        //   }\x1b[0m`
-        // )
         const out = typeof res === 'function' ? '(lambda)' : LISP.serialise(res)
         if (debugStack.at(-1)?.result !== out)
           debugStack.push({
@@ -888,13 +892,17 @@ const evaluate = (exp, env = keywords) => {
 }
 export const debugStackToString = (stack) =>
   stack.map(({ source, result }) => `${source}\n${result}`).join('\n')
+const sliceStack = (debugStack, start, end) => {
+  start = start ? debugStack.findIndex(start) : 0
+  end = end ? debugStack.findIndex(end) + 1 : debugStack.length
+  return debugStack.slice(start, end)
+}
 export const startDebug = (ast, speed = 250, start, end) => {
   debugStack.length = 0
+  isDebugging = true
   try {
     evaluate(enhance(ast))
-    start = start ? debugStack.findIndex(start) : 0
-    end = end ? debugStack.findIndex(end) + 1 : debugStack.length
-    const stack = debugStack.slice(start, end)
+    const stack = sliceStack(debugStack, start, end)
     if (speed !== 0) {
       stack.reverse()
       const rec = () => {
@@ -908,9 +916,11 @@ export const startDebug = (ast, speed = 250, start, end) => {
       }
       rec()
     }
+    isDebugging = false
     return [stack, null]
   } catch (error) {
-    return [null, error]
+    isDebugging = false
+    return [sliceStack(debugStack, start, end), error]
   }
 }
 

package/src/macros.js

@@ -2,7 +2,8 @@ import { isLeaf } from './parser.js'
 import {
   EXPONENTIATION_RAW,
   INTEGER_DIVISION,
-  NOT_EQUAL
+  NOT_EQUAL,
+  EQUAL
 } from '../lib/baked/macros.js'
 import {
   APPLY,
@@ -23,6 +24,7 @@ export const SUGGAR = {
   STR_LIST: '~~',
   NOT_EQUAL_1: '!=',
   NOT_EQUAL_2: '<>',
+  EQUAL_1: '==',
   REMAINDER_OF_DIVISION_1: '%',
   UNLESS: 'unless',
   CREATE_LIST: 'list',
@@ -70,6 +72,10 @@ export const deSuggarAst = (ast, scope) => {
                 exp.length = 0
                 exp.push(...NOT_EQUAL)
                 break
+              case SUGGAR.EQUAL_1:
+                exp.length = 0
+                exp.push(...EQUAL)
+                break
               case SUGGAR.POWER:
                 exp.length = 0
                 exp.push(...EXPONENTIATION_RAW)
@@ -525,6 +531,20 @@ export const deSuggarAst = (ast, scope) => {
                   deSuggarAst(exp, scope)
                 }
                 break
+              case SUGGAR.EQUAL_1:
+                {
+                  if (rest.length !== 2)
+                    throw new RangeError(
+                      `Invalid number of arguments for (${
+                        exp[0][1]
+                      }), expected (= 2) but got ${rest.length} (${
+                        exp[0][1]
+                      } ${stringifyArgs(rest)})`
+                    )
+                  exp[0][VALUE] = KEYWORDS.EQUAL
+                  deSuggarAst(exp, scope)
+                }
+                break
               case KEYWORDS.DEFINE_VARIABLE:
                 {
                   const last = exp.at(-1)