[Sbcl-commits] CVS: sbcl/src/compiler ir1tran.lisp,1.131,1.132 main.lisp,1.102,1.103

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/src/compiler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10455/src/compiler

Modified Files:
	ir1tran.lisp main.lisp 
Log Message:
0.8.17.9: minor rollback (problems caught by the ansi-tests)
           * Don't resignal errors from macroexpansion before calling
              error. Users that care should be hooking onto
              *macroexpand-hook* and handling things there.


Index: ir1tran.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ir1tran.lisp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- ir1tran.lisp	30 Nov 2004 11:21:44 -0000	1.131
+++ ir1tran.lisp	1 Dec 2004 15:19:22 -0000	1.132
@@ -749,7 +749,6 @@
 				      (wherestring) hint c)
 				(muffle-warning-or-die)))
                      (error (lambda (c)
-                              (signal c)
                               (compiler-error "~@<~A~:@_~A~@:_~A~:>"
                                               (wherestring) hint c))))
         (funcall sb!xc:*macroexpand-hook* fun form *lexenv*)))))

Index: main.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/main.lisp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- main.lisp	30 Nov 2004 11:21:45 -0000	1.102
+++ main.lisp	1 Dec 2004 15:19:39 -0000	1.103
@@ -846,7 +846,6 @@
 (defun preprocessor-macroexpand-1 (form)
   (handler-case (sb!xc:macroexpand-1 form *lexenv*)
     (error (condition)
-      (signal condition)
       (compiler-error "(during macroexpansion of ~A)~%~A"
 		      (let ((*print-level* 1)
 			    (*print-length* 2))