fez-lisp 1.4.7 → 1.4.8

package/index.js

@@ -1,4 +1,5 @@
 import { evaluate } from './src/evaluator.js'
 import { compile } from './src/compiler.js'
 import { debug, parse } from './src/utils.js'
-export { parse, evaluate, compile, debug }
+import { LISP, AST } from './src/parser.js'
+export { parse, evaluate, compile, debug, LISP, AST }

package/package.json

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

package/src/macros.js

@@ -645,26 +645,6 @@ const iron = (scope) => {
     for (let i = 0; i < copy.length; ++i) scope[i] = copy[i]
   }
 }
-const iron2 = (scope, exp) => {
-  const key = AST.stringify(exp)
-  const indexes = new Set(
-    scope
-      .map((x, i) => (AST.stringify(x) === key ? i : -1))
-      .filter((x) => x !== -1)
-  )
-  console.log(indexes)
-  if (indexes.size) {
-    const copy = []
-    for (let i = 0; i < scope.length; ++i) {
-      if (indexes.has(i)) {
-        copy.push(...scope[i][0])
-      } else {
-        copy.push(scope[i])
-      }
-    }
-    for (let i = 0; i < copy.length; ++i) scope[i] = copy[i]
-  }
-}
 export const replaceQuotes = (source) =>
   source
     .replaceAll(/\[/g, `(${KEYWORDS.CREATE_ARRAY} `)

package/src/utils.js

@@ -13,7 +13,7 @@ import {
   WORD
 } from './keywords.js'
 import { evaluate } from './evaluator.js'
-import { AST, isLeaf, LISP } from './parser.js'
+import { isLeaf, LISP } from './parser.js'
 import {
   deSuggarAst,
   deSuggarSource,
@@ -259,6 +259,7 @@ export const ast = (source, deps) =>
   )
 
 export const astWithStd = (source) => wrapInBlock(shake(prep(source), std))
+export const unwrapped = (source) => shake(prep(source), std)
 export const parse = (source) =>
   wrapInBlock(
     shake(
@@ -284,28 +285,7 @@ const identity = (name) => [
     [1, 'x']
   ]
 ]
-// export const result = (ast) => {
-//   try {
-//     return { output: evaluate(ast, keywords), error: null }
-//   } catch (error) {
-//     const isMaxCallStack =
-//       error.message.includes('Maximum call stack size exceeded') ||
-//       error.message.includes('too much recursion')
-//     return {
-//       output: null,
-//       error: {
-//         stack: [...callStack],
-//         message: isMaxCallStack
-//           ? error
-//           : `${error}\n${callStack
-//               .reverse()
-//               .map((x, i) => `${Array(i + 2).join(' ')}(${x} ...)`)
-//               .join('\n')}`
-//       }
-//     }
-//   }
-// }
-export const debug = (ast) => {
+export const debug = (ast, onSuccess = compile) => {
   const debugEnv = {
     ...keywords,
     [DEBUG.CALLSTACK]: [KEYWORDS.BLOCK],
@@ -421,7 +401,7 @@ export const debug = (ast) => {
     block.unshift(temp, identity(DEBUG.LOG), identity(DEBUG.ASSERT))
     return {
       evaluated,
-      compiled: compile(ast),
+      compiled: onSuccess(ast),
       error: null
     }
   } catch (error) {