Changeset 12204 for third-party

Timestamp:

08/14/06 08:21:50 (2 years ago)

Author:

cmarcelo

Message:

* Integrate judy and HsJudy? on Pugs' build process. Make IArray and IHash
use HsJudy?.

Location:

third-party/HsJudy

Files:

• HsJudy.cabal (modified) (1 diff)
• Judy/MiniGC.hs (modified) (1 diff)
• Judy/Private.hsc (modified) (3 diffs)
• Judy/Refeable.hs (modified) (1 diff)

third-party/HsJudy/HsJudy.cabal

@@ -6 +6 @@
 author:              Caio Marcelo de Oliveira Filho <cmarcelo@gmail.com>, John Meacham
 maintainer:          Caio Marcelo de Oliveira Filho <cmarcelo@gmail.com>
-build-depends:       base
+build-depends:       base -any, pugs-fps -any
 exposed-modules:     Judy.BitSet Judy.Freeze Judy.Hash Judy.IntMap Judy.StrMap Judy.CollectionsM Judy.HashIO Judy.Refeable Judy.Stringable
 other-modules:       Judy.Private Judy.MiniGC
 extensions:          ForeignFunctionInterface
-ghc-options:         -fglasgow-exts -O2
+ghc-options:         -fglasgow-exts -O2 -static
 include-dirs:        . ../judy/Judy-1.0.3/src
 -- FIXME: make Cabal work nicely with _hsc files, now I think it works, but doesnt clean _hsc files
 c-sources:           Judy/Private_hsc.c
 extra-libraries:     Judy
+extra-lib-dirs:      .

third-party/HsJudy/Judy/MiniGC.hs

@@ -7 +7 @@
 
 import Foreign
-import Foreign.Ptr
+
+
+--import Foreign.Ptr
 import Foreign.StablePtr
 

third-party/HsJudy/Judy/Private.hsc

@@ -7 +7 @@
 import Data.Word
 #else
---import Judy.Word
 import GHC.Exts
 #endif
@@ -17 +16 @@
 #include <stdlib.h>
 
---type Value = (#type Word_t)
---type Value = CULong
-
 #if __GLASGOW_HASKELL__ >= 605
 type Value = WordPtr
@@ -25 +21 @@
 type Value = (#type Word_t)
 
+{-# INLINE ptrToWordPtr #-}
 ptrToWordPtr :: Ptr () -> Value
 ptrToWordPtr = unsafeCoerce##
 
+{-# INLINE wordPtrToPtr #-}
 wordPtrToPtr :: Value -> Ptr ()
 wordPtrToPtr = unsafeCoerce##

third-party/HsJudy/Judy/Refeable.hs

@@ -5 +5 @@
 ) where
 
+
+
+import Foreign.StablePtr
+
 import Foreign.Ptr
-import Foreign.StablePtr
 
 import Judy.Private