X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstrings.cl;h=0bb574252f32a89a7efa5fac694e33bc5e853a48;hb=cb657edcb17cc3c4a6e1c35b7ce33aaf9db48903;hp=0f0c54cfef695065f72a45ee6ffca455a34f8eda;hpb=d088e362ddd9bdd99c2d1815ab87c5328cdc92a3;p=uffi.git

diff --git a/src/strings.cl b/src/strings.cl
index 0f0c54c..0bb5742 100644
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -1,30 +1,19 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          immediates.cl
-;;;; Purpose:       UFFI source to handle immediate types
+;;;; Name:          strings.cl
+;;;; Purpose:       UFFI source to handle strings, cstring and foreigns
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: strings.cl,v 1.9 2002/03/21 04:05:15 kevin Exp $
 ;;;;
-;;;; $Id: strings.cl,v 1.4 2002/03/10 11:13:07 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; This file is part of the UFFI. 
-;;;;
-;;;; UFFI is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; UFFI is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with UFFI; if not, write to the Free Software
-;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; UFFI users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
@@ -34,7 +23,7 @@
 (def-constant +null-cstring-pointer+
     #+cmu nil
     #+allegro 0
-    #+lispworks (fli:make-pointer :address 0 :type :char))
+    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char)))
 
 (defmacro convert-from-cstring (obj)
   "Converts a string from a c-call. Same as convert-from-foreign-string, except
@@ -57,14 +46,12 @@ that CMU automatically converts strings from c-calls."
 (defmacro convert-to-cstring (obj)
   #+lispworks
   `(if (null ,obj)
-       +null-cstring-pointer+
-     (fli:make-pointer
-      :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
-      :type :char))
+    +null-cstring-pointer+
+    (fli:convert-to-foreign-string ,obj))
   #+allegro
   `(if (null ,obj)
-       0
-     (values (excl:string-to-native ,obj)))
+    0
+    (values (excl:string-to-native ,obj)))
   #+cmu
   (declare (ignore obj))
   )
@@ -109,9 +96,7 @@ that CMU automatically converts strings from c-calls."
   #+lispworks
   `(if (null ,obj)
        +null-cstring-pointer+
-     (fli:make-pointer
-      :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
-      :type :char))
+    (fli:convert-to-foreign-string ,obj))
   #+allegro
   `(if (null ,obj)
        0
@@ -122,18 +107,19 @@ that CMU automatically converts strings from c-calls."
 	(i (gensym)))
     `(when (stringp ,obj)
        (let* ((,size (length ,obj))
-	      (,storage (alien:make-alien char (1+ ,size))))
-	 (setq ,storage (alien:cast ,storage (* char)))
-	 (dotimes (,i ,size)
-	   (declare (fixnum ,i)
-		    (optimize (speed 3) (safety 0)))
-	   (setf (alien:deref ,storage ,i) (char-code (char ,obj ,i))))
-	 (setf (alien:deref ,storage ,size) 0)
+	      (,storage (alien:make-alien (alien:unsigned 8) (1+ ,size))))
+	 (setq ,storage (alien:cast ,storage (* (alien:unsigned 8))))
+	 (locally
+	     (declare (optimize (speed 3) (safety 0)))
+	   (dotimes (,i ,size)
+	     (declare (fixnum ,i))
+	     (setf (alien:deref ,storage ,i) (char-code (char ,obj ,i))))
+	   (setf (alien:deref ,storage ,size) 0))
 	 ,storage)))
   )
 
 
-(defmacro allocate-foreign-string (size &key (unsigned nil))
+(defmacro allocate-foreign-string (size &key (unsigned t))
   #+cmu
   (let ((array-def (gensym)))
     `(let ((,array-def (list 'alien:array 'c-call:char ,size)))
@@ -153,22 +139,32 @@ that CMU automatically converts strings from c-calls."
   `(ff:allocate-fobject :char :c ,size)
   )
 
-(defmacro with-cstring ((foreign-string lisp-string) &body body)
+(defmacro with-foreign-string ((foreign-string lisp-string) &body body)
+  (let ((result (gensym)))
+    `(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
+	    (,result (progn ,@body)))
+      (declare (dynamic-extent ,foreign-string))
+      (free-foreign-object ,foreign-string)
+      ,result)))
+
+(defmacro with-cstring ((cstring lisp-string) &body body)
   #+cmu
-  `(let ((,foreign-string ,lisp-string)) ,@body) 
+  `(let ((,cstring ,lisp-string)) ,@body) 
   #+allegro
   (let ((acl-native (gensym)))
     `(excl:with-native-string (,acl-native ,lisp-string)
-       (let ((,foreign-string (if ,lisp-string ,acl-native 0)))
+       (let ((,cstring (if ,lisp-string ,acl-native 0)))
 	 ,@body)))
   #+lispworks
   (let ((result (gensym)))
-    `(let* ((,foreign-string (convert-to-cstring ,lisp-string))
-	    (,result ,@body))
-       (fli:free-foreign-object ,foreign-string)
+    `(let* ((,cstring (convert-to-cstring ,lisp-string))
+	    (,result (progn ,@body)))
+       (fli:free-foreign-object ,cstring)
        ,result))
   )
 
+
+
 ;; Modified from CMUCL's source to handle non-null terminated strings
 #+cmu
 (defun cmucl-naturalize-cstring (sap &key