fez-lisp 1.6.40 → 1.6.42

package/package.json

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

package/src/check.js

@@ -1116,7 +1116,8 @@ export const typeCheck = (
                     if (
                       !isUnknownType(actual[STATS]) &&
                       !isUnknownType(expected[STATS]) &&
-                      !equalTypes(actual[STATS], expected[STATS])
+                      (!equalTypes(actual[STATS], expected[STATS]) ||
+                        !equalSubTypes(actual[STATS], expected[STATS]))
                     )
                       throw new TypeError(
                         `Incorrect type for (${KEYWORDS.ANONYMOUS_FUNCTION}) (${
@@ -1231,7 +1232,7 @@ export const typeCheck = (
                 )
                 const expected = env[name]
                 const actual = env[lambdaName]
-                once(actual[STATS], exp, stack, () => {
+                const checkReturns = () => {
                   if (
                     !isUnknownReturn(actual[STATS]) &&
                     (!equalReturns(expected[STATS], actual[STATS]) ||
@@ -1246,6 +1247,9 @@ export const typeCheck = (
                         getReturns(actual[STATS])
                       )}) (${stringifyArgs(exp)}) (check #999)`
                     )
+                  else retry(actual[STATS], exp, stack, checkReturns)
+                }
+                const checkArgs = () => {
                   for (let i = 0; i < expected[STATS][ARGUMENTS].length; ++i) {
                     const argE = expected[STATS][ARGUMENTS][i]
                     const argA = actual[STATS][ARGUMENTS][i]
@@ -1255,7 +1259,7 @@ export const typeCheck = (
                         !equalSubTypes(argE[STATS], argA[STATS]))
                     )
                       throw new TypeError(
-                        `Incorrect return type for argument (${
+                        `Incorrect type for argument (${
                           argA[STATS][SIGNATURE]
                         }) The (${KEYWORDS.ANONYMOUS_FUNCTION}) argument of (${
                           expected[STATS][SIGNATURE]
@@ -1265,8 +1269,12 @@ export const typeCheck = (
                           getTypes(argA[STATS])
                         )}) (${stringifyArgs(exp)}) (check #1000)`
                       )
+                    else retry(actual[STATS], exp, stack, checkArgs)
                   }
-
+                }
+                once(actual[STATS], exp, stack, () => {
+                  checkReturns()
+                  checkArgs()
                   Types.delete(`; ${rootScopeIndex} ${lambdaName}`)
                 })
               }