r5002: Auto commit for Debian build

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index aa50ad449540dd35e9cf4e9f8da342229b2d4ba3..a6d4af4da61c779dd82932474cc4a374a0d575b6 100644 (file)
--- 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.17 2003/05/16 18:05:23 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.22 2003/05/17 07:45:05 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -121,9 +121,9 @@
                  (make-64-bit-integer high32 low32)))))
         (t
          ;; Choose optimized routine
-         #-(or cmu sbcl)
+         #-(or cmu sbcl scl)
          (native-to-string char-ptr)
-         #+(or cmu sbcl)
+         #+(or cmu sbcl scl)
          (uffi:convert-from-foreign-string char-ptr)))))))
   
 
@@ -131,6 +131,7 @@
     ((str (* :unsigned-char)))
   :returning :unsigned-int)
 
+#-allegro
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
@@ -142,11 +143,11 @@
        ((= i len))
       (declare (fixnum i))
       (setf (schar str i)
-       (code-char (uffi:deref-array s '(:array :unsigned-char) i)))
+       (code-char (uffi:deref-array s :unsigned-char i)))
       (incf i))
     str))
 
-#-allegro
+#+(and allegro ics)
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
@@ -158,61 +159,32 @@
        ((= i len))
       (declare (fixnum i))
       (setf (schar str i)
-       (code-char (uffi:deref-array s '(:array :unsigned-char) i)))
+       (code-char (uffi:deref-array s :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))
-          (len4 (float 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 :signed-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))
-  
-  #+ignore
-  (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))
+#-(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 :int i))
+       (incf i))
+    (do ((i (* 4 len4)))
        ((= i len))
       (declare (fixnum i))
-      (setf (aref str i) (uffi:deref-array s '(:array :unsigned-char) i))
+      (setf (aref (the (simple-array (signed-byte 8) (*)) str) i)
+       (uffi:deref-array s :unsigned-char i))
       (incf i))
-    str))))
+    str))
+
+
+