fez-lisp 1.6.54 → 1.6.56

package/package.json

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

package/src/check.js

@@ -46,7 +46,8 @@ import {
   NUMBER,
   NUMBER_SUBTYPE,
   UNKNOWN_SUBTYPE,
-  SubType
+  SubType,
+  GET_ARRAY_INFERENCE
 } from './types.js'
 import {
   Brr,
@@ -711,7 +712,7 @@ const resolveSetter = (first, rest, env, stack) => {
         break
       case APPLY:
         if (env[right[VALUE]]) {
-          if (right[VALUE] === 'array:get') {
+          if (right[VALUE] === KEYWORDS.CREATE_ARRAY) {
             current[STATS][TYPE_PROP][1] = initArrayType({
               rem: rest.at(-1),
               env
@@ -848,25 +849,8 @@ const resolveReturnType = ({
         break
       default:
         {
-          if (returns[VALUE] === KEYWORDS.GET_ARRAY)
+          if (returns[VALUE] === GET_ARRAY_INFERENCE)
             resolveGetter({ rem, prop, name, env })
-          // if (
-          //   !GETTERS_SET.has(name) &&
-          //   GETTERS_SET.has(returns[VALUE]) &&
-          //   !resolveGetter({ rem, prop, name, env })
-          // )
-          //   return retry(env[name][STATS], [returns, env], stack, () => {
-          //     resolveReturnType({
-          //       returns,
-          //       rem,
-          //       stack,
-          //       prop,
-          //       exp,
-          //       name,
-          //       env,
-          //       check
-          //     })
-          //   })
           checkPredicateNameDeep(name, exp, exp.slice(1), returns)
           // TODO: DRY
           const index = env[name][STATS][ARGUMENTS]
@@ -1535,14 +1519,6 @@ export const typeCheck = (
             // Setters are just like DEFINE_VARIABLE as they are essentially the Var case for Collections
             // So they MUST happen before Judgement
             resolveSetter(first, rest, env, stack)
-            if (first[VALUE] === 'array:get-infer' && first[TYPE] === APPLY) {
-              resolveGetter({
-                rem: rest[0],
-                prop: TYPE_PROP,
-                name: rest[0],
-                env
-              })
-            }
             // end of Var  ---------------
             // Judgement
             const judge = () => {

package/src/types.js

@@ -36,6 +36,7 @@ export const IS_ARGUMENT = 'is_arg'
 export const NIL = 'nil'
 export const TRUE_WORD = 'true'
 export const FALSE_WORD = 'false'
+export const GET_ARRAY_INFERENCE = 'array:get'
 export class SubType {
   constructor(args) {
     this.types = []