fez-lisp 1.5.20 → 1.5.21

package/package.json

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

package/src/check.js

@@ -252,7 +252,7 @@ export const typeCheck = (ast) => {
     [KEYWORDS.IF]: {
       [STATS]: {
         type: APPLY,
-        [ARGS_COUNT]: new Set([2, 3]),
+        [ARGS_COUNT]: new Set([3]),
         [ARGS]: [
           [ATOM, PLACEHOLDER, PREDICATE],
           [UNKNOWN, PLACEHOLDER],

package/src/compiler.js

@@ -251,9 +251,10 @@ const comp = (tree, Drill) => {
       case KEYWORDS.NOT:
         return `(+!${comp(tail[0], Drill)})`
       case KEYWORDS.IF: {
-        return `(${comp(tail[0], Drill)}?${comp(tail[1], Drill)}:${
-          tail.length === 3 ? comp(tail[2], Drill) : 0
-        });`
+        return `(${comp(tail[0], Drill)}?${comp(tail[1], Drill)}:${comp(
+          tail[2],
+          Drill
+        )});`
       }
       case KEYWORDS.LOOP: {
         return `(()=>{while(${comp(tail[0], Drill)}){${comp(

package/src/interpreter.js

@@ -471,11 +471,11 @@ export const keywords = {
     return array.length
   },
   [KEYWORDS.IF]: (args, env) => {
-    if (args.length > 3 || args.length < 2)
+    if (args.length !== 3)
       throw new RangeError(
         `Invalid number of arguments for (${
           KEYWORDS.IF
-        }), expected (or (= 3) (= 2)) but got ${args.length}\n\n(${
+        }), expected (= 3) but got ${args.length}\n\n(${
           KEYWORDS.IF
         } ${stringifyArgs(args)})`
       )
@@ -488,11 +488,7 @@ export const keywords = {
           KEYWORDS.IF
         } ${stringifyArgs(args)})`
       )
-    return condition
-      ? evaluate(args[1], env)
-      : args.length === 3
-      ? evaluate(args[2], env)
-      : FALSE
+    return condition ? evaluate(args[1], env) : evaluate(args[2], env)
   },
   [KEYWORDS.NOT]: (args, env) => {
     if (args.length !== 1)

package/src/macros.js

@@ -362,6 +362,20 @@ export const deSuggarAst = (ast, scope) => {
                 }
                 deSuggarAst(exp, scope)
                 break
+              case KEYWORDS.IF:
+                {
+                  if (rest.length > 3 || rest.length < 2)
+                    throw new RangeError(
+                      `Invalid number of arguments for (${
+                        KEYWORDS.IF
+                      }), expected (or (= 3) (= 2)) but got ${rest.length} (${
+                        KEYWORDS.IF
+                      } ${stringifyArgs(rest)})`
+                    )
+                  if (rest.length === 2) exp.push([ATOM, FALSE])
+                }
+                deSuggarAst(exp[1], scope)
+                break
               case SUGGAR.REMAINDER_OF_DIVISION_1:
                 {
                   if (rest.length !== 2)