Changeset 455

Timestamp:

Feb 1, 2004, 11:37:35 AM (21 years ago)

Author:

beer

Message:

Move toward the use of FIND-CLASS and CLASS-OF

File:

• trunk/ccl/examples/bridge.lisp (modified) (4 diffs)

trunk/ccl/examples/bridge.lisp

@@ -7 +7 @@
 ;;;;   (1) Convenient Lisp syntax for instantiating ObjC classes
 ;;;;   (2) Convenient Lisp syntax for invoking ObjC methods
-;;;;   (3) Ability to define CLOS subclasses of ObjC class with Lisp slots
-;;;;       and have their instances be usable as ObjC objects (eventually)
-;;;;   (4) Ability to define CLOS methods on ObjC classes and have them be
-;;;;       invoked by ObjC if they match an ObjC method name (eventually)
 ;;;;
 ;;;; Copyright (c) 2003 Randall D. Beer
@@ -133 +129 @@
 (defun find-objc-class (cname)
   (%objc-class-classptr 
-   (if (symbolp cname)
-       (load-objc-class-descriptor (lisp-to-objc-classname cname))
+   (if (symbolp cname) 
+       (find-class cname)
      (load-objc-class-descriptor cname))))
 
@@ -142 +138 @@
                       
 (defun objc-class-of (o)
-  (multiple-value-bind (ignore class) (objc-object-p o)
-    (declare (ignore ignore))
-    (if (null class)
-      (error "~S is not an ObjC object" o)
-      class)))
+  (if (objc-object-p o)
+      (class-of o)
+    (error "~S is not an ObjC object" o)))
 
 
@@ -153 +147 @@
 
 (defun get-objc-class-from-declaration (otype)
-  (cond ((symbolp otype)
-         (lookup-objc-class (lisp-to-objc-classname otype)))
+  (cond ((symbolp otype) (lookup-objc-class (lisp-to-objc-classname otype)))
         ((and (consp otype) (eq (first otype) '@metaclass))
          (let* ((name (second otype))