fez-lisp 1.5.80 → 1.5.82

package/package.json

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

package/src/check.js

@@ -83,9 +83,10 @@ const fillUknownArgs = (n) =>
     }))
 export const formatType = (name, env) => {
   const stats = env[name][STATS]
+  const isAnonymous = typeof name === 'number'
   return stats
     ? stats[TYPE_PROP][0] === APPLY
-      ? `${typeof name !== 'number' ? `${name} ` : ''}(${
+      ? `${isAnonymous ? '' : `(let ${name} `}(lambda ${
           stats[ARG_COUNT] === VARIADIC
             ? '... ' + STATIC_TYPES.UNKNOWN
             : (stats[ARGUMENTS] ?? [])
@@ -94,12 +95,18 @@ export const formatType = (name, env) => {
                     `${
                       x[STATS][TYPE_PROP][0] === APPLY
                         ? `${formatType(i, stats[ARGUMENTS])}`
-                        : `${x[STATS][TYPE_PROP].map(toTypeNames).join(' ')}`
+                        : `${toTypeNames(
+                            x[STATS][TYPE_PROP][1] ?? x[STATS][TYPE_PROP][0]
+                          )}`
                     }`
                 )
                 .join(' ')
-        }) -> ${toTypeNames(stats[RETURNS][1] ?? stats[RETURNS][0])}`
-      : `${name} ${stats[TYPE_PROP].map(toTypeNames).join(' ')}`.trim()
+        } (${KEYWORDS.BLOCK} ${toTypeNames(
+          stats[RETURNS][1] ?? stats[RETURNS][0]
+        )})${isAnonymous ? '' : ')'})`
+      : `(let ${name} ${toTypeNames(
+          stats[TYPE_PROP][1] ?? stats[TYPE_PROP][0]
+        )})`
     : name
 }
 const formatTypes = (env) => {
@@ -122,7 +129,7 @@ const getScopeNames = (scope) => {
 }
 const withScope = (name, scope) => {
   const chain = getScopeNames(scope)
-  return `${chain.length === 1 ? '· ' : ''}${chain
+  return `${chain.length === 1 ? '; ' : ''}${chain
     .map((x) => (Number.isInteger(+x) ? '::' : x))
     .join(' ')} ${name}`
 }
@@ -221,6 +228,7 @@ export const typeCheck = (ast) => {
                               getSuffix(re[1][VALUE]) === PREDICATE_SUFFIX
                             ) {
                               // ATOM ASSIGMENT PREDICATE ASSIGMENT
+                              env[name][STATS][TYPE_PROP][1] = [PREDICATE]
                               env[name][STATS][RETURNS] = [ATOM, PREDICATE]
                             }
                           } else if (
@@ -638,6 +646,17 @@ export const typeCheck = (ast) => {
                     )
                     if (isLeaf(returns)) {
                       // TODO figure out what we do here
+                      // this here is a variable WORD
+                      // so return type of that function is that varible type
+                      if (copy[returns[VALUE]])
+                        ref[STATS][RETURNS] =
+                          copy[returns[VALUE]][STATS][TYPE_PROP]
+                      else
+                        stack.push(() => {
+                          if (copy[returns[VALUE]])
+                            ref[STATS][RETURNS] =
+                              copy[returns[VALUE]][STATS][TYPE_PROP]
+                        })
                     } else {
                       const ret = returns[0]
                       switch (ret[VALUE]) {
@@ -651,6 +670,7 @@ export const typeCheck = (ast) => {
                               getSuffix(re[0][VALUE]) === PREDICATE_SUFFIX ||
                               getSuffix(re[1][VALUE]) === PREDICATE_SUFFIX
                             ) {
+                              ref[STATS][TYPE_PROP][1] = PREDICATE
                               ref[STATS][RETURNS][1] = PREDICATE
                             }
                           } else {
@@ -687,6 +707,7 @@ export const typeCheck = (ast) => {
                                 ref[STATS][RETURNS] =
                                   copy[ret[VALUE]][STATS][RETURNS]
                             })
+
                           break
                       }
                     }

package/src/types.js

@@ -10,8 +10,8 @@ export const TYPE_PROP = 'type'
 export const SIGNATURE = 'name'
 export const ORDER = '__order__'
 export const VARIABLE_ORDER_INDEX = 'index'
-export const PREDICATE = 3
-export const COLLECTION = 4
+export const PREDICATE = 4
+export const COLLECTION = 3
 export const MAX_ARGUMENT_RETRY = 1
 export const MAX_RETRY_DEFINITION = 10
 export const toTypeNames = (type) => {
@@ -31,7 +31,7 @@ export const toTypeNames = (type) => {
   }
 }
 export const SPECIAL_FORM_TYPES = {
-  [SCOPE_NAME]: '·',
+  [SCOPE_NAME]: ';',
   [ORDER]: 0,
   [toTypeNames(APPLY)]: {
     [STATS]: {