fez-lisp 1.5.38 → 1.5.39

package/package.json

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

package/src/check.js

@@ -599,16 +599,20 @@ export const typeCheck = (ast) => {
                         env[name][STATS][SUB_RETURN_TYPE] !== PREDICATE
                       ) {
                         warningStack.add(
-                          `${name} ends in (${PREDICATE_SUFFIX}) and is expected to return (Predicate) but it doesn't (check #7)`
+                          `${name} ends in (${PREDICATE_SUFFIX}) and is expected to return (Predicate) but it doesn't (try wrapping it in a (true?) or (false?)) (check #7)`
                         )
                       } else if (
                         !isPredicate &&
                         env[name][STATS][SUB_RETURN_TYPE] === PREDICATE
                       ) {
                         warningStack.add(
-                          `${name} should end in (${PREDICATE_SUFFIX}) because it return (Predicate) (check #8)`
+                          `${name} should end in (${PREDICATE_SUFFIX}) because it return (Predicate) (try adding ? at the end of the lambda name) (check #8)`
                         )
                       }
+                      if (isPredicate) {
+                        env[name][STATS][RETURNS] = ATOM
+                        env[name][STATS][SUB_RETURN_TYPE] = PREDICATE
+                      }
                       // }
                       // if (
                       //   env[name][STATS][RETURNS] === UNKNOWN &&
@@ -675,12 +679,20 @@ export const typeCheck = (ast) => {
                     .toString()
                     .replace('.', 0)
                 }
-                for (const param of params) {
+                for (let i = 0; i < params.length; ++i) {
+                  const param = params[i]
                   copy[param[VALUE]] = {
                     [STATS]: { type: UNKNOWN, retried: 0 }
                   }
-                  if (env[copy[SCOPE_NAME]])
-                    env[copy[SCOPE_NAME]][STATS][ARGS].push(copy[param[VALUE]])
+                  if (env[copy[SCOPE_NAME]]) {
+                    env[copy[SCOPE_NAME]][STATS][ARGS][i] = copy[param[VALUE]]
+                    if (
+                      param[VALUE][param[VALUE].length - 1] === PREDICATE_SUFFIX
+                    ) {
+                      copy[param[VALUE]][STATS][RETURNS] = ATOM
+                      copy[param[VALUE]][STATS][SUB_RETURN_TYPE] = PREDICATE
+                    }
+                  }
                 }
                 check(rest.at(-1), copy, copy)
               }
@@ -707,7 +719,7 @@ export const typeCheck = (ast) => {
                         env[first[VALUE]][STATS][ARGS_COUNT]
                       }) but got ${rest.length} (${stringifyArgs(
                         exp
-                      )}) (check #8)`
+                      )}) (check #15)`
                     )
                   } else {
                     const isSpecial = SPECIAL_FORMS_SET.has(first[VALUE])
@@ -946,9 +958,7 @@ export const typeCheck = (ast) => {
   copy[SCOPE_NAME] = 'root'
   check(copy, root, copy)
   while (stack.length) stack.pop()()
-  if (errorStack.size)
-    throw new TypeError(
-      [...new Set(errorStack.values()), ...warningStack].join('\n')
-    )
+  const issues = [...new Set(errorStack.values()), ...warningStack]
+  if (issues.length) throw new TypeError(issues.join('\n'))
   return ast
 }