fez-lisp 1.5.79 → 1.5.81

package/package.json

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

package/src/check.js

@@ -83,25 +83,30 @@ 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
-      ? `${name} (${
+      ? `${isAnonymous ? '' : `(let ${name} `}(lambda ${
           stats[ARG_COUNT] === VARIADIC
             ? '... ' + STATIC_TYPES.UNKNOWN
             : (stats[ARGUMENTS] ?? [])
                 .map(
-                  (x) =>
-                    `${x[STATS][SIGNATURE]} ${x[STATS][TYPE_PROP].map((x) =>
-                      toTypeNames(x)
-                    ).join(' ')}${
-                      getSuffix(x[STATS][SIGNATURE]) === PREDICATE_SUFFIX
-                        ? ' ' + toTypeNames(PREDICATE)
-                        : ''
+                  (x, i) =>
+                    `${
+                      x[STATS][TYPE_PROP][0] === APPLY
+                        ? `${formatType(i, stats[ARGUMENTS])}`
+                        : `${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) => {
@@ -124,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}`
 }
@@ -407,6 +412,7 @@ export const typeCheck = (ast) => {
                   env[name] = {
                     [STATS]: {
                       [TYPE_PROP]: [APPLY],
+                      [SIGNATURE]: name,
                       retried: 0,
                       counter: 0,
                       [VARIABLE_ORDER_INDEX]: env[ORDER],
@@ -471,6 +477,7 @@ export const typeCheck = (ast) => {
                     // DECLARATION of ATOM
                     env[name] = {
                       [STATS]: {
+                        [SIGNATURE]: name,
                         retried: 0,
                         counter: 0,
                         [VARIABLE_ORDER_INDEX]: env[ORDER],
@@ -508,6 +515,7 @@ export const typeCheck = (ast) => {
                       [STATS]: {
                         retried: 0,
                         counter: 0,
+                        [SIGNATURE]: name,
                         [VARIABLE_ORDER_INDEX]: env[ORDER],
                         [TYPE_PROP]: [
                           isL

package/src/types.js

@@ -31,7 +31,7 @@ export const toTypeNames = (type) => {
   }
 }
 export const SPECIAL_FORM_TYPES = {
-  [SCOPE_NAME]: '·',
+  [SCOPE_NAME]: ';',
   [ORDER]: 0,
   [toTypeNames(APPLY)]: {
     [STATS]: {