r1608: Reworked LW cstring to use built-in LW conversion

[uffi.git] / src / primitives.cl

diff --git a/src/primitives.cl b/src/primitives.cl
index c113bdfd6156d12aa3520226d2abf60a782a8266..0b5f05585ea30191d0897602e5eb1103fb64bfa5 100644 (file)
--- a/src/primitives.cl
+++ b/src/primitives.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.cl,v 1.10 2002/03/18 22:47: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
 ;;;;
@@ -64,7 +64,9 @@ supports takes advantage of this optimization."
       (: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+
@@ -99,7 +101,8 @@ supports takes advantage of this optimization."
     '((* . :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))
@@ -115,8 +118,11 @@ supports takes advantage of this optimization."
 (dolist (type +cmu-def-type-list+)
   (setf (gethash (car type) +cmu-def-type-hash+) (cdr type)))
 
-(defmethod ph (&optional (os *standard-output*))
-  (maphash #'(lambda (k v) (format os "~&~S => ~S" k v)) +type-conversion-hash+))
+(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"
@@ -131,17 +137,15 @@ supports takes advantage of this optimization."
        (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))))