X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=7bc3a94c55678c8d2a7af65f579f493c429bd1f9;hb=f0b691b8b5c1222c339dbef3b27dd457da615a65;hp=11fb988c6358269588418cd98105c1232a11db0d;hpb=082969cc01765b8ebde78cd35a41ad274d1af02d;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 11fb988..7bc3a94 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.6 2003/05/15 07:33:21 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.23 2003/05/17 07:50:55 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -120,8 +120,10 @@
 		  low32
 		  (make-64-bit-integer high32 low32)))))
 	 (t
+	  ;; Choose optimized routine
+	  #-(or cmu sbcl lispworks scl)
 	  (native-to-string char-ptr)
-	  #+ignore
+	  #+(or cmu sbcl lispworks scl)
 	  (uffi:convert-from-foreign-string char-ptr)))))))
   
 
@@ -129,8 +131,10 @@
     ((str (* :unsigned-char)))
   :returning :unsigned-int)
 
+#-allegro
 (defun native-to-string (s)
-  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0)))
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+	   (type char-ptr-def s))
   (let* ((len (strlen s))
 	 (str (make-string len)))
     (declare (fixnum len)
@@ -142,3 +146,45 @@
 	(code-char (uffi:deref-array s '(:array :unsigned-char) i)))
       (incf i))
     str))
+
+#+(and allegro ics)
+(defun native-to-string (s)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+	   (type char-ptr-def s))
+  (let* ((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))
+
+#-(and allegro ics)
+(defun native-to-string (s)
+  (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))
+
+
+