fez-lisp 1.5.105 → 1.5.107

package/package.json

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

package/src/check.js

@@ -34,7 +34,8 @@ import {
   ANY,
   formatType,
   ANONYMOUS_FUNCTION_TYPE_PREFIX,
-  validateLambda
+  validateLambda,
+  NIL
 } from './types.js'
 import {
   Brr,

package/src/macros.js

@@ -16,6 +16,7 @@ import {
   WORD
 } from './keywords.js'
 import { hasBlock, stringifyArgs } from './utils.js'
+import { NIL } from './types.js'
 export const SUGGAR = {
   // Syntactic suggars
   PIPE: '|>',
@@ -121,11 +122,11 @@ export const deSuggarAst = (ast, scope) => {
                 break
               case SUGGAR.CONDITION:
                 {
-                  if (rest.length < 2)
+                  if (rest.length < 4)
                     throw new RangeError(
                       `Invalid number of arguments for (${
                         SUGGAR.CONDITION
-                      }), expected (> 2 required) but got ${rest.length} (${
+                      }), expected (> 3 required) but got ${rest.length} (${
                         SUGGAR.CONDITION
                       } ${stringifyArgs(rest)})`
                     )
@@ -137,11 +138,25 @@ export const deSuggarAst = (ast, scope) => {
                         rest.length
                       } (${SUGGAR.CONDITION} ${stringifyArgs(rest)})`
                     )
+                  if (rest.at(-2)[0][VALUE] !== KEYWORDS.MULTIPLICATION) {
+                    throw new ReferenceError(
+                      `Last condition of (${
+                        SUGGAR.CONDITION
+                      }), has to be a wildcard (${KEYWORDS.MULTIPLICATION}) (${
+                        SUGGAR.CONDITION
+                      }) followed by a default result (${stringifyArgs(exp)}))`
+                    )
+                  }
                   exp.length = 0
                   let temp = exp
                   for (let i = 0; i < rest.length; i += 2) {
                     if (i === rest.length - 2) {
-                      temp.push([APPLY, KEYWORDS.IF], rest[i], rest.at(-1))
+                      temp.push(
+                        [APPLY, KEYWORDS.IF],
+                        rest[i],
+                        rest.at(-1),
+                        rest.at(-1)
+                      )
                     } else {
                       temp.push([APPLY, KEYWORDS.IF], rest[i], rest[i + 1], [])
                       temp = temp.at(-1)
@@ -357,7 +372,7 @@ export const deSuggarAst = (ast, scope) => {
                     )
                   exp[0][VALUE] = KEYWORDS.IF
                   const temp = exp[2]
-                  exp[2] = exp[3] ?? [ATOM, FALSE]
+                  exp[2] = exp[3] ?? [WORD, NIL]
                   exp[3] = temp
                 }
                 deSuggarAst(exp, scope)
@@ -372,7 +387,7 @@ export const deSuggarAst = (ast, scope) => {
                         KEYWORDS.IF
                       } ${stringifyArgs(rest)})`
                     )
-                  if (rest.length === 2) exp.push([ATOM, FALSE])
+                  if (rest.length === 2) exp.push([WORD, NIL])
                 }
                 deSuggarAst(exp[1], scope)
                 break

package/src/types.js

@@ -24,6 +24,7 @@ export const ANY = 5
 export const ANONYMOUS_FUNCTION_TYPE_PREFIX = 'lambda::annonymous::'
 export const MAX_ARGUMENT_RETRY = 1
 export const MAX_RETRY_DEFINITION = 100
+export const NIL = 'nil'
 export const toTypeNames = (type) => {
   switch (type) {
     case APPLY: