fez-lisp 1.6.82 → 1.6.84

package/package.json

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

package/src/check.js

@@ -662,7 +662,12 @@ const resolveGetter = ({ rem, prop, name, env, caller, exp }) => {
         if (times === level - 1) {
           setPropToType(env[name][STATS], prop, {
             [TYPE_PROP]: types.length
-              ? [type, new SubType([types.at(-1)])]
+              ? [
+                  type,
+                  new SubType([
+                    types.at(-1) === COLLECTION ? UNKNOWN : types.at(-1)
+                  ])
+                ]
               : [UNKNOWN]
           })
         } else {
@@ -924,15 +929,12 @@ const initArrayType = ({ rem, env }) => {
         subT.add(head[1].types[0])
     }
     const [main, sub] = ret[0]
-    if (isSubType(sub) && sub.types.at(-1) === COLLECTION) sub.types.pop()
     return {
       [TYPE_PROP]: [APPLY],
       [RETURNS]: [
         COLLECTION,
         isCollection
-          ? new SubType(
-              isSubType(sub) ? [COLLECTION, ...sub] : [COLLECTION, main]
-            )
+          ? new SubType(isSubType(sub) ? [COLLECTION, ...sub] : [COLLECTION])
           : new SubType(isSubType(sub) ? [...sub] : [main])
       ]
     }
@@ -1310,6 +1312,8 @@ export const typeCheck = (
                     for (let j = 0; j < args[i][STATS][ARGUMENTS].length; ++j) {
                       const actual = local[lambdaName][STATS][ARGUMENTS][j]
                       const expected = args[i][STATS][ARGUMENTS][j]
+                      // TODO: after refactoring the generic nesting and unnesting logic
+                      // apply it here to judge lambda arguments based on the signature
                       // if (
                       //   isGenericType(expected[STATS]) &&
                       //   !isUnknownType(actual[STATS]) &&

package/src/debugger.js

@@ -971,9 +971,8 @@ export const debug = (ast, checkTypes = true, userDefinedTypes) => {
         return t ? t() : ''
       } else if (option === 'Search') {
         return [...types.entries()]
-          .filter((x) => x[0].split(' ').length === 3 && !x[0].includes('.'))
+          .filter((x) => !x[0].includes('.'))
           .filter((x) => x[0].includes(name))
-          .sort((a, b) => a[0].localeCompare(b[0]))
           .map(([k, v]) => `${k}\n${v()}`)
           .join('\n\n')
       } else if (option === 'Special') {

package/src/types.js

@@ -1519,7 +1519,7 @@ export const toArgType = (A, i) => {
         argIndex: i,
         retried: Infinity,
         [IS_ARGUMENT]: true,
-        [SIGNATURE]: PLACEHOLDER,
+        [SIGNATURE]: arg[VALUE].replaceAll('[', '').replaceAll(']', ''),
         [TYPE_PROP]: toTypeCodes(arg[VALUE], i),
         [RETURNS]: toTypeCodes(arg[VALUE], i),
         [ARGUMENTS]: [],