Changeset 11874

Timestamp:

05/15/09 20:18:09 (14 years ago)

Author:

ehuelsmann

Message:

P2-FLET and P2-LABELS: Use COMPILE-PROGN-BODY instead of
reinventing the wheel.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -4918 +4918 @@
 (defknown p2-flet (t t t) t)
 (defun p2-flet (form target representation)
-  ;; FIXME What if we're called with a non-NIL representation?
-  (declare (ignore representation))
   (let ((*local-functions* *local-functions*)
         (*visible-variables* *visible-variables*)
@@ -4932 +4930 @@
           (push variable *visible-variables*))))
     (dolist (special (process-special-declarations body))
-      (push (make-variable :name special :special-p t)
-            *visible-variables*))
-    (do ((forms body (cdr forms)))
-        ((null forms))
-      (compile-form (car forms) (if (cdr forms) nil target) nil))))
+      (push (make-variable :name special :special-p t) *visible-variables*))
+    (compile-progn-body body target representation)))
 
 (defknown p2-labels (t t t) t)
@@ -4955 +4950 @@
       (p2-labels-process-compiland local-function))
     (dolist (special (process-special-declarations body))
-      (push (make-variable :name special :special-p t)
-            *visible-variables*))
-    (do ((forms body (cdr forms)))
-        ((null forms))
-      (compile-form (car forms) (if (cdr forms) nil 'stack) nil))
-    (fix-boxing representation nil)
-    (emit-move-from-stack target representation)))
+      (push (make-variable :name special :special-p t) *visible-variables*))
+    (compile-progn-body body target representation)))
 
 (defun p2-lambda (compiland target)