Changeset 15223

Timestamp:

Feb 18, 2012, 11:27:40 PM (13 years ago)

Author:

Gary Byers

Message:

Try to fix ticket:865 another way.

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 warn %error)))
+             (memq (setq head (pop expansion)) '(signal error cerror 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 ,@args))))
           ((signal error warn)
            (destructuring-bind