X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprimitives.cl;h=d5e1e367b0b07262b45220e46dc5379d1a2a1821;hb=ffa431d2f677263c3bd256da23090248d82b186a;hp=bf013e65669c2e9ca658bad075ae254978007429;hpb=0ed0429c5921629ae1912f96379a8715e2d48a3b;p=uffi.git

diff --git a/src/primitives.cl b/src/primitives.cl
index bf013e6..d5e1e36 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.11 2002/03/21 10:58:57 kevin Exp $
+;;;; $Id: primitives.cl,v 1.19 2002/06/27 05:46:39 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
@@ -55,7 +56,8 @@ supports takes advantage of this optimization."
 (defconstant +cmu-def-type-list+
     '((:char . (alien:signed 8))
       (:unsigned-char . (alien:unsigned 8))
-      (:byte . (alien:unsigned 8))
+      (:byte . (alien:signed 8))
+      (:unsigned-byte . (alien:unsigned 8))
       (:short . (alien:signed 16))
       (:unsigned-short . (alien:unsigned 16))
       (:int . (alien:signed 32))
@@ -64,17 +66,21 @@ 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))
       (:cstring . c-call:c-string)
       (:char . c-call:char) 
       (:unsigned-char . (alien:unsigned 8))
-      (:byte . (alien:unsigned 8))
+      (:byte . (alien:signed 8))
+      (:unsigned-byte . (alien:unsigned 8))
       (:short . c-call:unsigned-short) 
       (:unsigned-short . c-call:unsigned-short)
       (:int . alien:integer) (:unsigned-int . c-call:unsigned-int) 
@@ -82,26 +88,30 @@ 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))
       (:cstring . (* :unsigned-char))
+      (:byte . :char)
+      (:unsigned-byte . :unsigned-byte)
       (:char . :char)
       (:unsigned-char . :unsigned-char)
-      (:byte . :byte)
       (:int . :int) (:unsigned-int . :unsigned-int) 
       (:long . :long) (:unsigned-long . :unsigned-long)
       (: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))
+      (:byte . :byte))
+      (:unsigned-byte . (:unsigned :byte))
       (:char . :char)
-      (:byte :byte)
       (:unsigned-char . (:unsigned :char))
       (:int . :int) (:unsigned-int . (:unsigned :int))
       (:long . :long) (:unsigned-long . (:unsigned :long))
@@ -115,6 +125,12 @@ supports takes advantage of this optimization."
 (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)
@@ -128,17 +144,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))))