r1597: Added with-foreign-string

[uffi.git] / src / strings.cl

diff --git a/src/strings.cl b/src/strings.cl
index a32edde37bac370c3915c467bcca5751c9107398..0bb574252f32a89a7efa5fac694e33bc5e853a48 100644 (file)
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.cl,v 1.7 2002/03/18 22:47:57 kevin Exp $
+;;;; $Id: strings.cl,v 1.9 2002/03/21 04:05:15 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -107,20 +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 
-                                             #+cmu nil
-                                             #+lispworks t))
+(defmacro allocate-foreign-string (size &key (unsigned t))
   #+cmu
   (let ((array-def (gensym)))
     `(let ((,array-def (list 'alien:array 'c-call:char ,size)))
@@ -140,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