r10584: * tests/objects.lisp: Rename from pointers.lisp.

        Fix test CHPTR.4 as noted by Joerg Hoehle
        * src/objects.lisp: Remove default from ensure-char-integer

diff --git a/ChangeLog b/ChangeLog
index a4731214116f56eeb1783a8e680dfc440588d486..8e59a1723cf2aa7bfe7559c5ba9b73cceb06bbdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2005-06-09 Kevin Rosenberg (kevin@rosenberg.net)
+       * tests/objects.lisp: Rename from pointers.lisp. 
+       Fix test CHPTR.4 as noted by Joerg Hoehle
+       * src/objects.lisp: Remove default from ensure-char-integer
+       
+2005-06-09 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 1.4.38
        * src/libraries.lisp: Commit patch from Edi Weitz to
        allow plain filename library names to allow underlying
        lisp implementation to find foreign libraries in the

diff --git a/src/objects.lisp b/src/objects.lisp
index 7648e93039cb8d4a71554921c455bb42528daf05..e9a2024112ec409b26c136a3deda65020ba8ca16 100644 (file)
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -137,8 +137,7 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   
 (defmacro ensure-char-integer (obj)
   #+(or (and mcl (not openmcl))) `(char-code ,obj)
-  #+(or allegro cmu sbcl scl openmcl) obj
-  `(if (characterp ,obj) (char-code ,obj) ,obj))
+  #+(or allegro cmu sbcl scl openmcl) obj)
 
 (defmacro ensure-char-storable (obj)
   #+(or lispworks (and mcl (not openmcl))) obj

diff --git a/tests/pointers.lisp b/tests/pointers.lisp
index 64391b9eab0951095cc2e06e9ec24fd757c21e71..cebb359fd1fa677583858f528c72d5a1363c8c41 100644 (file)
--- a/tests/pointers.lisp
+++ b/tests/pointers.lisp
@@ -39,8 +39,9 @@
 (deftest :chptr.4
     (let ((native-string "test string"))
       (uffi:with-foreign-string (fs native-string)
-       (numberp
-        (deref-pointer fs :byte))))
+       (integerp
+        (ensure-char-integer
+         (deref-pointer fs :unsigned-char)))))
   t)
        
 (deftest :chptr.5