Changeset 11597

Timestamp:

Jan 7, 2009, 10:55:15 AM (12 years ago)

Author:

gb

Message:

If sending an "init..." message to a newly-allocated ObjC instance
returns a null pointer, return that null pointer (rather than signalling
an error) in the ObjC version of ALLOCATE-INSTANCE and return that
null pointer from INITIALIZE-INSTANCE.

(In other words, allow

(make-instance some-objc-class :with-args ...)

to return a null pointer when

(#/initWithArgs: (#/alloc some-objc-class) ...)

would do so.)

File:

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

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

@@ -720 +720 @@
 (defmethod make-instance ((class objc:objc-class-object) &rest initargs)
   (let ((instance (apply #'allocate-instance class initargs)))
-    (apply #'initialize-instance instance initargs)))
+    (if (%null-ptr-p instance)
+      instance
+      (apply #'initialize-instance instance initargs))))
 
 
@@ -753 +755 @@
                                                        initargs))
             (send-objc-init-message (allocate-objc-object class) ks vs))))
-    (if (%null-ptr-p instance)
-      (error "Got null pointer when trying to init instance of Objective-C class ~s with initargs ~s"
-             class (remove-slot-initargs class initargs))
+    (unless (%null-ptr-p instance)
       (or (gethash instance *objc-object-slot-vectors*)
           (let* ((slot-vector (create-foreign-instance-slot-vector class)))