Changeset 11644

Timestamp:

02/08/09 14:00:03 (14 years ago)

Author:

vvoutilainen

Message:

Further cleanup for p1-flet/labels.

File:

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

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

@@ -408 +408 @@
       ,@body1)))
       (setf ,local-functions-var (nreverse ,local-functions-var))
+      ;; Make the local functions visible.
+      (dolist (local-function ,local-functions-var)
+        (push local-function *local-functions*)
+        (let ((variable (local-function-variable local-function)))
+    (when variable
+      (push variable *visible-variables*))))
       ,@body2)))
 
@@ -431 +437 @@
        (push variable *all-variables*)))
    (push local-function local-functions)))
-      ;; Make the local functions visible.
-      ((dolist (local-function local-functions)
-   (push local-function *local-functions*)
-   (let ((variable (local-function-variable local-function)))
-     (when variable
-       (push variable *visible-variables*))))
-       (with-saved-compiler-policy
+      ((with-saved-compiler-policy
      (process-optimization-declarations (cddr form))
    (list* (car form) local-functions (p1-body (cddr form)))))))
@@ -454 +454 @@
    (push variable *all-variables*)
    (push local-function local-functions)))
-      ;; Make the local functions visible.
       ((dolist (local-function local-functions)
-   (push local-function *local-functions*)
-   (push (local-function-variable local-function) *visible-variables*))
-       (dolist (local-function local-functions)
    (let ((*visible-variables* *visible-variables*)
          (*current-compiland* (local-function-compiland local-function)))