Changeset 15222

Timestamp:

Feb 18, 2012, 10:54:06 PM (13 years ago)

Author:

Gary Byers

Message:

In RESTART-CASE-FORM, don't try to "optimize" (RESTART-CASE (CERROR ...)).
Fixes ticket:865.

File:

• trunk/source/lib/macros.lisp (modified) (1 diff)

trunk/source/lib/macros.lisp

@@ -397 +397 @@
         (head nil))
     (if (and (listp expansion)          ; already an ugly hack, made uglier by %error case ...
-             (memq (setq head (pop expansion)) '(signal error cerror warn %error)))
+             (memq (setq head (pop expansion)) '(signal error warn %error)))
       (let ((condform nil)
             (signalform nil)
             (cname (gensym)))
         (case head
-          (cerror
-           (destructuring-bind 
-             (continue cond &rest args) expansion
-             (setq condform `(condition-arg ,cond (list ,@args) 'simple-error)
-                   signalform `(cerror ,continue ,cname))))
           ((signal error warn)
            (destructuring-bind