Changeset 230

Timestamp:

Jan 5, 2004, 9:19:43 PM (21 years ago)

Author:

Gary Byers

Message:

Derive the names of superclasses when recursively mapping classes; don't
use the name MAP-OBJC-CLASS was called with/defaulted to over and over.

File:

• trunk/ccl/examples/objc-runtime.lisp (modified) (2 diffs)

trunk/ccl/examples/objc-runtime.lisp

@@ -142 +142 @@
               (splay-tree-count objc-metaclass-map) 0
               next-objc-class-id 0)))
-    (defun map-objc-class (class &optional (class-name
-                                            (objc-to-lisp-classname
-                                             (%get-cstring
-                                              (pref class :objc_class.name))
-                                             "NS")
-                                            class-name-p))
+    (defun map-objc-class (class &optional (name nil name-p))
       "ensure that the class (and metaclass) are mapped to a small integer"
       (with-lock-grabbed (objc-class-lock)
-        (labels ((ensure-mapped-class (class)
+        (labels ((ensure-mapped-class (class &optional
+                                             (class-name
+                                              (objc-to-lisp-classname
+                                               (%get-cstring
+                                                (pref class :objc_class.name))
+                                               "NS")
+                                              class-name-p))
                    (ensure-objc-classptr-resolved class)
                    (with-macptrs ((super (pref class :objc_class.super_class)))
@@ -186 +187 @@
                          )
                          id))))
-          (ensure-mapped-class class))))
+          (if name-p
+            (ensure-mapped-class class name)
+            (ensure-mapped-class class)))))
     (defun objc-class-id (class)
       (with-lock-grabbed (objc-class-lock)