fez-lisp 1.1.11 → 1.1.12

package/package.json

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

package/src/compiler.js

@@ -66,7 +66,6 @@ const lispToJavaScriptVariableName = (name) =>
     )
   )
 const Helpers = {
-  __string: `__string=(...args)=>{const str=args.flat();str.isString=true;return str}`,
   __add: `__add=(...numbers)=>{return numbers.reduce((a,b)=>a+b,0)}`,
   __sub: `__sub=(...numbers)=>{return numbers.reduce((a,b)=>a-b,0)}`,
   __mult: `__mult=(...numbers)=>{return numbers.reduce((a,b)=>a*b,1)}`,
@@ -95,6 +94,7 @@ const Helpers = {
     return args.at(-1) ? 1 : 0
   }`,
   logEffect: `logEffect=(msg)=>{console.log(msg);return msg}`,
+  logStringEffect: `logStringEffect=(msg)=>{console.log(msg.map(x=>String.fromCharCode(x)).join(''));return msg}`,
   clearEffect: `clearEffect=()=>{console.clear();return 0}`,
   array_cons: `array_cons=(A, ...B)=> B.reduce((a, b) => a.concat(b), A)`,
   car: 'car=(arr)=>arr.at(0)',
@@ -105,7 +105,6 @@ const Helpers = {
   numberPredicate: `numberPredicate=(number)=>+(typeof number==='number')`,
   lambdaPredicate: `lambdaPredicate=(lambda)=>+(typeof lambda==='function')`,
   arrayPredicate: `arrayPredicate=(array)=>+Array.isArray(array)`,
-  error: `error=(error)=>{throw new Error(error)}`,
   array_setEffect: `array_setEffect=(array,index,value)=>{if(index<0){const target=array.length+index;while(array.length!==target)array.pop()}else array[index] = value;return array}`
 }
 const semiColumnEdgeCases = new Set([

package/src/interpreter.js

@@ -197,11 +197,6 @@ const keywords = {
       if (evaluate(args[i], env)) return evaluate(args[i + 1], env)
     return 0
   },
-  [KEYWORDS.STRING_TYPE]: (args, env) => {
-    const str = args.flatMap((x) => evaluate(x, env))
-    str.isString = true
-    return str
-  },
   [KEYWORDS.ARRAY_TYPE]: (args, env) => {
     if (!args.length) return []
     const isCapacity =
@@ -906,15 +901,26 @@ const keywords = {
     return array
   },
   [KEYWORDS.LOG]: (args, env) => {
-    if (!args.length)
+    if (args.length !== 1)
       throw new RangeError(
-        `Invalid number of arguments to (${KEYWORDS.LOG}) (>= 1 required) (${
+        `Invalid number of arguments to (${KEYWORDS.LOG}) (= 1 required) (${
           KEYWORDS.LOG
         } ${stringifyArgs(args)})`
       )
-    const expressions = args.map((x) => evaluate(x, env))
-    console.log(...expressions)
-    return expressions.at(-1)
+    const expression = evaluate(args[0], env)
+    console.log(expression)
+    return expression
+  },
+  [KEYWORDS.LOG_STRING]: (args, env) => {
+    if (args.length !== 1)
+      throw new RangeError(
+        `Invalid number of arguments to (${
+          KEYWORDS.LOG_STRING
+        }) (= 1 required) (${KEYWORDS.LOG_STRING} ${stringifyArgs(args)})`
+      )
+    const expression = evaluate(args[0], env)
+    console.log(expression.map((x) => String.fromCharCode(x)).join(''))
+    return expression
   },
   [KEYWORDS.CLEAR_CONSOLE]: (args) => {
     if (args.length)

package/src/keywords.js

@@ -6,7 +6,6 @@ export const ATOM = 2
 export const PLACEHOLDER = '.'
 export const KEYWORDS = {
   NUMBER_TYPE: 'number',
-  STRING_TYPE: 'string',
   ARRAY_TYPE: 'array',
   ARRAY_LENGTH: 'length',
   IS_ARRAY: 'array?',
@@ -50,6 +49,7 @@ export const KEYWORDS = {
   TEST_CASE: 'case',
   TEST_BED: 'assert',
   LOG: 'log!',
+  LOG_STRING: 'log-string!',
   CLEAR_CONSOLE: 'clear!',
   SET_ARRAY: 'array:set!',
   DOC: 'fez-manual'

package/src/utils.js

@@ -12,7 +12,7 @@ export const replaceStrings = (source) => {
     for (const q of quotes)
       source = source.replaceAll(
         q,
-        `(string ${[...q]
+        `(array ${[...q]
           .slice(1, -1)
           .map((x) => x.charCodeAt(0))
           .join(' ')})`
@@ -134,7 +134,7 @@ export const handleUnbalancedQuotes = (source) => {
 }
 export const removeMutation = (source) => source.replace(new RegExp(/!/g), 'ǃ')
 export const treeShake = (ast, libs) => {
-  const deps = libs.reduce((a, x) => a.add(x.at(1)[VALUE]), new Set())
+  const deps = libs.reduce((a, x) => a.set(x.at(1)[VALUE], x), new Map())
   const visited = new Set()
   const dfs = (tree) => {
     if (!isLeaf(tree)) tree.forEach(dfs)
@@ -145,13 +145,14 @@ export const treeShake = (ast, libs) => {
     ) {
       visited.add(tree[VALUE])
       // Recursively explore the dependencies of the current node
-      const dependency = libs.find((x) => x.at(1)[VALUE] === tree[VALUE])
+      const dependency = deps.get(tree[VALUE])
       if (dependency) dfs(dependency.at(-1))
     }
   }
   dfs(ast)
   // Filter out libraries that are not in the visited set
-  return libs.filter((x) => visited.has(x.at(1)[VALUE]))
+  // return libs.filter((x) => visited.has(x.at(1)[VALUE]))
+  return [...visited].reverse().map((x) => deps.get(x))
 }
 export const dfs = (tree, callback) => {
   if (!isLeaf(tree)) for (const leaf of tree) dfs(leaf)