[movitz-cvs] CVS update: movitz/losp/muerte/basic-macros.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz/losp/muerte
In directory common-lisp.net:/tmp/cvs-serv6026

Modified Files:
	basic-macros.lisp 
Log Message:
Let's rename it with-unbound-protect.

Date: Wed May  4 00:15:38 2005
Author: ffjeld

Index: movitz/losp/muerte/basic-macros.lisp
diff -u movitz/losp/muerte/basic-macros.lisp:1.60 movitz/losp/muerte/basic-macros.lisp:1.61
--- movitz/losp/muerte/basic-macros.lisp:1.60	Tue May  3 23:25:30 2005
+++ movitz/losp/muerte/basic-macros.lisp	Wed May  4 00:15:38 2005
@@ -9,7 +9,7 @@
 ;;;; Created at:    Wed Nov  8 18:44:57 2000
 ;;;; Distribution:  See the accompanying file COPYING.
 ;;;;                
-;;;; $Id: basic-macros.lisp,v 1.60 2005/05/03 21:25:30 ffjeld Exp $
+;;;; $Id: basic-macros.lisp,v 1.61 2005/05/03 22:15:38 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -690,7 +690,7 @@
     (t form)))
 
 
-(defmacro unbound-protect (x &optional error-continuation &environment env)
+(defmacro with-unbound-protect (x &body error-continuation &environment env)
   (cond
    ((movitz:movitz-constantp x env)
     `(values ,x))
@@ -700,14 +700,14 @@
 	 (:compile-form (:result-mode :register) ,x)
 	 (:cmpl -1 (:result-register))
 	 (:jo '(:sub-program (unbound)
-		(:compile-form (:result-mode :eax) ,error-continuation)
+		(:compile-form (:result-mode :eax) (progn , at error-continuation))
 		(:jmp ',unbound-continue)))
 	 ,unbound-continue)))
    (t (let ((var (gensym)))
 	`(let ((,var ,x))
 	   (if (not (eq ,var (load-global-constant new-unbound-value)))
 	       ,var
-	     ,error-continuation))))))
+	     (progn , at error-continuation)))))))
 
 (define-compiler-macro current-run-time-context ()
   `(with-inline-assembly (:returns :register)