X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fstrings.lisp;h=684b0351ca108948b00ea5426a4f16407dc1a30b;hb=045b87e7fdcf1c5562fe170d96622e0a09759f64;hp=63847cc3885fa0bcd61c6157a1c946ed604d2e58;hpb=7653a03580807774202e699a091a2e8520db5cf8;p=uffi.git

diff --git a/src/strings.lisp b/src/strings.lisp
index 63847cc..684b035 100644
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          strings.cl
+;;;; Name:          strings.lisp
 ;;;; Purpose:       UFFI source to handle strings, cstring and foreigns
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.lisp,v 1.3 2002/10/14 03:07:41 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,25 +16,20 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 
 (defvar +null-cstring-pointer+
-    #+cmu nil
-    #+sbcl nil
+    #+(or cmu sbcl scl) nil
     #+allegro 0
     #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char))
     #+mcl (ccl:%null-ptr)
-    #-(or cmu allegro lispworks mcl) nil
 )
 
 (defmacro convert-from-cstring (obj)
   "Converts a string from a c-call. Same as convert-from-foreign-string, except
 that LW/CMU automatically converts strings from c-calls."
-  #+cmu obj
-  #+sbcl obj
-  #+lispworks obj
+  #+(or cmu sbcl lispworks scl) obj
   #+allegro 
   (let ((stored (gensym)))
     `(let ((,stored ,obj))
@@ -50,9 +45,7 @@ that LW/CMU automatically converts strings from c-calls."
   )
 
 (defmacro convert-to-cstring (obj)
-  #+cmu obj
-  #+sbcl obj
-  #+lispworks obj
+  #+(or cmu sbcl scl lispworks) obj
   #+allegro
   `(if (null ,obj)
     0
@@ -61,14 +54,14 @@ that LW/CMU automatically converts strings from c-calls."
   `(if (null ,obj)
     +null-cstring-pointer+
     (let ((ptr (new-ptr (1+ (length ,obj)))))
-      (ccl:%put-cstring ptr ,obj)
+      (ccl::%put-cstring ptr ,obj)
       ptr))
   )
 
 (defmacro free-cstring (obj)
-  #+(or cmu sbcl lispworks) (declare (ignore obj))
+  #+(or cmu sbcl scl lispworks) (declare (ignore obj))
   #+allegro
-  `(unless (zerop obj)
+  `(unless (zerop ,obj)
      (ff:free-fobject ,obj))
   #+mcl
   `(unless (ccl:%null-ptr-p ,obj)
@@ -76,7 +69,7 @@ that LW/CMU automatically converts strings from c-calls."
   )
 
 (defmacro with-cstring ((cstring lisp-string) &body body)
-  #+(or cmu sbcl lispworks)
+  #+(or cmu sbcl scl lispworks)
   `(let ((,cstring ,lisp-string)) ,@body) 
   #+allegro
   (let ((acl-native (gensym)))
@@ -103,13 +96,13 @@ that LW/CMU automatically converts strings from c-calls."
 (defmacro convert-to-foreign-string (obj)
   #+lispworks
   `(if (null ,obj)
-       +null-cstring-pointer+
-    (fli:convert-to-foreign-string ,obj))
+    +null-cstring-pointer+
+    (fli:convert-to-foreign-string ,obj :external-format '(:latin-1 :eol-style :lf)))
   #+allegro
   `(if (null ,obj)
        0
      (values (excl:string-to-native ,obj)))
-  #+cmu
+  #+(or cmu scl)
   (let ((size (gensym))
 	(storage (gensym))
 	(i (gensym)))
@@ -149,7 +142,7 @@ that LW/CMU automatically converts strings from c-calls."
   `(if (null ,obj)
        +null-cstring-pointer+
      (let ((ptr (new-ptr (1+ (length ,obj)))))
-       (ccl:%put-cstring ptr ,obj)
+       (ccl::%put-cstring ptr ,obj)
        ptr))
   )
 
@@ -157,23 +150,29 @@ that LW/CMU automatically converts strings from c-calls."
 ;; Either length or null-terminated-p must be non-nil
 (defmacro convert-from-foreign-string (obj &key
 					   length
+					   (locale :default)
 					   (null-terminated-p t))
   #+allegro
   `(if (zerop ,obj)
        nil
-     (values (excl:native-to-string
-	      ,obj 
-	      ,@(if length (list :length length) (values))
-	      :truncate (not ,null-terminated-p))))
+     (if (eq ,locale :none)
+	 (fast-native-to-string ,obj ,length)
+       (values
+	(excl:native-to-string
+	 ,obj 
+	 ,@(when length (list :length length))
+	 :truncate (not ,null-terminated-p)))))
   #+lispworks
   `(if (fli:null-pointer-p ,obj)
        nil
-     (fli:convert-from-foreign-string 
-      ,obj
-      ,@(if length (list :length length) (values))
-      :null-terminated-p ,null-terminated-p
-      :external-format '(:latin-1 :eol-style :lf)))      
-  #+cmu
+     (if (eq ,locale :none)
+	 (fast-native-to-string ,obj ,length)
+       (fli:convert-from-foreign-string 
+	,obj
+	,@(when length (list :length length))
+	:null-terminated-p ,null-terminated-p
+	:external-format '(:latin-1 :eol-style :lf))))
+  #+(or cmu scl)
   `(if (null-pointer-p ,obj)
     nil
     (cmucl-naturalize-cstring (alien:alien-sap ,obj)
@@ -190,26 +189,34 @@ that LW/CMU automatically converts strings from c-calls."
   #+mcl
   `(if (ccl:%null-ptr-p ,obj)
      nil
-     (ccl:%get-cstring ,obj 0 ,@(if length (list length) nil)))
+    #+(and mcl (not openmcl)) (ccl:%get-cstring ,obj 0 ,@(if length (list length) nil))
+    #+openmcl ,@(if length
+		    `((ccl:%str-from-ptr ,obj ,length))
+		    `((ccl:%get-cstring ,obj))))
   )
 
 
-
 (defmacro allocate-foreign-string (size &key (unsigned t))
-  #+cmu
+  #+ignore
   (let ((array-def (gensym)))
     `(let ((,array-def (list 'alien:array 'c-call:char ,size)))
        (eval `(alien:cast (alien:make-alien ,,array-def) 
 			  ,(if ,unsigned 
 			       '(* (alien:unsigned 8))
 			     '(* (alien:signed 8)))))))
+
+  #+(or cmu scl)
+  `(alien:make-alien ,(if unsigned 
+			     '(alien:unsigned 8)
+			     '(alien:signed 8))
+    ,size)
+
   #+sbcl
-  (let ((array-def (gensym)))
-    `(let ((,array-def (list 'sb-alien:array 'char ,size)))
-       (eval `(sb-alien:cast (sb-alien:make-alien ,,array-def) 
-			  ,(if ,unsigned 
-			       '(* (sb-alien:unsigned 8))
-			     '(* (sb-alien:signed 8)))))))
+  `(sb-alien:make-alien ,(if unsigned 
+			     '(sb-alien:unsigned 8)
+			     '(sb-alien:signed 8))
+    ,size)
+
   #+lispworks
   `(fli:allocate-foreign-object :type 
 				,(if unsigned 
@@ -226,6 +233,15 @@ that LW/CMU automatically converts strings from c-calls."
   `(new-ptr ,size)
   )
 
+(defun foreign-string-length (foreign-string)
+  #+allegro `(ff:foreign-strlen ,foreign-string)
+  #-allegro
+  `(loop with size = 0
+    until (char= (deref-array ,foreign-string '(:array :unsigned-char) size) #\Null)
+    do (incf size)
+    finally return size))
+
+
 (defmacro with-foreign-string ((foreign-string lisp-string) &body body)
   (let ((result (gensym)))
     `(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
@@ -259,16 +275,18 @@ that LW/CMU automatically converts strings from c-calls."
 				    (* length vm:byte-bits))
       result)))
 
-#+sbcl
-(defun sbcl-naturalize-cstring (sap &key length (null-terminated-p t))
-  (declare (type sb-sys:system-area-pointer sap))
+#+scl
+;; kernel:copy-from-system-area doesn't work like it does on CMUCL or SBCL,
+;; so have to iteratively copy from sap
+(defun cmucl-naturalize-cstring (sap &key length (null-terminated-p t))
+  (declare (type system:system-area-pointer sap))
   (locally
       (declare (optimize (speed 3) (safety 0)))
     (let ((null-terminated-length
 	   (when null-terminated-p
 	     (loop
 		 for offset of-type fixnum upfrom 0
-		 until (zerop (sb-sys:sap-ref-8 sap offset))
+		 until (zerop (system:sap-ref-8 sap offset))
 		 finally (return offset)))))
       (if length
 	  (if (and null-terminated-length
@@ -276,8 +294,79 @@ that LW/CMU automatically converts strings from c-calls."
 	      (setq length null-terminated-length))
 	(setq length null-terminated-length)))
     (let ((result (make-string length)))
-      (sb-kernel:copy-from-system-area sap 0
-				    result (* sb-vm:vector-data-offset
-					      sb-vm:n-word-bits)
-				    (* length sb-vm:n-byte-bits))
+      (dotimes (i length)
+	(declare (type fixnum i))
+	(setf (char result i) (code-char (system:sap-ref-8 sap i))))
       result)))
+
+#+(and sbcl (not sb-unicode))
+(defun sbcl-naturalize-cstring (sap &key length (null-terminated-p t))
+  (declare (type sb-sys:system-area-pointer sap)
+	   (type (or null fixnum) length))
+  (locally
+   (declare (optimize (speed 3) (safety 0)))
+   (let ((null-terminated-length
+	  (when null-terminated-p
+	    (loop
+	     for offset of-type fixnum upfrom 0
+	     until (zerop (sb-sys:sap-ref-8 sap offset))
+	     finally (return offset)))))
+     (if length
+	 (if (and null-terminated-length
+		  (> (the fixnum length) (the fixnum null-terminated-length)))
+	     (setq length null-terminated-length))
+       (setq length null-terminated-length)))
+   (let ((result (make-string length)))
+       (funcall *system-copy-fn* sap 0 result +system-copy-offset+
+		(* length +system-copy-multiplier+))
+       result)))
+
+#+(and sbcl sb-unicode)
+(defun sbcl-naturalize-cstring (sap &key length (null-terminated-p t))
+  (declare (type sb-sys:system-area-pointer sap)
+	   (type (or null fixnum) length))
+  (locally
+   (declare (optimize (speed 3) (safety 0)))
+   (cond
+    (null-terminated-p
+     (let ((casted (sb-alien:cast (sb-alien:sap-alien sap (* char))
+				  #+sb-unicode sb-alien:utf8-string
+				  #-sb-unicode sb-alien:c-string)))
+       (if length
+	   (copy-seq (subseq casted 0 length))
+	 (copy-seq casted))))
+    (t
+     (let ((result (make-string length)))
+       ;; this will not work in sb-unicode
+       (funcall *system-copy-fn* sap 0 result +system-copy-offset+
+		(* length +system-copy-multiplier+))
+       result)))))
+
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+   (def-function "strlen"
+     ((str (* :unsigned-char)))
+     :returning :unsigned-int))
+
+(def-type char-ptr-def (* :unsigned-char))
+
+#+(or lispworks (and allegro (not ics)))
+(defun fast-native-to-string (s len)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+	   (type char-ptr-def s))
+  (let* ((len (or len (strlen s)))
+         (str (make-string len)))
+    (declare (fixnum len)
+	     (type (simple-array (signed-byte 8) (*)) str))
+    (dotimes (i len str)
+      (setf (aref str i) 
+	(uffi:deref-array s '(:array :char) i)))))
+
+#+(and allegro ics)
+(defun fast-native-to-string (s len)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+	   (type char-ptr-def s))
+  (let* ((len (or len (strlen s)))
+         (str (make-string len)))
+      (dotimes (i len str)
+        (setf (schar str i) (code-char (uffi:deref-array s '(:array :unsigned-byte) i))))))