Changeset 133

Timestamp:

Dec 19, 2003, 1:36:02 PM (21 years ago)

Author:

Gary Byers

Message:

Require (new) OBJC-RUNTIME. Conditionalize a little for runtime differences
(needs more work.)

File:

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

trunk/ccl/examples/bridge.lisp

@@ -25 +25 @@
 (in-package "CCL")
 
-#+darwinppc-target
-(require "APPLE-OBJC")
-#+linuxppc-target
-(require "GNU-OBJC")
+(require "OBJC-RUNTIME")
 (require "NAME-TRANSLATION")
 
 
-;;; Define the #@"XXX" dispatch macro for constant NSStrings from APPLE-OBJ.LISP
-;;; in the current readtable 
-
-(set-dispatch-macro-character
- #\#
- #\@
- (nfunction
-  |objc-#@-reader|
-  (lambda (stream subchar numarg)
-    (declare (ignore subchar numarg))
-    (let* ((string (read stream)))
-      (check-type string string)
-      `(@ ,string)))))
 
 
@@ -190 +174 @@
 
 (defun get-method (class sel)
-  (let ((m (#_class_getInstanceMethod class sel)))
+  (let ((m (class-get-instance-method class sel)))
     (if (%null-ptr-p m)
       (error "Instances of ObjC class ~S cannot respond to the message ~S" 
@@ -201 +185 @@
 
 (defun get-class-method (class sel)
-  (let ((m (#_class_getClassMethod class sel)))
+  (let ((m (class-get-class-method class sel)))
     (if (%null-ptr-p m)
       (error "ObjC class ~S cannot respond to the message ~S" 
@@ -385 +369 @@
    (objc-foreign-arg-type (method-typestring m))
    (%stack-block ((type 4) (offset 4))
-     (loop for i from 2 below (#_method_getNumberOfArguments m)
+     (loop for i from 2 below (method-get-number-of-arguments m)
            do (#_method_getArgumentInfo m i type offset)
            collect