Changeset 14337 for src/Pugs/Parser/Charnames.hs

Timestamp:

10/17/06 08:25:35 (2 years ago)

Author:

audreyt

svk:copy_cache_prev:

21206

Message:

* Remove Judy from the Pugs build process.

This is a pervasive change to avoid GC issues completely
before the release, as the nature of addForeignPtrFinalizer's
weird interaction with GHC is not fully diagnosed.

Also, TVar/IORef based storage, which was exceedingly slow
in GHC 6.4, now actually compares competitively with Judy maps.
Judy is still more memory efficient and may be faster on some
architectures, but its re-incoporation will have to wait until
after release and a fuller understanding of its use of FFI/GC.

Files:

• src/Pugs/Parser/Charnames.hs (modified) (2 diffs)

src/Pugs/Parser/Charnames.hs

@@ -5 +5 @@
 import Pugs.Internals
 import Data.ByteString.Char8 (unsafePackAddress)
-import qualified Judy.StrMap as H
-import qualified Judy.CollectionsM as C
+import qualified Data.HashTable as H
+import qualified UTF8 as Str
 
 #ifdef PUGS_HAVE_PERL5
@@ -28 +28 @@
 
 nameToCode :: String -> Maybe Int
-nameToCode name = inlinePerformIO (C.lookup (cast name) _NameToCode)
+nameToCode name = inlinePerformIO (H.lookup _NameToCode (cast name))
 
 {-# NOINLINE _NameToCode #-}
-_NameToCode :: H.StrMap ByteString Int
-_NameToCode = unsafePerformIO $! C.fromList
+_NameToCode :: H.HashTable ByteString Int
+_NameToCode = unsafePerformIO $! hashList
     [ (unsafePackAddress 4 "NULL"#, 0x0000)
     , (unsafePackAddress 16 "START OF HEADING"#, 0x0001)