fez-lisp 1.3.4 → 1.3.6

package/package.json

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

package/src/interpreter.js

@@ -147,20 +147,26 @@ export const keywords = {
     return a % b
   },
   [KEYWORDS.BITWISE_AND]: (args, env) => {
-    if (args.length < 2)
+    if (args.length !== 2)
       throw new RangeError(
         `Invalid number of arguments to (${
           KEYWORDS.BITWISE_AND
         }) (= 2 required). (${KEYWORDS.BITWISE_AND} ${stringifyArgs(args)})`
       )
-    const operands = args.map((a) => evaluate(a, env))
-    if (operands.some((x) => typeof x !== 'number'))
+    if (typeof a !== 'number')
+      throw new TypeError(
+        `First arguments of (${KEYWORDS.BITWISE_AND}) is not a (${
+          RUNTIME_TYPES.NUMBER
+        }) (${KEYWORDS.BITWISE_AND} ${stringifyArgs(args)})`
+      )
+    const b = evaluate(args[1], env)
+    if (typeof b !== 'number')
       throw new TypeError(
-        `Not all arguments of (${KEYWORDS.BITWISE_AND}) are ${
+        `Second arguments of (${KEYWORDS.BITWISE_AND}) is not a (${
           RUNTIME_TYPES.NUMBER
-        } (${KEYWORDS.BITWISE_AND} ${stringifyArgs(args)})`
+        }) (${KEYWORDS.BITWISE_AND} ${stringifyArgs(args)})`
       )
-    return operands.reduce((acc, x) => acc & x)
+    return a & b
   },
   [KEYWORDS.BITWISE_NOT]: (args, env) => {
     if (args.length !== 1)
@@ -393,7 +399,7 @@ export const keywords = {
       ? evaluate(args[1], env)
       : args.length === 3
       ? evaluate(args[2], env)
-      : 0
+      : FALSE
   },
   [KEYWORDS.NOT]: (args, env) => {
     if (args.length !== 1)
@@ -547,7 +553,7 @@ export const keywords = {
           KEYWORDS.OR
         } ${stringifyArgs(args)})`
       )
-    if (!a) return 0
+    if (!a) return FALSE
     const b = evaluate(args[1], env)
     if (b !== FALSE && b !== TRUE)
       throw new TypeError(
@@ -571,7 +577,7 @@ export const keywords = {
           KEYWORDS.OR
         } ${stringifyArgs(args)})`
       )
-    if (a) return 1
+    if (a) return TRUE
     const b = evaluate(args[1], env)
     if (b !== FALSE && b !== TRUE)
       throw new TypeError(
@@ -668,7 +674,7 @@ export const keywords = {
           KEYWORDS.BLOCK
         } ${stringifyArgs(args)})`
       )
-    return args.reduce((_, x) => evaluate(x, env), 0)
+    return args.reduce((_, x) => evaluate(x, env), FALSE)
   },
   [KEYWORDS.IS_ATOM]: (args, env) => {
     if (args.length !== 1)