X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=2302f5f9894f767fbbe7e26b155b6cfded379c1e;hb=cf18fb5f235ada6e009d14e1dc5a74e360c2eca2;hp=3c4c8180e23e9736587da7ea3a3c83fc02719c82;hpb=7b60895e23603aba2506b1dde8bb1d59efaa94eb;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 3c4c818..2302f5f 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.7 2003/05/15 07:39:42 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.9 2003/05/16 08:04:02 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)
 	  (native-to-string char-ptr)
-	  #+ignore
+	  #+(or cmu sbcl)
 	  (uffi:convert-from-foreign-string char-ptr)))))))
   
 
@@ -143,3 +145,51 @@
 	(code-char (uffi:deref-array s '(:array :unsigned-char) i)))
       (incf i))
     str))
+
+#-allegro
+(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))
+
+#+allegro
+(excl:ics-target-case
+ (:-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)))
+ (:+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)
+	     (type (simple-array (unsigned-byte 8) (*)) str))
+    (do ((i 0))
+	((= i len))
+      (declare (fixnum i))
+      (setf (aref str i) (uffi:deref-array s '(:array :unsigned-char) i))
+      (incf i))
+    str))))