clsql/uffi clsql-uffi.lisp,1.19,1.20

Update of /pubcvs/clsql/uffi
In directory boa.b9.com:/tmp/cvs-serv3416/uffi

Modified Files:
	clsql-uffi.lisp 
Log Message:
Auto commit for Debian build

Index: clsql-uffi.lisp
===================================================================
RCS file: /pubcvs/clsql/uffi/clsql-uffi.lisp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** clsql-uffi.lisp	16 May 2003 18:09:10 -0000	1.19
--- clsql-uffi.lisp	16 May 2003 18:53:57 -0000	1.20
***************
*** 147,151 ****
      str))
  
! #-allegro
  (defun native-to-string (s)
    (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
--- 147,151 ----
      str))
  
! #+(and allegro ics)
  (defun native-to-string (s)
    (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
***************
*** 163,218 ****
      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 (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))
!   
!   #+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))
      (do ((i 0))
  	((= i len))
        (declare (fixnum i))
!       (setf (aref str i) (uffi:deref-array s '(:array :unsigned-char) i))
        (incf i))
!     str))))
--- 163,189 ----
      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))
! 
! 
!