diff options
| author | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-02-02 23:26:55 +0100 |
|---|---|---|
| committer | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-02-02 23:26:55 +0100 |
| commit | 3d0e2eda9285b91a998b86cb72c806c2aa5d789e (patch) | |
| tree | 05faddca66b1b032d9f2f6464c984a5e0bd68f6e /Lisp/method-invocation.lisp | |
| parent | 4157d85957b1b89fabf1a55f2896ec58ee6d99d6 (diff) | |
Replace all occurrences of OBJC-CLASS with OBJECTIVE-C-CLASS.
darcs-hash:1ba389d5a50343a134892bde78ba62e21842f684
Diffstat (limited to 'Lisp/method-invocation.lisp')
| -rw-r--r-- | Lisp/method-invocation.lisp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Lisp/method-invocation.lisp b/Lisp/method-invocation.lisp index ef5058a..92a9c92 100644 --- a/Lisp/method-invocation.lisp +++ b/Lisp/method-invocation.lisp @@ -219,7 +219,7 @@ easier to use with __apply__. (let* ((raw-argc (the argument-number (length args))) (real-argc (+ raw-argc 2)) (return-c-type (case return-type - ((id objc-class exception selector) :pointer) + ((id objective-c-class exception selector) :pointer) (otherwise return-type))) (selector (if (typep method-name 'selector) method-name @@ -305,7 +305,7 @@ easier to use with __apply__. ;; us. (error (make-condition 'exception :pointer error-cell))) (case return-type - ((id objc-class exception selector) + ((id objective-c-class exception selector) (let ((*skip-retaining* (or *skip-retaining* (constructor-name-p (selector-name selector)))) @@ -357,7 +357,8 @@ easier to use with __apply__. (defun typespec->c-type (typespec) (case (car typespec) - ((:pointer struct union id objc-class exception array selector) :pointer) + ((:pointer struct union id objective-c-class exception array selector) + :pointer) ((:string) :string) (otherwise (car typespec)))) @@ -405,7 +406,7 @@ easier to use with __apply__. do (case (car arg-type) ((:pointer) (setf (argref :pointer i) arg)) - ((objc-class exception) + ((objective-c-class exception) (setf (argref :pointer i) (pointer-to arg))) ((selector) (setf (argref :pointer i) (pointer-to (selector arg)))) @@ -457,7 +458,7 @@ easier to use with __apply__. (unless (cffi:null-pointer-p error-cell) (error (make-condition 'exception :pointer error-cell))) (case (car return-type) - ((id objc-class exception selector) + ((id objective-c-class exception selector) (let ((*skip-retaining* (or *skip-retaining* (constructor-name-p (selector-name selector))))) @@ -489,7 +490,7 @@ easier to use with __apply__. (defcoercion id ((x id)) x) -(defcoercion id ((x objc-class)) +(defcoercion id ((x objective-c-class)) x) (defcoercion id ((x exception)) @@ -537,7 +538,7 @@ easier to use with __apply__. (defcoercion class ((x exception)) (object-get-class x)) -(defcoercion class ((x objc-class)) +(defcoercion class ((x objective-c-class)) x) (defcoercion class ((x string)) |