fez-lisp 1.2.46 → 1.2.48

package/README.md

@@ -206,10 +206,12 @@ and only when compiled to JavaScript.
 
 ```js
 console.log(
-  fez(
-    `(let recursive:sum-to (lambda n acc (if (= n 0) acc (recursive:sum-to (- n 1) (+ n acc)))))
+  eval(
+    fez(
+      `(let recursive:sum-to (lambda n acc (if (= n 0) acc (recursive:sum-to (- n 1) (+ n acc)))))
 (recursive:sum-to 10000 0)`,
-    { compile: 1, eval: 1 }
+      { compile: 1 }
+    )
   )
 )
 // 50005000

package/package.json

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

package/src/utils.js

@@ -8,13 +8,13 @@ export const logError = (error) =>
 export const logSuccess = (output) => console.log(output, '\x1b[0m')
 export const replaceStrings = (source) => {
   // const quotes = source.match(/"(.*?)"/g)
-  const quotes = source.match(/"(?:.*?\n)*?.*?"/g)
+  const quotes = source.match(/"(?:.*?(\n|\r))*?.*?"/g)
   // TODO handle escaping
   if (quotes)
     for (const q of quotes)
       source = source.replaceAll(
         q,
-        `(array ${[...q]
+        `(array ${[...q.replaceAll('\r', '')]
           .slice(1, -1)
           .map((x) => x.charCodeAt(0))
           .join(' ')})`
@@ -247,7 +247,7 @@ export const fez = (source, options = {}) => {
       // if (options.check) typeCheck(ast)
       if (options.compile) {
         const js = Object.values(comp(deepClone(ast))).join('')
-        return options.eval ? eval(js) : js
+        return js
       }
       return run(ast, env)
     } else if (Array.isArray(source)) {
@@ -256,7 +256,7 @@ export const fez = (source, options = {}) => {
         : source
       if (options.compile) {
         const js = Object.values(comp(deepClone(ast))).join('')
-        return options.eval ? eval(js) : js
+        return js
       }
       return run(ast, env)
     } else {