r1608: Reworked LW cstring to use built-in LW conversion

[uffi.git] / src / strings.cl

diff --git a/src/strings.cl b/src/strings.cl
index 95fdadf3289e1f0d3e3b83433d34a842d663c4d8..ba4dfa297b4d926a7daf7ec2501970acdf0aadac 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.6 2002/03/17 17:33:30 kevin Exp $
+;;;; $Id: strings.cl,v 1.11 2002/03/21 11:38: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,29 +39,67 @@ 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))
+  )
+
+(defmacro with-cstring ((cstring lisp-string) &body body)
   #+cmu
-  (declare (ignore obj))
+  `(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)))
   )
 
+
+;;; Foreign string functions
+
+(defmacro convert-to-foreign-string (obj)
+  #+lispworks
+  `(if (null ,obj)
+       +null-cstring-pointer+
+    (fli:convert-to-foreign-string ,obj))
+  #+allegro
+  `(if (null ,obj)
+       0
+     (values (excl:string-to-native ,obj)))
+  #+cmu
+  (let ((size (gensym))
+       (storage (gensym))
+       (i (gensym)))
+    `(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))))
+        (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))))
+      )
+
+
 ;; Either length or null-terminated-p must be non-nil
 (defmacro convert-from-foreign-string (obj &key
                                           length
@@ -87,35 +120,13 @@ that CMU automatically converts strings from c-calls."
       :null-terminated-p ,null-terminated-p
       :external-format '(:latin-1 :eol-style :lf)))      
   #+cmu
-  `(cmucl-naturalize-cstring (alien:alien-sap ,obj)
-                             :length ,length
-                             :null-terminated-p ,null-terminated-p)
+  `(if (null-pointer-p ,obj)
+    nil
+    (cmucl-naturalize-cstring (alien:alien-sap ,obj)
+     :length ,length
+     :null-terminated-p ,null-terminated-p))
   )
 
-(defmacro convert-to-foreign-string (obj)
-  #+lispworks
-  `(if (null ,obj)
-       +null-cstring-pointer+
-    (fli:convert-to-foreign-string ,obj))
-  #+allegro
-  `(if (null ,obj)
-       0
-     (values (excl:string-to-native ,obj)))
-  #+cmu
-  (let ((size (gensym))
-       (storage (gensym))
-       (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)))
-  )
 
 
 (defmacro allocate-foreign-string (size &key (unsigned t))
@@ -138,21 +149,17 @@ 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