fez-lisp 1.1.6 → 1.1.7

package/README.md

@@ -113,7 +113,7 @@ npm i fez-lisp
 
 ```js
 import { fez } from 'fez-lisp'
-fez(`(log! "Hello World!")`, { strings: true }) // Hello World!
+fez(`(log! "Hello World!")`) // Hello World!
 ```
 
 ```js

package/package.json

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

package/src/evaluator.js

@@ -13,7 +13,7 @@ export const evaluate = (exp, env) => {
         throw new ReferenceError(`Undefined variable ${first[VALUE]}`)
       return word
     }
-    case APPLY:
+    case APPLY: {
       const apply = env[first[VALUE]]
       if (apply == undefined)
         throw new ReferenceError(
@@ -24,6 +24,7 @@ export const evaluate = (exp, env) => {
           `${first[VALUE]} is not a (${KEYWORDS.ANONYMOUS_FUNCTION})`
         )
       return apply(rest, env)
+    }
     case ATOM:
       return first[VALUE]
     default:

package/src/interpreter.js

@@ -1,6 +1,6 @@
 import std from '../lib/baked/std.js'
 import { TYPE, VALUE, WORD, KEYWORDS, APPLY } from './keywords.js'
-import { evaluate, isAtom } from './evaluator.js'
+import { evaluate } from './evaluator.js'
 import { LISP } from './parser.js'
 import {
   isEqual,

package/src/keywords.js

@@ -1,13 +1,9 @@
-// AST enums
 export const TYPE = 0
 export const VALUE = 1
-
 export const APPLY = 0
 export const WORD = 1
 export const ATOM = 2
-// tokeniser enums
 export const PLACEHOLDER = '.'
-// keywords aliases
 export const KEYWORDS = {
   NUMBER_TYPE: 'number',
   STRING_TYPE: 'string',

package/src/utils.js

@@ -18,6 +18,7 @@ export const replaceStrings = (source) => {
       )
   return source
 }
+export const replaceQuotes = (source) => source.replaceAll(/\'\(/g, '(array ')
 export const removeNoCode = (source) =>
   source
     .replace(/;.+/g, '')
@@ -72,9 +73,7 @@ export const stringifyArgs = (args) =>
 export const isForbiddenVariableName = (name) => {
   switch (name) {
     case '_':
-    case KEYWORDS.CAST_TYPE:
     case KEYWORDS.DEFINE_VARIABLE:
-      // case KEYWORDS.DESTRUCTURING_ASSIGMENT:
       return true
     default:
       return false
@@ -163,7 +162,7 @@ export const fez = (source, options = {}) => {
   const env = Object.create(null)
   try {
     if (typeof source === 'string') {
-      if (options.strings) source = replaceStrings(source)
+      source = replaceQuotes(replaceStrings(source))
       let code
       if (!options.compile)
         code = handleUnbalancedQuotes(
@@ -249,5 +248,8 @@ export const decompress = (raw) => {
 export const shake = (parsed, std) => [...treeShake(parsed, std), ...parsed]
 export const tree = (source, std) =>
   std
-    ? shake(LISP.parse(removeNoCode(source)), std)
-    : LISP.parse(removeNoCode(source))
+    ? shake(
+        LISP.parse(replaceQuotes(replaceStrings(removeNoCode(source)))),
+        std
+      )
+    : LISP.parse(replaceQuotes(replaceStrings(removeNoCode(source))))