(t
(basic-convert-from-uffi-type type)))
(let ((sub-type (car type)))
- (case sub-type
- (cl:quote
- (convert-from-uffi-type (cadr type) context))
- (:struct-pointer
- #+mcl `(:* (:struct ,(%convert-from-uffi-type (cadr type) :struct)))
- #-mcl (%convert-from-uffi-type (list '* (cadr type)) :struct)
- )
- (:struct
+ (cond
+ ((eq sub-type 'cl:quote)
+ (convert-from-uffi-type (cadr type) context))
+ #+sbcl
+ ((and (eq sub-type :array)
+ (or (eq context :declare) (eq context :routine))
+ (= 2 (length type)))
+ `(sb-alien:array ,(%convert-from-uffi-type (second type) context) nil))
+ #+cmu
+ ((and (eq sub-type :array)
+ (or (eq context :declare) (eq context :routine))
+ (= 2 (length type)))
+ `(alien:array ,(%convert-from-uffi-type (second type) context) nil))
+ ((eq sub-type :struct-pointer)
+ #+mcl `(:* (:struct ,(%convert-from-uffi-type (cadr type) :struct)))
+ #-mcl (%convert-from-uffi-type (list '* (second type)) :struct)
+ )
+ ((eq sub-type :struct)
#+mcl `(:struct ,(%convert-from-uffi-type (cadr type) :struct))
- #-mcl (%convert-from-uffi-type (cadr type) :struct)
+ #-mcl (%convert-from-uffi-type (second type) :struct)
)
(t
(cons (%convert-from-uffi-type (first type) context)
(let ((result (%convert-from-uffi-type type context)))
(cond
((atom result) result)
- ;; Arrays without size are really pointers to type on SBCL/CMUCL
- #+sbcl
- ((and (consp type) (= 2 (length type)) (eq :array (car type)))
- (setf (car result) 'sb-alien:*)
- result)
- #+cmu
- ((and (consp type) (= 2 (length type)) (eq :array (car type)))
- (setf (car result) 'alien:*)
- result)
#+openmcl
((eq (car result) :address)
(if (eq context :struct)
(eval-when (:compile-toplevel :load-toplevel :execute)
(when (char= #\a (schar (symbol-name '#:a) 0))
(pushnew :uffi-lowercase-reader *features*))
- (when (not (string-equal (symbol-name '#:a)
- (symbol-name '#:A)))
+ (when (not (string= (symbol-name '#:a)
+ (symbol-name '#:A)))
(pushnew :uffi-case-sensitive *features*)))
(defun make-lisp-name (name)