X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=fabf38ab61bee0c871acae61bc00bb710fe1e88f;hb=4c546104164756996a06705aa45233e98e2c2daa;hp=98936c04325754145cc7312cfbe92428f26d796f;hpb=7d50938ba2db52a713498e49aa1679deae6f0b6b;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 98936c0..fabf38a 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.1 2002/09/30 10:19:24 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)
@@ -83,21 +82,86 @@
 (defmacro split-64-bit-integer (int64)
   `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
 
+(defvar +ascii-N-value+ (char-code #\N))
+(defvar +ascii-U-value+ (char-code #\U))
+
+(uffi:def-type char-ptr-def (* :unsigned-char))
+
+(defun char-ptr-points-to-null (char-ptr)
+  "Returns T if foreign character pointer refers to 'NULL' string. Only called for numeric entries"
+  ;; Uses short cut and returns T if first character is #\N. It should
+  ;; never be non-numeric
+  (declare (type char-ptr-def char-ptr))
+  (let ((char (uffi:ensure-char-character
+	       (uffi:deref-pointer char-ptr :char))))
+    (char-equal char #\N)))
+    
 (defun convert-raw-field (char-ptr types index)
   (let ((type (if (listp types)
 		  (nth index types)
 		  types)))
-    (case type
-      (:double
-       (atof char-ptr))
-      ((or :int32 :int)
-       (atoi char-ptr))
-      (:int64
-       (uffi:with-foreign-object (high32-ptr :int)
-	 (let ((low32 (atol64 char-ptr high32-ptr))
-	       (high32 (uffi:deref-pointer high32-ptr :int)))
-	   (if (zerop high32)
-	       low32
-	       (make-64-bit-integer high32 low32)))))
+    (cond
+      ((and (or (eq type :double) (eq type :int32) (eq type :int)
+		(eq type :int64))
+	    (char-ptr-points-to-null char-ptr))
+       nil)
       (t
-       (uffi:convert-from-foreign-string char-ptr)))))
+       (case type
+	 (:double
+	  (atof char-ptr))
+	 ((or :int32 :int)
+	  (atoi char-ptr))
+	 (:int64
+	  (uffi:with-foreign-object (high32-ptr :int)
+	    (let ((low32 (atol64 char-ptr high32-ptr))
+		  (high32 (uffi:deref-pointer high32-ptr :int)))
+	      (if (zerop high32)
+		  low32
+		  (make-64-bit-integer high32 low32)))))
+	 (t
+	  #+(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))
+	   (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 (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))