X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fstrings.cl;h=cc3a1edc721d58c6eb948fdbbc02f6ade98c0813;hb=ab96e211bb083d1e1ea4edca83d4f6d47b41c84b;hp=5a4b5671b291f92c271bb7c345a99e9d071ac6b2;hpb=e1ba5e8ff148275ed252b179f43a4b045c1dcaf6;p=uffi.git

diff --git a/src/strings.cl b/src/strings.cl
index 5a4b567..cc3a1ed 100644
--- 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.8 2002/03/19 16:42:59 kevin Exp $
+;;;; $Id: strings.cl,v 1.15 2002/03/31 23:05:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -27,14 +27,9 @@
 
 (defmacro convert-from-cstring (obj)
   "Converts a string from a c-call. Same as convert-from-foreign-string, except
-that CMU automatically converts strings from c-calls."
+that LW/CMU automatically converts strings from c-calls."
   #+cmu obj
-  #+lispworks 
-  (let ((stored (gensym)))
-    `(let ((,stored ,obj))
-       (if (fli:null-pointer-p ,stored)
-	   nil
-	 (fli:convert-from-foreign-string ,stored))))
+  #+lispworks obj
   #+allegro 
   (let ((stored (gensym)))
     `(let ((,stored ,obj))
@@ -44,54 +39,43 @@ that CMU automatically converts strings from c-calls."
   )
 
 (defmacro convert-to-cstring (obj)
-  #+lispworks
-  `(if (null ,obj)
-    +null-cstring-pointer+
-    (fli:convert-to-foreign-string ,obj))
+  #+cmu obj
+  #+lispworks obj
   #+allegro
   `(if (null ,obj)
     0
     (values (excl:string-to-native ,obj)))
-  #+cmu
-  (declare (ignore obj))
   )
 
 (defmacro free-cstring (obj)
-  #+lispworks
-  `(unless (fli:null-pointer-p ,obj)
-     (fli:free-foreign-object ,obj))
+  #+cmu (declare (ignore obj))
+  #+lispworks (declare (ignore obj))
   #+allegro
   `(unless (zerop obj)
      (ff:free-fobject ,obj))
-  #+cmu
-  (declare (ignore obj))
   )
 
-;; Either length or null-terminated-p must be non-nil
-(defmacro convert-from-foreign-string (obj &key
-					   length
-					   (null-terminated-p t))
-  #+allegro
-  `(if (zerop ,obj)
-       nil
-     (values (excl:native-to-string
-	      ,obj 
-	      ,@(if length (list :length length) (values))
-	      :truncate (not ,null-terminated-p))))
-  #+lispworks
-  `(if (fli:null-pointer-p ,obj)
-       nil
-     (fli:convert-from-foreign-string 
-      ,obj
-      ,@(if length (list :length length) (values))
-      :null-terminated-p ,null-terminated-p
-      :external-format '(:latin-1 :eol-style :lf)))      
+(defmacro with-cstring ((cstring lisp-string) &body body)
   #+cmu
-  `(cmucl-naturalize-cstring (alien:alien-sap ,obj)
-			      :length ,length
-			      :null-terminated-p ,null-terminated-p)
+  `(let ((,cstring ,lisp-string)) ,@body) 
+  #+lispworks
+  `(let ((,cstring ,lisp-string)) ,@body) 
+  #+allegro
+  (let ((acl-native (gensym)))
+    `(excl:with-native-string (,acl-native ,lisp-string)
+       (let ((,cstring (if ,lisp-string ,acl-native 0)))
+	 ,@body)))
   )
 
+(defmacro with-cstrings (bindings &rest body)
+  (if bindings
+      `(with-cstring ,(car bindings)
+	(with-cstrings ,(cdr bindings)
+	  ,@body))
+      `(progn ,@body)))
+
+;;; Foreign string functions
+
 (defmacro convert-to-foreign-string (obj)
   #+lispworks
   `(if (null ,obj)
@@ -105,7 +89,10 @@ that CMU automatically converts strings from c-calls."
   (let ((size (gensym))
 	(storage (gensym))
 	(i (gensym)))
-    `(when (stringp ,obj)
+    `(etypecase ,obj
+      (null 
+       (alien:sap-alien (system:int-sap 0) (* (alien:unsigned 8))))
+      (string
        (let* ((,size (length ,obj))
 	      (,storage (alien:make-alien (alien:unsigned 8) (1+ ,size))))
 	 (setq ,storage (alien:cast ,storage (* (alien:unsigned 8))))
@@ -115,10 +102,39 @@ that CMU automatically converts strings from c-calls."
 	     (declare (fixnum ,i))
 	     (setf (alien:deref ,storage ,i) (char-code (char ,obj ,i))))
 	   (setf (alien:deref ,storage ,size) 0))
-	 ,storage)))
+	 ,storage))))
+      )
+
+
+;; Either length or null-terminated-p must be non-nil
+(defmacro convert-from-foreign-string (obj &key
+					   length
+					   (null-terminated-p t))
+  #+allegro
+  `(if (zerop ,obj)
+       nil
+     (values (excl:native-to-string
+	      ,obj 
+	      ,@(if length (list :length length) (values))
+	      :truncate (not ,null-terminated-p))))
+  #+lispworks
+  `(if (fli:null-pointer-p ,obj)
+       nil
+     (fli:convert-from-foreign-string 
+      ,obj
+      ,@(if length (list :length length) (values))
+      :null-terminated-p ,null-terminated-p
+      :external-format '(:latin-1 :eol-style :lf)))      
+  #+cmu
+  `(if (null-pointer-p ,obj)
+    nil
+    (cmucl-naturalize-cstring (alien:alien-sap ,obj)
+     :length ,length
+     :null-terminated-p ,null-terminated-p))
   )
 
 
+
 (defmacro allocate-foreign-string (size &key (unsigned t))
   #+cmu
   (let ((array-def (gensym)))
@@ -139,21 +155,14 @@ that CMU automatically converts strings from c-calls."
   `(ff:allocate-fobject :char :c ,size)
   )
 
-(defmacro with-cstring ((foreign-string lisp-string) &body body)
-  #+cmu
-  `(let ((,foreign-string ,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)))
-	 ,@body)))
-  #+lispworks
+(defmacro with-foreign-string ((foreign-string lisp-string) &body body)
   (let ((result (gensym)))
-    `(let* ((,foreign-string (convert-to-cstring ,lisp-string))
-	    (,result ,@body))
-       (fli:free-foreign-object ,foreign-string)
-       ,result))
-  )
+    `(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
+	    (,result (progn ,@body)))
+      (declare (dynamic-extent ,foreign-string))
+      (free-foreign-object ,foreign-string)
+      ,result)))
+
 
 ;; Modified from CMUCL's source to handle non-null terminated strings
 #+cmu