diff options
| author | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-12-04 21:16:51 +0100 |
|---|---|---|
| committer | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-12-04 21:16:51 +0100 |
| commit | 03fd82e89b41bbeafa900be8581a3eb8d78c2758 (patch) | |
| tree | fd862868b3c88e6c44915f6c87567e2b76489885 /Lisp | |
| parent | eb9a722a75c7315da50844444717e2dcf6f069e4 (diff) | |
Minor cleanups and fixes.
darcs-hash:efd8243ff1432ed15009ab5d2088f7374d67ab97
Diffstat (limited to 'Lisp')
| -rw-r--r-- | Lisp/lisp-value-wrapping.lisp | 3 | ||||
| -rw-r--r-- | Lisp/method-definition.lisp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Lisp/lisp-value-wrapping.lisp b/Lisp/lisp-value-wrapping.lisp index 1406a95..dbc5ae9 100644 --- a/Lisp/lisp-value-wrapping.lisp +++ b/Lisp/lisp-value-wrapping.lisp @@ -71,12 +71,13 @@ ;; Must override: ;; - characterAtIndex: ;; - length +;; - replaceCharactersInRange:withString: ;; ;; May usefully override, among others: ;; - substringWithRange: (maybe) ;; - getCharacters:range: (for performance reasons) ;; - description -(defclass ns::mlk-lisp-string (ns::ns-string lisp-value-wrapper-mixin) +(defclass ns::mlk-lisp-string (ns::ns-mutable-string lisp-value-wrapper-mixin) () (:metaclass ns::+ns-object)) diff --git a/Lisp/method-definition.lisp b/Lisp/method-definition.lisp index a000c49..c8ce0dd 100644 --- a/Lisp/method-definition.lisp +++ b/Lisp/method-definition.lisp @@ -463,9 +463,14 @@ __define-objective-c-generic-function__. (eval (loop for type in argument-types for typespec = (typespec type) for symbol in arg-symbols + for first-arg-p = t then nil collect (list symbol (typespec->c-type typespec)) into cffi-lambda-list if (member (typespec-primary-type typespec) '(:id :class :selector)) - collect `(intern-pointer-wrapper ',type :pointer ,symbol) + collect `(coerce-object ,symbol ',type) + #+nil + `(intern-pointer-wrapper ',type + :pointer ,symbol + :skip-wrapper-unwrapping ,first-arg-p) into arguments else collect symbol into arguments |