Changeset 13700

Timestamp:

May 15, 2010, 1:28:55 AM (9 years ago)

Author:

gz

Message:

As an interim measure, add compile-time parameter *objc-error-return-condition* to control which conditions gets caught by objc:defmethod. See ticket:682

File:

• trunk/source/objc-bridge/objc-runtime.lisp (modified) (2 diffs)

trunk/source/objc-bridge/objc-runtime.lisp

@@ -2962 +2962 @@
     (#_memmove return-temp value size)))
 
+
+(defvar *objc-error-return-condition* 'condition
+  "Type of conditions to be caught by objc:defmethod and resignalled as objc exceptions,
+   allowing handlers for them to safely take a non-local exit despite possible intervening ObjC
+   frames.   The resignalling unwinds the stack before the handler is invoked, which can be
+   a problem for some handlers.")
+
+
 (defmacro objc:defmethod (name (self-arg &rest other-args) &body body &environment env)
   (collect ((arglist)
@@ -3060 +3068 @@
                  ',result-type
                  ',(cddr arg-types))
-                (defcallback ,impname ( :error-return (condition objc-callback-error-return) ,@(arglist))
+                (defcallback ,impname ( :error-return (,*objc-error-return-condition* objc-callback-error-return) ,@(arglist))
                   (declare (ignorable ,self-name)
                            (unsettable ,self-name)