Remove `labels' in favor of `letrec'

This is more general and is a better name given that Javascript does
not have separate value/function namespaces

diff --git a/src/package.lisp b/src/package.lisp
index 4e04212..af1bbac 100644 (file)
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -77,6 +77,7 @@
       #:psetq
       #:let*
       #:let
+      #:letrec
 
       ;; variables
       #:var
@@ -113,7 +114,6 @@
       ;; function definition
       #:defun
       #:lambda
-      #:labels
 
       ;; lambda lists
       #:&key

diff --git a/src/special-forms.lisp b/src/special-forms.lisp
index 7109cf5..25dc963 100644 (file)
--- a/src/special-forms.lisp
+++ b/src/special-forms.lisp
@@ -595,6 +595,14 @@ lambda-list::=
            ,@body))
       `(progn ,@body)))
 
+(defpsmacro letrec (bindings &body body)
+  `(let ,(mapcar (lambda (bind)
+                  (list (car bind) 'null))
+                bindings)
+     ,@(mapcar (lambda (bind) `(var ,(car bind) ,(cadr bind)))
+              bindings)
+     ,@body))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; iteration
 (defun make-for-vars/inits (init-forms)