;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: primitives.cl,v 1.11 2002/03/21 10:58:57 kevin Exp $
+;;;; $Id: primitives.cl,v 1.12 2002/03/21 11:38:07 kevin Exp $
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
(:unsigned-long . (alien:unsigned 32))
(:float . alien:single-float)
(:double . alien:double-float)
- ))
+ )
+ "Conversions in CMUCL or def-foreign-type are different thatn in def-function")
+
#+cmu
(defconstant +type-conversion-list+
'((* . :pointer) (:void . :void)
(:short . :short)
(:pointer-void . (:pointer :unsigned :void))
- (:cstring . (:pointer (:unsigned :char)))
+ (:cstring . (:reference-pass :ef-mb-string :allow-null t))
+ (:cstring-returning . (:reference :ef-mb-string :allow-null t))
(:char . :char)
(:byte :byte)
(:unsigned-char . (:unsigned :char))
(dolist (type +cmu-def-type-list+)
(setf (gethash (car type) +cmu-def-type-hash+) (cdr type)))
+(defun basic-convert-from-uffi-type (type)
+ (let ((found-type (gethash type +type-conversion-hash+)))
+ (if found-type
+ found-type
+ type)))
+
(defun convert-from-uffi-type (type context)
"Converts from a uffi type to an implementation specific type"
(if (atom type)
(let ((cmu-type (gethash type +cmu-def-type-hash+)))
(if cmu-type
cmu-type
- (let ((found-type (gethash type +type-conversion-hash+)))
- (if found-type
- found-type
- type)))))
+ (basic-convert-from-uffi-type type))))
+ #+lispworks
+ ((and (eq context :return)
+ (eq type :cstring))
+ (basic-convert-from-uffi-type :cstring-returning))
(t
- (let ((found-type (gethash type +type-conversion-hash+)))
- (if found-type
- found-type
- type))))
- (cons (convert-from-uffi-type (first type) context)
- (convert-from-uffi-type (rest type) context))))
+ (basic-convert-from-uffi-type type)))
+ (cons (convert-from-uffi-type (first type) context)
+ (convert-from-uffi-type (rest type) context))))