fez-lisp 1.2.9 → 1.2.11

package/package.json

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

package/src/compiler.js

@@ -144,7 +144,7 @@ const compile = (tree, Drill) => {
           return `(${Arguments.map((x) =>
             (compile(x, Drill) ?? '').toString().trim()
           )
-            .filter(Boolean)
+            .filter((x) => x !== undefined)
             .join(',')});`
         } else {
           const res = compile(Arguments[0], Drill)
@@ -246,19 +246,13 @@ const compile = (tree, Drill) => {
               .map((x) => (typeof x === 'number' && x < 0 ? ` ${x}` : x))
               .join(token)});`
       case KEYWORDS.MULTIPLICATION:
-        return Arguments.length
-          ? `(${parseArgs(Arguments, Drill, token)});`
-          : `(1);`
+        return `(${parseArgs(Arguments, Drill, token)});`
       case KEYWORDS.DIVISION:
-        return Arguments.length
-          ? Arguments.length === 1
-            ? `(1/${compile(Arguments[0], Drill)});`
-            : `(${parseArgs(Arguments, Drill, token)});`
-          : `(0);`
+        return Arguments.length === 1
+          ? `(1/${compile(Arguments[0], Drill)});`
+          : `(${parseArgs(Arguments, Drill, token)});`
       case KEYWORDS.ADDITION:
-        return Arguments.length
-          ? `(${parseArgs(Arguments, Drill, token)});`
-          : `(0);`
+        return `(${parseArgs(Arguments, Drill, token)});`
       case KEYWORDS.BITWISE_AND:
       case KEYWORDS.BITWISE_OR:
       case KEYWORDS.BITWISE_XOR:
@@ -317,7 +311,7 @@ export const comp = (ast) => {
   const Drill = { Variables: new Set(), Helpers: new Set() }
   const raw = ast
     .map((tree) => compile(tree, Drill))
-    .filter(Boolean)
+    .filter((x) => x !== undefined)
     .join('\n')
   let program = ''
   for (let i = 0; i < raw.length; ++i) {

package/src/interpreter.js

@@ -41,7 +41,6 @@ const keywords = {
     return a % b
   },
   [KEYWORDS.DIVISION]: (args, env) => {
-    if (!args.length) return 0
     if (args.length === 1) {
       const number = evaluate(args[0], env)
       if (typeof number !== 'number')
@@ -103,7 +102,6 @@ const keywords = {
     return +(typeof evaluate(args[0], env) === 'number')
   },
   [KEYWORDS.ADDITION]: (args, env) => {
-    if (!args.length) return 0 // identity
     if (args.length < 2)
       throw new RangeError(
         `Invalid number of arguments for (${
@@ -122,7 +120,6 @@ const keywords = {
     return operands.reduce((a, b) => a + b)
   },
   [KEYWORDS.MULTIPLICATION]: (args, env) => {
-    if (!args.length) return 1 // identity
     if (args.length < 2)
       throw new RangeError(
         `Invalid number of arguments for (${KEYWORDS.MULTIPLICATION}), expected (or (> 1) (= 0)) but got ${args.length}.`
@@ -885,6 +882,19 @@ export const deSuggar = (ast) => {
                   deSuggar(exp)
                 }
                 break
+              case KEYWORDS.MULTIPLICATION:
+                if (!rest.length) {
+                  exp[0][0] = 2
+                  exp[0][1] = 1
+                }
+                break
+              case KEYWORDS.ADDITION:
+              case KEYWORDS.DIVISION:
+                if (!rest.length) {
+                  exp[0][0] = 2
+                  exp[0][1] = 0
+                }
+                break
               case KEYWORDS.UNLESS:
                 {
                   if (rest.length > 3 || rest.length < 2)