fez-lisp 1.2.11 → 1.2.13

package/package.json

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

package/src/compiler.js

@@ -107,6 +107,7 @@ const Helpers = {
   length: 'length=(arr)=>arr.length',
   __tco: `__tco=fn=>(...args)=>{let result=fn(...args);while(typeof result==='function')result=result();return result}`,
   atomPredicate: `atomPredicate=(number)=>+(typeof number==='number')`,
+  lambdaPredicate: `lambdaPredicate=(fm)=>+(typeof fn==='function')`,
   setEffect: `setEffect=(array,index,value)=>{if(index<0){const target=array.length+index;while(array.length!==target)array.pop()}else array[index] = value;return array}`
 }
 const semiColumnEdgeCases = new Set([
@@ -191,6 +192,9 @@ const compile = (tree, Drill) => {
       case KEYWORDS.IS_ATOM:
         Drill.Helpers.add('atomPredicate')
         return `atomPredicate(${compile(Arguments[0], Drill)});`
+      case KEYWORDS.IS_LAMBDA:
+        Drill.Helpers.add('lambdaPredicate')
+        return `lambdaPredicate(${compile(Arguments[0], Drill)});`
       case KEYWORDS.NUMBER_TYPE:
         return '0'
       case KEYWORDS.BOOLEAN_TYPE:

package/src/interpreter.js

@@ -101,6 +101,15 @@ const keywords = {
       )
     return +(typeof evaluate(args[0], env) === 'number')
   },
+  [KEYWORDS.IS_LAMBDA]: (args, env) => {
+    if (args.length !== 1)
+      throw new RangeError(
+        `Invalid number of arguments for (${
+          KEYWORDS.IS_LAMBDA
+        }) (= 1 required) (${KEYWORDS.IS_LAMBDA} ${stringifyArgs(args)})`
+      )
+    return +(typeof evaluate(args[0], env) === 'function')
+  },
   [KEYWORDS.ADDITION]: (args, env) => {
     if (args.length < 2)
       throw new RangeError(
@@ -180,6 +189,14 @@ const keywords = {
           KEYWORDS.CONDITION
         } ${stringifyArgs(args)})`
       )
+    if (args.length % 2 !== 0)
+      throw new RangeError(
+        `Invalid number of arguments for (${
+          KEYWORDS.CONDITION
+        }), expected even number of arguments but got ${args.length} (${
+          KEYWORDS.CONDITION
+        } ${stringifyArgs(args)})`
+      )
     for (let i = 0; i < args.length; i += 2) {
       const condition = evaluate(args[i], env)
       if (condition !== FALSE && condition !== TRUE)
@@ -802,18 +819,6 @@ export const deSuggar = (ast) => {
         case APPLY:
           {
             switch (first[VALUE]) {
-              case KEYWORDS.BODY:
-                {
-                  exp[0][1] = KEYWORDS.CALL_FUNCTION
-                  exp[0][0] = APPLY
-                  exp.length = 1
-                  exp[1] = [
-                    [APPLY, KEYWORDS.ANONYMOUS_FUNCTION],
-                    [[APPLY, KEYWORDS.BLOCK], ...rest]
-                  ]
-                  deSuggar(exp)
-                }
-                break
               case KEYWORDS.BLOCK:
                 {
                   if (
@@ -821,12 +826,16 @@ export const deSuggar = (ast) => {
                     (prev &&
                       prev[TYPE] === APPLY &&
                       prev[VALUE] !== KEYWORDS.ANONYMOUS_FUNCTION)
-                  )
-                    throw new SyntaxError(
-                      `Can only use (${KEYWORDS.BLOCK}) as a body of a (${
-                        KEYWORDS.ANONYMOUS_FUNCTION
-                      }) (${stringifyArgs(exp)})`
-                    )
+                  ) {
+                    exp[0][1] = KEYWORDS.CALL_FUNCTION
+                    exp[0][0] = APPLY
+                    exp.length = 1
+                    exp[1] = [
+                      [APPLY, KEYWORDS.ANONYMOUS_FUNCTION],
+                      [[APPLY, KEYWORDS.BLOCK], ...rest]
+                    ]
+                    deSuggar(exp)
+                  }
                 }
                 break
               // case KEYWORDS.DEFINE_VARIABLE:

package/src/keywords.js

@@ -14,6 +14,7 @@ export const KEYWORDS = {
   IDENTITY: 'identity',
   ARRAY_LENGTH: 'length',
   IS_ATOM: 'atom?',
+  IS_LAMBDA: 'lambda?',
   ADDITION: '+',
   SUBTRACTION: '-',
   MULTIPLICATION: '*',
@@ -28,7 +29,6 @@ export const KEYWORDS = {
   BITWISE_UNSIGNED_RIGHT_SHIFT: '>>>',
   GET_ARRAY: 'get',
   BLOCK: 'do',
-  BODY: 'block',
   ANONYMOUS_FUNCTION: 'lambda',
   IF: 'if',
   UNLESS: 'unless',
@@ -54,7 +54,6 @@ export const KEYWORDS = {
   CLEAR_CONSOLE: 'clear!'
 }
 
-
 export const TYPES = {
   [APPLY]: 'APPLY',
   [WORD]: 'WORD',