r5053: *** empty log message ***

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

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 11fb988c6358269588418cd98105c1232a11db0d..fabf38ab61bee0c871acae61bc00bb710fe1e88f 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.6 2003/05/15 07:33:21 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.28 2003/05/29 05:19:50 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-uffi)
+(in-package #:clsql-uffi)
 
 
 (defun canonicalize-type-list (types auto-list)
@@ -95,7 +94,7 @@
   (declare (type char-ptr-def char-ptr))
   (let ((char (uffi:ensure-char-character
               (uffi:deref-pointer char-ptr :char))))
-    (eql char #\N)))
+    (char-equal char #\N)))
     
 (defun convert-raw-field (char-ptr types index)
   (let ((type (if (listp types)
@@ -120,17 +119,18 @@
                  low32
                  (make-64-bit-integer high32 low32)))))
         (t
-         (native-to-string char-ptr)
-         #+ignore
-         (uffi:convert-from-foreign-string char-ptr)))))))
+         #+(or allegro lispworks) (native-to-string char-ptr) ;; optimized
+         #-(or allegro lispworks) (uffi:convert-from-foreign-string char-ptr)))))))
   
 
 (uffi:def-function "strlen"
     ((str (* :unsigned-char)))
   :returning :unsigned-int)
 
+#+(or lispworks (and allegro ics))
 (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 +142,26 @@
        (code-char (uffi:deref-array s '(:array :unsigned-char) i)))
       (incf i))
     str))
+
+#+(and allegro (not 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))