Changeset 12571 for third-party

Timestamp:

08/21/06 20:01:28 (2 years ago)

Author:

cmarcelo

Message:

* HsJudy?: Fixes usage for negative numbers as keys and values.

Location:

third-party/HsJudy

Files:

• Judy/HashIO.hs (modified) (2 diffs)
• Judy/Refeable.hs (modified) (2 diffs)
• tests/TestIntMap.hs (modified) (2 diffs)

third-party/HsJudy/Judy/HashIO.hs

@@ -10 +10 @@
 
 import Judy.Private
+import GHC.Exts (unsafeCoerce#)
 
 class HashIO a where
@@ -22 +23 @@
 instance Enum a => UniqueHashIO a where
 instance Enum a => HashIO a where
-    hashIO = return . toEnum . fromEnum
+    hashIO = return . unsafeCoerce# . fromEnum
 instance Enum a => ReversibleHashIO a where
-    unHashIO = return . toEnum . fromEnum
+    unHashIO = return . toEnum . unsafeCoerce#
 
 

third-party/HsJudy/Judy/Refeable.hs

@@ -13 +13 @@
 import Judy.Private
 import qualified Judy.MiniGC as GC
-
+import GHC.Exts (unsafeCoerce#)
 
 -- FIXME: It results in an illegal instruction if I take the "Dummy a"
@@ -35 +35 @@
 
 instance Refeable Int where
-    toRef i = return $ toEnum i
-    fromRef v = return $ fromEnum v
+    toRef i = return $ unsafeCoerce# i
+    fromRef v = return $ unsafeCoerce# v
     needGC _ = False
 

third-party/HsJudy/tests/TestIntMap.hs

@@ -16 +16 @@
     insert 1 42 s
     lookup 1 s    .=> Just 42
+
+t "Negative values" $ do
+    s <- new :: IO (IntMap Int Int)
+    insert 1 (-1) s
+    insert 2 (-2) s
+    lookup 1 s      .=> Just (-1)
+    lookup 2 s      .=> Just (-2)
 
 t "Delete" $ do
@@ -161 +168 @@
     J.takeLast 1 m       .=> [(98,198)]
 
+t "Negative keys" $ do
+    s <- new :: IO (IntMap Int Int)
+    insert (-1) (-1) s
+    insert (-2) (-2) s
+    insert   1    3  s
+    insert (-3)   4  s
+    lookup (-1) s      .=> Just (-1)
+    lookup (-2) s      .=> Just (-2)
+    lookup   1  s      .=> Just   3
+    lookup (-3) s      .=> Just   4
+
+    
+
 -- TODO: test some crazy haskell type as value (to check stableptrs)