Changeset 12116

Timestamp:

08/24/09 19:21:13 (14 years ago)

Author:

ehuelsmann

Message:

Convert LABELS BLOCK-NODEs to LABELS-NODEs.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• compiler-pass1.lisp (modified) (1 diff)
• compiler-pass2.lisp (modified) (4 diffs)

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

@@ -671 +671 @@
          (*current-compiland* (local-function-compiland local-function)))
      (p1-compiland (local-function-compiland local-function))))
-       (let* ((block (make-block-node '(LABELS)))
+       (let* ((block (make-labels-node))
               (*blocks* (cons block *blocks*))
               (body (cddr form))
               (*visible-variables* *visible-variables*))
-         (setf (block-free-specials block)
+         (setf (labels-free-specials block)
                (process-declarations-for-vars body nil block))
-         (dolist (special (block-free-specials block))
+         (dolist (special (labels-free-specials block))
            (push special *visible-variables*))
-         (setf (block-form block)
+         (setf (labels-form block)
                (list* (car form) local-functions (p1-body (cddr form))))
          block))))

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

@@ -4971 +4971 @@
 (defknown p2-labels-node (t t t) t)
 (defun p2-labels-node (block target representation)
-  (let* ((form (block-form block))
+  (let* ((form (labels-form block))
          (*local-functions* *local-functions*)
          (*visible-variables* *visible-variables*)
@@ -4986 +4986 @@
     (dolist (local-function local-functions)
       (p2-labels-process-compiland local-function))
-    (dolist (special (block-free-specials block))
+    (dolist (special (labels-free-specials block))
       (push special *visible-variables*))
-    (compile-progn-body body target representation)))
+    (let ((*blocks* (cons block *blocks*)))
+      (compile-progn-body body target representation))))
 
 (defun p2-lambda (compiland target)
@@ -7915 +7916 @@
                    ((eq name 'LET)
                     (p2-let/let*-node form target representation))
-                   ((eq name 'LABELS)
-                    (p2-labels-node form target representation))
-                   ((eq name 'SETF) ;; SETF functions create
+;;                   ((eq name 'LABELS)
+;;                    (p2-labels-node form target representation))
+;;                   ((eq name 'SETF) ;; SETF functions create
                     ;; consp block names, if we're unlucky
-                    (p2-block-node form target representation))
+;;                    (p2-block-node form target representation))
                    (t
                     (print name)
@@ -7937 +7938 @@
            ((flet-node-p form)
             (p2-flet-node form target representation))
+           ((labels-node-p form)
+            (p2-labels-node form target representation))
            ((locally-node-p form)
             (p2-locally-node form target representation))