Fix comparison for dereference

[uffi.git] / src / strings.lisp

diff --git a/src/strings.lisp b/src/strings.lisp
index fc7a282628cd471a13ab2800192dc15cd18a4979..430d8ab48d15c1b29c988108570867b41e487b89 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -99,8 +99,8 @@ that LW/CMU automatically converts strings from c-calls."
 
 ;;; Foreign string functions
 
-(defun %convert-to-foreign-string (str foreign-encoding)
-  (declare (ignorable str foreign-encoding))
+(defun %convert-to-foreign-string (str encoding)
+  (declare (ignorable str encoding))
   #+(or cmu scl)
   (etypecase str
     (null
@@ -144,7 +144,8 @@ that LW/CMU automatically converts strings from c-calls."
     (string
      (locally
          (declare (optimize (speed 3) (safety 0)))
-       (let* ((fe (or foreign-encoding *default-foreign-encoding*))
+       (let* ((fe (or encoding *default-foreign-encoding*
+                      sb-impl::*default-external-format*))
               (ife (when fe (lookup-foreign-encoding fe))))
          (if ife
              (let* ((octets (sb-ext:string-to-octets str :external-format ife))
@@ -154,7 +155,7 @@ that LW/CMU automatically converts strings from c-calls."
                (setq storage (sb-alien:cast storage (* (sb-alien:unsigned 8))))
                (dotimes (i size)
                  (declare (fixnum i))
-                 (setf (sb-alien:deref storage i) (svref octets i)))
+                 (setf (sb-alien:deref storage i) (aref octets i)))
                ;; terminate with 2 nulls, maybe needed for some encodings
                (setf (sb-alien:deref storage size) 0)
                (setf (sb-alien:deref storage (1+ size)) 0)
@@ -176,7 +177,7 @@ that LW/CMU automatically converts strings from c-calls."
       +null-cstring-pointer+
       (locally
           (declare (optimize (speed 3) (safety 0)))
-        (let* ((fe (or foreign-encoding *default-foreign-encoding*))
+        (let* ((fe (or encoding *default-foreign-encoding*))
                (ife (when fe (lookup-foreign-encoding fe))))
           (if ife
               (let* ((octets (ccl:encode-string-to-octets str :external-format ife))
@@ -205,14 +206,14 @@ that LW/CMU automatically converts strings from c-calls."
   nil
   )
 
-(defmacro convert-to-foreign-string (obj &optional foreign-encoding)
-  (declare (ignorable foreign-encoding))
+(defmacro convert-to-foreign-string (obj &optional encoding)
+  (declare (ignorable encoding))
   #+allegro
   (let ((stored (gensym "STR-"))
         (fe (gensym "FE-"))
         (ife (gensym "IFE-")))
     `(let* ((,stored ,obj)
-            (,fe (or foreign-encoding *default-foreign-encoding*))
+            (,fe (or encoding *default-foreign-encoding*))
             (,ife (when ,fe
                     (lookup-foreign-encoding ,fe))))
        (cond
@@ -228,7 +229,7 @@ that LW/CMU automatically converts strings from c-calls."
         (fe (gensym "EF-"))
         (ife (gensym "NEF-")))
     `(let* ((,stored ,obj)
-            (,fe (or ,foreign-encoding *default-foreign-encoding*))
+            (,fe (or ,encoding *default-foreign-encoding*))
             (,ife (when ,fe
                     (lookup-foreign-encoding ,fe))))
        (cond
@@ -241,16 +242,16 @@ that LW/CMU automatically converts strings from c-calls."
 
   #+(or cmu scl sbcl digitool openmcl)
   `(%convert-to-foreign-string ,obj (lookup-foreign-encoding
-                                     (or ,foreign-encoding *default-foreign-encoding*)))
+                                     (or ,encoding *default-foreign-encoding*)))
 )
 
 
 ;; Either length or null-terminated-p must be non-nil
 (defmacro convert-from-foreign-string (obj &key
                                        length
-                                       foreign-encoding
+                                       encoding
                                        (null-terminated-p t))
-  (declare (ignorable length foreign-encoding null-terminated-p))
+  (declare (ignorable length encoding null-terminated-p))
   #+allegro
   (let ((stored-obj (gensym "STR-"))
         (fe (gensym "FE-"))
@@ -258,7 +259,7 @@ that LW/CMU automatically converts strings from c-calls."
     `(let ((,stored-obj ,obj))
        (if (zerop ,stored-obj)
            nil
-           (let* ((,fe (or ,foreign-encoding *default-foreign-encoding*))
+           (let* ((,fe (or ,encoding *default-foreign-encoding*))
                   (,ife (when ,fe (lookup-foreign-encoding ,fe))))
              (if ,ife
                  (values
@@ -270,26 +271,31 @@ that LW/CMU automatically converts strings from c-calls."
                  (fast-native-to-string ,stored-obj ,length))))))
 
   #+lispworks
-  ;; FAST-NATIVE-TO-STRING (suprisingly) works just fine with UTF-8 multibyte character strings
+  #|
+  ;; FAST-NATIVE-TO-STRING (suprisingly) works just fine to make strings
+  ;; for formatted printing with Lispworks and UTF-8 multibyte character strings.
   ;; However, without knowledge of specific-encoding, the LENGTH call in FAST-NATIVE-TO-STRING
-  ;; may not be incorrect for some encodings/strings.
+  ;; will be be incorrect for some encodings/strings and strings consist of octets rather
+  ;; than wide characters
   ;; This is a stop-gap until get tech support on why the below fails.
   (let ((stored-obj (gensym "STR-")))
     `(let ((,stored-obj ,obj))
        (if (fli:null-pointer-p ,stored-obj)
            nil
            (fast-native-to-string ,stored-obj ,length))))
+  |#
+  #|
   ;; Below code doesn't work on tesing with LW 6.0 testing with a UTF-8 string.
   ;; fli:convert-from-foreign-string with :external-format of :UTF-8 doesn't
   ;; properly code multibyte characters.
-#|
+  |#
   (let ((stored-obj (gensym "STR-"))
         (fe (gensym "FE-"))
         (ife (gensym "IFE-")))
     `(let ((,stored-obj ,obj))
        (if (fli:null-pointer-p ,stored-obj)
            nil
-           (let* ((,fe (or ,foreign-encoding *default-foreign-encoding*))
+           (let* ((,fe (or ,encoding *default-foreign-encoding*))
                   (,ife (when ,fe (lookup-foreign-encoding ,fe))))
              (if ,ife
                  (fli:convert-from-foreign-string
@@ -298,7 +304,6 @@ that LW/CMU automatically converts strings from c-calls."
                   :null-terminated-p ,null-terminated-p
                   :external-format (list ,ife :eol-style :lf))
                  (fast-native-to-string ,stored-obj ,length))))))
-|#
 
   #+(or cmu scl)
   (let ((stored-obj (gensym)))
@@ -324,7 +329,7 @@ that LW/CMU automatically converts strings from c-calls."
     `(let ((,stored-obj ,obj))
        (if (null-pointer-p ,stored-obj)
            nil
-           (let* ((,fe (or ,foreign-encoding *default-foreign-encoding*))
+           (let* ((,fe (or ,encoding *default-foreign-encoding*))
                   (,ife (when ,fe (lookup-foreign-encoding ,fe))))
              (sb-alien::c-string-to-string (sb-alien:alien-sap ,stored-obj)
                                            (or ,ife sb-impl::*default-external-format* :latin-1)
@@ -341,7 +346,7 @@ that LW/CMU automatically converts strings from c-calls."
             ,stored-obj 0
             ,@(if length (list length) nil))
            #+openmcl
-           (let ((,fe (or ,foreign-encoding *default-foreign-encoding*)))
+           (let ((,fe (or ,encoding *default-foreign-encoding*)))
              (case ,fe
                (:utf-8
                 (ccl::%get-utf-8-cstring ,stored-obj))
@@ -389,19 +394,19 @@ that LW/CMU automatically converts strings from c-calls."
   )
 
 (defun foreign-string-length (foreign-string)
-  #+allegro `(ff:foreign-strlen ,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))
+  (loop
+     for size from 0
+     until (zerop (deref-array foreign-string '(:array :unsigned-char) size))
+     finally (return size)))
 
 
-(defmacro with-foreign-string ((foreign-string lisp-string &optional foreign-encoding)
+(defmacro with-foreign-string ((foreign-string lisp-string &optional encoding)
                                &body body)
   (let ((result (gensym))
         (fe (gensym)))
-    `(let* ((,fe ,foreign-encoding)
+    `(let* ((,fe ,encoding)
             (,foreign-string (convert-to-foreign-string ,lisp-string ,fe))
             (,result (progn ,@body)))
       (declare (dynamic-extent ,foreign-string))