Changeset 14462

Timestamp:

Dec 1, 2010, 2:01:09 PM (14 years ago)

Author:

Gary Byers

Message:

Fix protocol handling for Cocotron.

File:

• trunk/source/objc-bridge/objc-support.lisp (modified) (3 diffs)

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

@@ -48 +48 @@
         (incf n)))))
 
+
 (defun %note-protocol (p)
-  (with-macptrs ((cname (objc-message-send p "name" :address)))
+  ;; In Cocotron (which is ultimately based on the GNU ObjC runtime),
+  ;; it may be the case that some Protocol objects aren't fully initialized
+  ;; when this code runs, hence the sleazy use of PREF here.
+  (with-macptrs ((cname #+cocotron-objc (pref p #>Protocol.nameCString)
+                        #-cocotron-objc (objc-message-send p "name" :address)))
     (let* ((namelen (%cstrlen cname))
            (name (make-string namelen)))
@@ -64 +69 @@
 
 (defun note-class-protocols (class)
-  #-(or apple-objc-2.0 cocotron-objc)
+  #-(or apple-objc-2.0)
   (do* ((protocols (pref class :objc_class.protocols)
                    (pref protocols :objc_protocol_list.next)))
@@ -73 +78 @@
           (with-macptrs ((p (paref list (:* (:* (:struct :<P>rotocol))) i)))
             (%note-protocol p))))))
-  #+(or apple-objc-2.0 cocotron-objc)
+  #+(or apple-objc-2.0)
   (rlet ((p-out-count :int 0))
     (with-macptrs ((protocols (#_class_copyProtocolList class p-out-count)))