fez-lisp 1.6.1 → 1.6.3

package/package.json

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

package/src/check.js

@@ -521,8 +521,9 @@ const IfApplyBranch = ({
       break
     case KEYWORDS.CALL_FUNCTION:
       if (re.at(-1)[TYPE] === WORD) {
-        if (env[re.at(-1)[VALUE]] && re.at(-1)[VALUE] !== ref[STATS][SIGNATURE])
-          setPropToReturnRef(ref[STATS], prop, env[re.at(-1)[VALUE]][STATS])
+        const name = re.at(-1)[VALUE]
+        if (env[name] && re.at(-1)[VALUE] !== ref[STATS][SIGNATURE])
+          setPropToReturnRef(ref[STATS], prop, env[name][STATS])
       } else {
         const returns = returnType(re.at(-1))
         if (env[returns[VALUE]] && returns[VALUE] !== ref[STATS][SIGNATURE])
@@ -1203,38 +1204,8 @@ export const typeCheck = (ast, ctx = SPECIAL_FORM_TYPES) => {
                 )})`
               )
             if (name in env) {
-              // const [head, ...tail] = isLeaf(rest.at(-1))
-              //   ? [rest.at(-1)]
-              //   : rest.at(-1)
-              // const ref = env[name]
-              // if (ref) {
-              //   if (getType(ref[STATS]) === APPLY && head[TYPE] !== APPLY)
-              //     throw new TypeError(
-              //       `Miss-matching type for (${name}) predifined expected type is (${toTypeNames(
-              //         APPLY
-              //       )}) but got (${stringifyArgs(exp)})`
-              //     )
-              //   const returns = deepLambdaReturn(
-              //     hasBlock(tail) ? tail.at(-1) : tail,
-              //     (result) => result[VALUE] !== KEYWORDS.IF
-              //   )
-              //   const [rhead] = isLeaf(returns) ? [returns] : returns
-              //   const rightRef = env[rhead[VALUE]]
-              //   if (rightRef)
-              //     if (
-              //       !equalReturns(ref[STATS], rightRef[STATS]) ||
-              //       !equalSubReturns(ref[STATS], rightRef[STATS])
-              //     )
-              //       throw new TypeError(
-              //         `Miss-matching return type for (${name}) predifined expected return is (${formatSubType(
-              //           getReturns(ref[STATS])
-              //         )}) but got (${formatSubType(
-              //           getReturns(rightRef[STATS])
-              //         )}) (${stringifyArgs(exp)})`
-              //       )
-              // }
               Types.set(withScope(name, env), () => formatType(name, env))
-              break
+              if (!env[env[SCOPE_NAME]]) break
             }
             //  Predicate name consistency
             const rightHand = rest.at(-1)
@@ -1816,8 +1787,9 @@ export const typeCheck = (ast, ctx = SPECIAL_FORM_TYPES) => {
             stagger(stack, 'prepend', [first, env], judge)
             for (let i = 0; i < rest.length; ++i) {
               const r = rest[i]
-              if (isLeaf(r) && r[TYPE] !== ATOM)
-                if (env[r[VALUE]] == undefined)
+              if (isLeaf(r) && r[TYPE] !== ATOM) {
+                const name = r[VALUE]
+                if (env[name] == undefined)
                   throw new TypeError(
                     `(${
                       first[VALUE]
@@ -1825,6 +1797,7 @@ export const typeCheck = (ast, ctx = SPECIAL_FORM_TYPES) => {
                       r[VALUE]
                     }) at argument (${i}) (${stringifyArgs(exp)}) (check #20)`
                   )
+              }
               check(r, env, scope)
             }
             break