r9006: fix on allegro

[uffi.git] / src / strings.lisp

diff --git a/src/strings.lisp b/src/strings.lisp
index b4c1917a052486b358b7f5c1c757d57e30a41ff7..4671925661c8b67298d5879a233524e08e9619f7 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.lisp,v 1.8 2003/06/06 21:59:18 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -156,7 +156,7 @@ that LW/CMU automatically converts strings from c-calls."
   `(if (zerop ,obj)
        nil
      (if (eq ,locale :none)
-        (fast-native-to-string ,obj)
+        (fast-native-to-string ,obj ,length)
        (excl:native-to-string
        ,obj 
        ,@(when length (list :length length))
@@ -165,7 +165,7 @@ that LW/CMU automatically converts strings from c-calls."
   `(if (fli:null-pointer-p ,obj)
        nil
      (if (eq ,locale :none)
-        (fast-native-to-string ,obj)
+        (fast-native-to-string ,obj ,length)
        (fli:convert-from-foreign-string 
        ,obj
        ,@(when length (list :length length))
@@ -223,6 +223,15 @@ that LW/CMU automatically converts strings from c-calls."
   `(new-ptr ,size)
   )
 
+(defun foreign-string-length (foreign-string)
+  #+allegro `(ff:foreign-strlen ,foreign-string)
+  #-allegro
+  `(loop with size = 0
+    until (char= (deref-array ,ptr '(:array :unsigned-char) size) #\Null)
+    do (incf size)
+    finally return size))
+
+
 (defmacro with-foreign-string ((foreign-string lisp-string) &body body)
   (let ((result (gensym)))
     `(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
@@ -308,41 +317,25 @@ that LW/CMU automatically converts strings from c-calls."
     ((str (* :unsigned-char)))
   :returning :unsigned-int)
 
-#+(or lispworks (and allegro ics))
-(defun fast-native-to-string (s)
+(def-type char-ptr-def (* :unsigned-char))
+
+#+(or lispworks (and allegro (not ics)))
+(defun fast-native-to-string (s len)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
-  (let* ((len (strlen s))
-        (str (make-string len)))
+  (let* ((len (or len (strlen s)))
+         (str (make-string len)))
     (declare (fixnum len)
-            (simple-string str))
-    (do ((i 0))
-       ((= i len))
-      (declare (fixnum i))
-      (setf (schar str i)
-       (code-char (uffi:deref-array s '(:array :unsigned-char) i)))
-      (incf i))
-    str))
+            (type (simple-array (signed-byte 8) (*)) str))
+    (dotimes (i len str)
+      (setf (aref str i) 
+       (uffi:deref-array s '(:array :char) i)))))
 
-#+(and allegro (not ics))
-(defun fast-native-to-string (s)
+#+(and allegro ics)
+(defun fast-native-to-string (s len)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
-  (let* ((len (strlen s))
-        (len4 (floor len 4))
-        (str (make-string len)))
-    (declare (fixnum len)
-            (type (simple-array (signed-byte 32) (*)) str))
-    (do ((i 0))
-       ((= i len4))
-      (declare (fixnum i))
-      (setf (aref (the (simple-array (signed-byte 32) (*)) str) i)
-       (uffi:deref-array s '(:array :int) i))
-       (incf i))
-    (do ((i (* 4 len4)))
-       ((= i len))
-      (declare (fixnum i))
-      (setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
-       (uffi:deref-array s '(:array :unsigned-char) i))
-      (incf i))
-    str))
+  (let* ((len (or len (strlen s)))
+         (str (make-string len)))
+      (dotimes (i len str)
+        (setf (schar str i) (code-char (uffi:deref-array s '(:array :byte) i))))))