Changeset 12552 for branches/working-0711/ccl/level-1/l1-readloop.lisp

Timestamp:

Aug 7, 2009, 12:11:29 AM (11 years ago)

Author:

gz

Message:

r12550 from trunk (macroexpand-all fix)

File:

• branches/working-0711/ccl/level-1/l1-readloop.lisp (modified) (1 diff)

branches/working-0711/ccl/level-1/l1-readloop.lisp

@@ -333 +333 @@
               ((flet labels)
                (destructuring-bind-body (bindings &body) (rest form)
-                `(,(first form)
-                   ,(mapcar (lambda (binding)
-                              (list* (first binding) (cdr (macroexpand-all `(lambda ,@(rest binding)) env))))
-                            bindings)
-                   ,@decls
-                   ,@(mexpand body env))))
+                 (let ((augmented-env
+                        (augment-environment env :function (mapcar #'car bindings))))
+                  `(,(first form)
+                     ,(mapcar (lambda (binding)
+                                (list* (first binding)
+                                       (cdr (macroexpand-all `(lambda ,@(rest binding))
+                                                             (if (eq (first form) 'labels)
+                                                                 augmented-env
+                                                                 env)))))
+                              bindings)
+                     ,@decls
+                     ,@(mexpand body augmented-env)))))
               (nfunction (list* 'nfunction (second form) (macroexpand-all (third form) env)))
               (function