[armedbear-cvs] r12103 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Fri Aug 14 16:08:19 2009
New Revision: 12103

Log:
Convert LOCALLY block-nodes to LOCALLY-NODEs.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp
   trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp	Fri Aug 14 16:08:19 2009
@@ -238,14 +238,14 @@
 
 (defun p1-locally (form)
   (let* ((*visible-variables* *visible-variables*)
-         (block (make-block-node '(LOCALLY)))
+         (block (make-locally-node))
          (free-specials (process-declarations-for-vars (cdr form) nil block)))
-    (setf (block-free-specials block) free-specials)
+    (setf (locally-free-specials block) free-specials)
     (dolist (special free-specials)
 ;;       (format t "p1-locally ~S is special~%" name)
       (push special *visible-variables*))
     (let ((*blocks* (cons block *blocks*)))
-      (setf (block-form block)
+      (setf (locally-form block)
             (list* 'LOCALLY (p1-body (cdr form))))
       block)))
 

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Fri Aug 14 16:08:19 2009
@@ -4439,8 +4439,8 @@
 (defknown p2-locally-node (t t t) t)
 (defun p2-locally-node (block target representation)
   (with-saved-compiler-policy
-    (let* ((body (cdr (block-form block)))
-           (*visible-variables* (append (block-free-specials block)
+    (let* ((body (cdr (locally-form block)))
+           (*visible-variables* (append (locally-free-specials block)
                                         *visible-variables*))
            (*blocks* (cons block *blocks*)))
       (process-optimization-declarations body)
@@ -7920,10 +7920,6 @@
                    ((eq name 'MULTIPLE-VALUE-BIND)
                     (p2-m-v-b-node form target)
                     (fix-boxing representation nil))
-                   ((eq name 'PROGV)
-                    (p2-progv-node form target representation))
-                   ((eq name 'LOCALLY)
-                    (p2-locally-node form target representation))
                    )))))
         ((node-p form)
          (cond