X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.cl;h=5ec2cd34dc31e4e8da748979eca43cd513f1a19f;hb=0c9dc6958a373b41b8cc25e9e121c36dedc289d4;hp=c113bdfd6156d12aa3520226d2abf60a782a8266;hpb=11f2368e2aa756f12f698ce3f2d5182d2299dafc;p=uffi.git

diff --git a/src/primitives.cl b/src/primitives.cl
index c113bdf..5ec2cd3 100644
--- a/src/primitives.cl
+++ b/src/primitives.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -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.18 2002/05/17 16:51:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,8 @@
   "Macro to define a constant and to export it"
   `(eval-when (:compile-toplevel :load-toplevel :execute)
      (defconstant ,name ,value)
-     ,(if export (list 'export `(quote ,name)) (values))))
+     ,(when export (list 'export `(quote ,name)))
+    ',name))
 
 (defmacro def-type (name type)
   "Generates a (deftype) statement for CL. Currently, only CMUCL
@@ -64,10 +65,13 @@ 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")
+
+(defparameter +type-conversion-list+ nil)
 
 #+cmu
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . *) (:void . c-call:void) 
       (:short . c-call:short)
       (:pointer-void . (* t))
@@ -82,7 +86,7 @@ supports takes advantage of this optimization."
       (:float . c-call:float) (:double . c-call:double)
       (:array . alien:array)))
 #+allegro
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . *) (:void . :void)
       (:short . :short)
       (:pointer-void . (* :void))
@@ -95,11 +99,13 @@ supports takes advantage of this optimization."
       (:float . :float) (:double . :double)
       (:array . :array)))
 #+lispworks
-(defconstant +type-conversion-list+
+(setq +type-conversion-list+
     '((* . :pointer) (:void . :void) 
       (:short . :short)
-      (:pointer-void . (:pointer :unsigned :void))
-      (:cstring . (:pointer (:unsigned :char)))
+      (:pointer-void . (:pointer :void))
+      (:cstring . (:reference-pass (:ef-mb-string :external-format :latin-1)
+				   :allow-null t))
+      (:cstring-returning . (:reference (:ef-mb-string :external-format :latin-1) :allow-null t))
       (:char . :char)
       (:byte :byte)
       (:unsigned-char . (:unsigned :char))
@@ -115,8 +121,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 +140,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))))