fez-lisp 1.6.63 → 1.6.65

package/package.json

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

package/src/check.js

@@ -72,7 +72,6 @@ export const identity = (name) => [
 ]
 export const typeSetDefaultFunction = (Types, name, env, exp) =>
   Types.set(withScope(name, env), () => formatType(name, env))
-
 const returnType = (rest) => {
   const body = rest.at(-1)
   const rem = hasBlock(body) ? body.at(-1) : body
@@ -218,6 +217,12 @@ export const setReturnToTypeRef = (stats, value) => {
   )
 }
 export const setStats = (a, b) => (a[STATS] = b[STATS])
+export const cloneStats = (name, x) => ({
+  [STATS]: {
+    ...x[STATS],
+    [SIGNATURE]: name
+  }
+})
 export const setStatsRef = (a, b) => (a[STATS] = b[STATS])
 export const setTypeToReturnRef = (stats, value) => {
   // To prevent getters overwritting the array subtype
@@ -687,11 +692,17 @@ const resolveSetter = (first, rest, env, stack) => {
       case WORD:
         if (env[right[VALUE]]) {
           if (hasSubType(env[right[VALUE]][STATS])) {
-            if (currentSubType.has(UNKNOWN))
-              current[STATS][TYPE_PROP][1] = new SubType([
-                ...getSubType(env[right[VALUE]][STATS])
-              ])
-            else if (!equalSubTypes(current[STATS], env[right[VALUE]][STATS]))
+            if (currentSubType.has(UNKNOWN)) {
+              if (env[right[VALUE]][STATS][TYPE_PROP][0] === COLLECTION) {
+                current[STATS][TYPE_PROP][1] = new SubType([
+                  COLLECTION,
+                  ...getSubType(env[right[VALUE]][STATS]).types
+                ])
+              } else
+                current[STATS][TYPE_PROP][1] = new SubType(
+                  getSubType(env[right[VALUE]][STATS]).types
+                )
+            } else if (!equalSubTypes(current[STATS], env[right[VALUE]][STATS]))
               throw new TypeError(
                 `Incorrect array type at (${
                   first[VALUE]
@@ -701,9 +712,9 @@ const resolveSetter = (first, rest, env, stack) => {
                   getTypes(env[right[VALUE]][STATS])
                 )}) (${stringifyArgs([first, rest])}) (check #198)`
               )
-            current[STATS][TYPE_PROP][1] = new SubType(
-              getSubType(env[right[VALUE]][STATS])
-            )
+            // current[STATS][TYPE_PROP][1] = new SubType(
+            //   getSubType(env[right[VALUE]][STATS])
+            // )
           } else
             retry(env[right[VALUE]][STATS], [first[VALUE], rest], stack, () =>
               resolveSetter(first, rest, env, stack)
@@ -722,11 +733,17 @@ const resolveSetter = (first, rest, env, stack) => {
             break
           }
           if (hasSubReturn(env[right[VALUE]][STATS])) {
-            if (currentSubType.has(UNKNOWN))
-              current[STATS][TYPE_PROP][1] = new SubType([
-                ...getSubReturn(env[right[VALUE]][STATS])
-              ])
-            else if (
+            if (currentSubType.has(UNKNOWN)) {
+              if (env[right[VALUE]][STATS][RETURNS][0] === COLLECTION) {
+                current[STATS][TYPE_PROP][1] = new SubType([
+                  COLLECTION,
+                  ...getSubReturn(env[right[VALUE]][STATS]).types
+                ])
+              } else
+                current[STATS][TYPE_PROP][1] = new SubType(
+                  getSubReturn(env[right[VALUE]][STATS]).types
+                )
+            } else if (
               !equalSubTypesWithSubReturn(
                 current[STATS],
                 env[right[VALUE]][STATS]
@@ -741,9 +758,9 @@ const resolveSetter = (first, rest, env, stack) => {
                   getReturns(env[right[VALUE]][STATS])
                 )}) (${stringifyArgs([first, rest])}) (check #198)`
               )
-            current[STATS][TYPE_PROP][1] = new SubType([
-              ...getSubReturn(env[right[VALUE]][STATS])
-            ])
+            // current[STATS][TYPE_PROP][1] = new SubType([
+            //   ...getSubReturn(env[right[VALUE]][STATS])
+            // ])
           }
           // else
           // retry(env[right[VALUE]][STATS], [first[VALUE], rest], stack, () =>
@@ -753,6 +770,7 @@ const resolveSetter = (first, rest, env, stack) => {
         break
     }
     setTypeToCollection(current[STATS])
+
     // // Retry setting the sub-type if infered it out later
     // if (!hasSubType(current[STATS]) || getSubType(current[STATS]).has(UNKNOWN))
     //   retry(current[STATS], [first[VALUE], rest], stack, () =>
@@ -1421,7 +1439,6 @@ export const typeCheck = (
               check(rightHand, env, scope)
             }
             typeSet(Types, name, env, exp)
-            // Types.set(withScope(name, env), () => formatType(name, env))
             break
           case KEYWORDS.ANONYMOUS_FUNCTION:
             {

package/src/macros.js

@@ -48,7 +48,8 @@ export const SUGGAR = {
   DECREMENT_BY: '-=',
   BOOLEAN_VARIABLE: 'boolean',
   BOOLEAN_VARIABLE_GET: 'boole',
-  BOOLEAN_VARIABLE_SET: 'boole-set'
+  BOOLEAN_VARIABLE_SET: 'boole-set',
+  GET_ARRAY: 'array:get'
 }
 export const deSuggarAst = (ast, scope) => {
   if (scope === undefined) scope = ast
@@ -569,7 +570,7 @@ export const deSuggarAst = (ast, scope) => {
                             let wrap = right
                             for (let i = 0; i < n; ++i) {
                               wrap = [
-                                [APPLY, KEYWORDS.GET_ARRAY],
+                                [APPLY, SUGGAR.GET_ARRAY],
                                 wrap,
                                 [ATOM, 1]
                               ]
@@ -577,17 +578,13 @@ export const deSuggarAst = (ast, scope) => {
                             return [
                               [APPLY, KEYWORDS.DEFINE_VARIABLE],
                               name,
-                              [[APPLY, KEYWORDS.GET_ARRAY], wrap, [ATOM, 0]]
+                              [[APPLY, SUGGAR.GET_ARRAY], wrap, [ATOM, 0]]
                             ]
                           })
                         if (lastLeft[VALUE] !== PLACEHOLDER) {
                           let wrap = right
                           for (let i = 0; i < vars.length; ++i) {
-                            wrap = [
-                              [APPLY, KEYWORDS.GET_ARRAY],
-                              wrap,
-                              [ATOM, 1]
-                            ]
+                            wrap = [[APPLY, SUGGAR.GET_ARRAY], wrap, [ATOM, 1]]
                           }
                           newScope.push([
                             [APPLY, KEYWORDS.DEFINE_VARIABLE],
@@ -619,7 +616,7 @@ export const deSuggarAst = (ast, scope) => {
                           .map(([i]) => [
                             [APPLY, KEYWORDS.DEFINE_VARIABLE],
                             vars[i],
-                            [[APPLY, KEYWORDS.GET_ARRAY], right, [ATOM, i]]
+                            [[APPLY, SUGGAR.GET_ARRAY], right, [ATOM, i]]
                           ])
                         if (isSlicing)
                           newScope.push([

package/src/types.js

@@ -37,6 +37,7 @@ export const NIL = 'nil'
 export const TRUE_WORD = 'true'
 export const FALSE_WORD = 'false'
 export const GET_ARRAY_INFERENCE_SET = new Set([
+  KEYWORDS.GET_ARRAY,
   'array:get',
   'array:at',
   'array:first',