fez-lisp 1.6.66 → 1.6.68

package/package.json

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

package/src/check.js

@@ -617,6 +617,8 @@ const resolveGetter = ({ rem, prop, name, env, caller, exp }) => {
   if (!env[array[VALUE]] || !env[name]) return true
   switch (array[TYPE]) {
     case APPLY:
+      // TODO: figure out recursively what is the inner type of all nested getters
+      if (GET_ARRAY_INFERENCE_SET.has(array[VALUE])) return true
       if (
         getReturn(env[array[VALUE]][STATS]) === UNKNOWN ||
         getReturn(env[array[VALUE]][STATS]) === ANY
@@ -828,6 +830,7 @@ const initArrayTypeRec = ({ rem, env }) => {
 const initArrayType = ({ rem, env }) => {
   const ret = initArrayTypeRec({ rem, env })
   const known = ret.find((x) => x[0] !== ANY && x[0] !== UNKNOWN)
+  const isCollection = ret.length && ret[0] && ret[0][0] === COLLECTION
   if (known && ret.length) {
     if (Array.isArray(ret[0][0])) {
       let head = ret[0][0]
@@ -844,12 +847,24 @@ const initArrayType = ({ rem, env }) => {
     if (isSubType(sub) && sub.types.at(-1) === COLLECTION) sub.types.pop()
     return {
       [TYPE_PROP]: [APPLY],
-      [RETURNS]: [COLLECTION, new SubType(isSubType(sub) ? [...sub] : [main])]
+      [RETURNS]: [
+        COLLECTION,
+        isCollection
+          ? new SubType(
+              isSubType(sub) ? [COLLECTION, ...sub] : [COLLECTION, main]
+            )
+          : new SubType(isSubType(sub) ? [...sub] : [main])
+      ]
     }
   } else
     return {
       [TYPE_PROP]: [APPLY],
-      [RETURNS]: [COLLECTION, new SubType([UNKNOWN])]
+      [RETURNS]: [
+        COLLECTION,
+        isCollection
+          ? new SubType([COLLECTION, UNKNOWN])
+          : new SubType([UNKNOWN])
+      ]
     }
 }
 const resolveReturnType = ({

package/src/macros.js

@@ -118,6 +118,17 @@ export const deSuggarAst = (ast, scope) => {
                 if (rest.length === 1) {
                   exp[0][VALUE] = 'math:var-get'
                   // exp.push([ATOM, 0])
+                } else if (rest.length > 2) {
+                  exp.length = 0
+                  rest.reverse()
+                  let temp = exp
+                  for (let i = 0; i < rest.length; i += 1) {
+                    if (i < rest.length - 1) {
+                      temp.push([APPLY, SUGGAR.GET_ARRAY], [], rest[i])
+                      temp = temp.at(-2)
+                    } else temp.push(...rest[i])
+                  }
+                  deSuggarAst(exp, scope)
                 }
                 break
               case SUGGAR.INCREMENT: