fez-lisp 1.5.105 → 1.5.106

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.106",
   "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,
@@ -345,7 +346,7 @@ const ifExpression = ({ re, env, ref, prop }) => {
     // TODO make this more simple - it's so many different things just because types are functions or not
     // WHY not consiter making return types for everything
     if (concequent)
-      if (conc[TYPE] === WORD) {
+      if (conc[TYPE] === WORD && conc[VALUE] !== NIL) {
         return setPropToTypeRef(ref[STATS], prop, concequent[STATS])
       } else if (
         conc[TYPE] === APPLY &&
@@ -363,7 +364,7 @@ const ifExpression = ({ re, env, ref, prop }) => {
         })
       }
     if (alternative) {
-      if (alt[TYPE] === WORD) {
+      if (alt[TYPE] === WORD && alt[VALUE] !== NIL) {
         return setPropToTypeRef(ref[STATS], prop, alternative[STATS])
       } else if (
         alt[TYPE] === APPLY &&

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: '|>',
@@ -357,7 +358,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 +373,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: