r9904: patch from Marco B. for openmcl get-slot-value

[uffi.git] / src / aggregates.lisp

diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index 5c5b5118a88950ea607a21a9f322c6a8c0768adc..4160864817e5701ad8a7bec4af0c57ccf64134c4 100644 (file)
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -118,7 +118,8 @@ of the enum-name name, separator-string, and field-name"
   #+sbcl
   `(sb-alien:slot ,obj ,slot)
   #+mcl
-  `(ccl:pref ,obj ,(read-from-string (format nil ":~a.~a" (keyword type) (keyword slot))))
+  `(ccl:pref ,obj ,(intern (concatenate 'string (symbol-name type) "." (symbol-name slot))
+                         :keyword))
   )
 
 #+mcl
@@ -159,15 +160,9 @@ of the enum-name name, separator-string, and field-name"
 
 (defmacro deref-array (obj type i)
   "Returns a field from a row"
-  #+(or lispworks scl) (declare (ignore type))
-  #+(or cmu scl)  `(alien:deref
-                   (alien:cast
-                    ,obj
-                    ,(convert-from-uffi-type type :declare)) ,i)
-  #+sbcl `(sb-alien:deref
-          (sb-alien:cast 
-           ,obj
-           ,(convert-from-uffi-type type :declare)) ,i)
+  #+(or lispworks cmu sbcl scl) (declare (ignore type))
+  #+(or cmu scl)  `(alien:deref ,obj ,i)
+  #+sbcl `(sb-alien:deref ,obj ,i)
   #+lispworks `(fli:dereference ,obj :index ,i :copy-foreign-object nil)
   #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :type)) :c ,obj ,i)
   #+openmcl