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.

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index a7355de..45b1de9 100644 (file)
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -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*)))))

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index aabf3da..efb342c 100644 (file)
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -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))

diff --git a/tests/lambda-list.pure.lisp b/tests/lambda-list.pure.lisp
index 3f202d7..4b318df 100644 (file)
--- a/tests/lambda-list.pure.lisp
+++ b/tests/lambda-list.pure.lisp
@@ -11,24 +11,27 @@
 ;;;; absolutely no warranty. See the COPYING and CREDITS files for
 ;;;; more information.
 
-(macrolet ((error-p (ll)
-             `(progn
-                (multiple-value-bind (result error) (ignore-errors (handler-bind ((error #'error))
-                                                                     (eval `(lambda ,',ll 'ok))))
-                  (unless (and (not result) error)
-                    (error "No error from lambda ~S." ',ll)))
-                (multiple-value-bind (result error) (ignore-errors (handler-bind ((error #'error))
-                                                                     (eval `(lambda (x) (destructuring-bind ,',ll x 'ok)))))
-                  (unless (and (not result) error)
-                    (error "No error from d-b ~S." ',ll))))))
-  (error-p (&aux (foo 1) &aux (bar 2)))
-  (error-p (&aux (foo 1) &key bar))
-  (error-p (&aux (foo 1) &optional bar))
-  (error-p (&aux (foo 1) &rest bar))
-  (error-p (&key foo &allow-other-keys &allow-other-keys))
-  (error-p (&key foo &key bar))
-  (error-p (&key foo &optional bar))
-  (error-p (&key foo &rest bar))
-  (error-p (&optional foo &optional bar))
-  (error-p (&rest foo &rest bar))
-  (error-p (&rest foo &optional bar)))
+(let ((*macroexpand-hook* (lambda (fun form env)
+                            (handler-bind ((error (lambda (c)
+                                                    (when (eq 'destructuring-bind (car form))
+                                                      (throw 'd-b-error c)))))
+                              (funcall fun form env)))))
+  (macrolet ((error-p (ll)
+               `(progn
+                  (multiple-value-bind (result error) (ignore-errors (eval `(lambda ,',ll 'ok)))
+                    (unless (and (not result) error)
+                      (error "No error from lambda ~S." ',ll)))
+                  (catch 'd-b-error
+                    (eval `(lambda (x) (destructuring-bind ,',ll x 'ok)))
+                    (error "No error from d-b ~S." ',ll)))))
+    (error-p (&aux (foo 1) &aux (bar 2)))
+    (error-p (&aux (foo 1) &key bar))
+    (error-p (&aux (foo 1) &optional bar))
+    (error-p (&aux (foo 1) &rest bar))
+    (error-p (&key foo &allow-other-keys &allow-other-keys))
+    (error-p (&key foo &key bar))
+    (error-p (&key foo &optional bar))
+    (error-p (&key foo &rest bar))
+    (error-p (&optional foo &optional bar))
+    (error-p (&rest foo &rest bar))
+    (error-p (&rest foo &optional bar))))

diff --git a/version.lisp-expr b/version.lisp-expr
index 7c55463..8c0088c 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.17.8"
+"0.8.17.9"