Changeset 11825

Timestamp:

05/03/09 19:50:20 (14 years ago)

Author:

ehuelsmann

Message:

Compilation P1:

• Set up a CATCH block before processing the subforms.
• Exclude the unwinding forms from the UNWIND-PROTECT block: they are themselves not protected by their own block.

File:

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

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

@@ -273 +273 @@
   (let* ((tag (p1 (cadr form)))
          (body (cddr form))
+         (block (make-block-node '(CATCH)))
+         ;; our subform processors need to know
+         ;; they're enclosed in a CATCH block
+         (*blocks* (cons block *blocks*))
          (result '()))
     (dolist (subform body)
@@ -286 +290 @@
     (push tag result)
     (push 'CATCH result)
-    (let ((block (make-block-node '(CATCH))))
-      (setf (block-form block) result)
-      block)))
+    (setf (block-form block) result)
+    block))
 
 (defun p1-unwind-protect (form)
@@ -294 +297 @@
       (p1 (second form)) ; No cleanup forms: (unwind-protect (...)) => (...)
       (let* ((block (make-block-node '(UNWIND-PROTECT)))
-             (*blocks* (cons block *blocks*)))
-        (setf (block-form block) (p1-default form))
+             ;; a bit of jumping through hoops...
+             (unprotected-forms (p1-body (cddr form)))
+             ;; ... because only the protected form is
+             ;; protected by the UNWIND-PROTECT block
+             (*blocks* (cons block *blocks*))
+             (protected-form (p1 (cadr form))))
+        (setf (block-form block)
+              `(unwind-protect ,protected-form
+                 ,@unprotected-forms))
         block)))