fez-lisp 1.5.20 → 1.5.22

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.22",
   "type": "module",
   "main": "index.js",
   "keywords": [

package/src/check.js

@@ -117,7 +117,7 @@ export const typeCheck = (ast) => {
     [KEYWORDS.SUBTRACTION]: {
       [STATS]: {
         type: APPLY,
-        [ARGS_COUNT]: new Set([1, 2]),
+        [ARGS_COUNT]: new Set([2]),
         [ARGS]: [
           [ATOM, PLACEHOLDER],
           [ATOM, PLACEHOLDER]
@@ -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

@@ -88,7 +88,7 @@ const lispToJavaScriptVariableName = (name) =>
   )
 const Helpers = {
   __add: `__add=(a,b)=>{return a+b}`,
-  __sub: `__sub=function(a,b){return arguments.length===1?-a:a-b}`,
+  __sub: `__sub=(a,b)=>{return a-b}`,
   __mult: `__mult=(a,b)=>{return a*b}`,
   __div: `__div=(a,b)=>{return a/b}`,
   __gteq: '__gteq=(a,b)=>+(a>=b)',
@@ -226,12 +226,10 @@ const comp = (tree, Drill) => {
       case KEYWORDS.LESS_THAN:
         return `+(${parseArgs(tail, Drill, token)});`
       case KEYWORDS.SUBTRACTION:
-        return tail.length === 1
-          ? `(-${comp(tail[0], Drill)});`
-          : `(${parse(tail, Drill)
-              // Add space so it doesn't consider it 2--1 but 2- -1
-              .map((x) => (typeof x === 'number' && x < 0 ? ` ${x}` : x))
-              .join(token)});`
+        return `(${parse(tail, Drill)
+          // Add space so it doesn't consider it 2--1 but 2- -1
+          .map((x) => (typeof x === 'number' && x < 0 ? ` ${x}` : x))
+          .join(token)});`
       case KEYWORDS.MULTIPLICATION:
         return `(${parseArgs(tail, Drill, token)});`
       case KEYWORDS.DIVISION:
@@ -251,9 +249,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

@@ -78,11 +78,11 @@ export const keywords = {
     return a * b
   },
   [KEYWORDS.SUBTRACTION]: (args, env) => {
-    if (args.length !== 1 && args.length !== 2)
+    if (args.length !== 2)
       throw new RangeError(
         `Invalid number of arguments for (${
           KEYWORDS.SUBTRACTION
-        }), expected (or (= 1) (= 2)) but got ${args.length}\n\n(${
+        }), expected (= 2) but got ${args.length}\n\n(${
           KEYWORDS.SUBTRACTION
         } ${stringifyArgs(args)})`
       )
@@ -95,7 +95,6 @@ export const keywords = {
           KEYWORDS.SUBTRACTION
         } ${stringifyArgs(args)})`
       )
-    if (args.length === 1) return -a
     const b = evaluate(args[1], env)
     if (typeof b !== 'number')
       throw new TypeError(
@@ -471,11 +470,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 +487,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

@@ -286,6 +286,21 @@ export const deSuggarAst = (ast, scope) => {
                     }
                   }
                   deSuggarAst(exp, scope)
+                } else {
+                  if (rest.length !== 1 && rest.length !== 2)
+                    throw new RangeError(
+                      `Invalid number of arguments for (${
+                        KEYWORDS.SUBTRACTION
+                      }), expected (or (= 1) (= 2)) but got ${
+                        rest.length
+                      }\n\n(${KEYWORDS.SUBTRACTION} ${stringifyArgs(rest)})`
+                    )
+
+                  if (rest.length === 1) {
+                    exp[0][VALUE] = KEYWORDS.MULTIPLICATION
+                    exp.push([ATOM, -1])
+                    deSuggarAst(exp, scope)
+                  }
                 }
                 break
               case KEYWORDS.DIVISION:
@@ -362,6 +377,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)