[project @ 1997-07-05 03:06:28 by sof]

[ghc-hetmet.git] / ghc / compiler / utils / FiniteMap.lhs

diff --git a/ghc/compiler/utils/FiniteMap.lhs b/ghc/compiler/utils/FiniteMap.lhs
index f281856..e550d1e 100644 (file)
--- a/ghc/compiler/utils/FiniteMap.lhs
+++ b/ghc/compiler/utils/FiniteMap.lhs
@@ -46,7 +46,7 @@ module FiniteMap (
        addToFM_C,
        addListToFM,
        addListToFM_C,
-       IF_NOT_GHC(delFromFM COMMA)
+       delFromFM,
        delListFromFM,
 
        plusFM,
@@ -69,15 +69,22 @@ module FiniteMap (
 #endif
     ) where
 
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(SpecLoop)
-import Maybes
-import Bag       ( Bag, foldBag )
-import Outputable ( Outputable(..) )
+#else
+import {-# SOURCE #-} Name
+#endif
 
-# ifdef DEBUG
-import PprStyle        ( PprStyle )
-import Pretty  ( SYN_IE(Pretty), PrettyRep )
-# endif
+#if __GLASGOW_HASKELL__ >= 202
+import GlaExts
+#endif
+#if defined(USE_FAST_STRINGS)
+import FastString
+#endif
+import Maybes
+import Bag       ( Bag, foldrBag )
+import Outputable ( PprStyle, Outputable(..) )
+import Pretty  ( Doc )
 
 #ifdef COMPILING_GHC
 
@@ -218,7 +225,7 @@ unitFM key elt = Branch key elt IF_GHC(1#,1) emptyFM emptyFM
 listToFM = addListToFM emptyFM
 
 #ifdef COMPILING_GHC
-bagToFM = foldBag plusFM (\ (k,v) -> unitFM k v) emptyFM
+bagToFM = foldrBag (\(k,v) fm -> addToFM fm k v) emptyFM
 #endif
 \end{code}
 
@@ -296,6 +303,7 @@ plusFM_C combiner fm1 (Branch split_key elt2 _ left right)
 
 -- It's worth doing plusFM specially, because we don't need
 -- to do the lookup in fm1.
+-- FM2 over-rides FM1.
 
 plusFM EmptyFM fm2 = fm2
 plusFM fm1 EmptyFM = fm1
@@ -436,7 +444,7 @@ mkBranch which key elt fm_l fm_r
   = --ASSERT( left_ok && right_ok && balance_ok )
 #if defined(COMPILING_GHC) && defined(DEBUG_FINITEMAPS)
     if not ( left_ok && right_ok && balance_ok ) then
-       pprPanic ("mkBranch:"++show which) (ppAboves [ppr PprDebug [left_ok, right_ok, balance_ok],
+       pprPanic ("mkBranch:"++show which) (vcat [ppr PprDebug [left_ok, right_ok, balance_ok],
                                       ppr PprDebug key,
                                       ppr PprDebug fm_l,
                                       ppr PprDebug fm_r])
@@ -701,11 +709,11 @@ deleteMax (Branch key elt _ fm_l    fm_r) = mkBalBranch key elt fm_l (deleteMax
 instance (Outputable key) => Outputable (FiniteMap key elt) where
     ppr sty fm = pprX sty fm
 
-pprX sty EmptyFM = ppChar '!'
+pprX sty EmptyFM = char '!'
 pprX sty (Branch key elt sz fm_l fm_r)
- = ppBesides [ppLparen, pprX sty fm_l, ppSP,
-             ppr sty key, ppSP, ppInt (IF_GHC(I# sz, sz)), ppSP,
-             pprX sty fm_r, ppRparen]
+ = parens (hcat [pprX sty fm_l, space,
+                     ppr sty key, space, int (IF_GHC(I# sz, sz)), space,
+                     pprX sty fm_r])
 #endif
 
 #ifndef COMPILING_GHC
@@ -777,12 +785,10 @@ When the FiniteMap module is used in GHC, we specialise it for
                 , FiniteMap FAST_STRING elt -> FAST_STRING -> elt  -> FiniteMap FAST_STRING elt
                 , FiniteMap (FAST_STRING, FAST_STRING) elt -> (FAST_STRING, FAST_STRING) -> elt  -> FiniteMap (FAST_STRING, FAST_STRING) elt
                 , FiniteMap RdrName elt -> RdrName -> elt  -> FiniteMap RdrName elt
-                , FiniteMap OrigName elt -> OrigName -> elt  -> FiniteMap OrigName elt
     IF_NCG(COMMA   FiniteMap Reg elt -> Reg -> elt  -> FiniteMap Reg elt)
     #-}
 {-# SPECIALIZE addToFM_C
                :: (elt -> elt -> elt) -> FiniteMap (RdrName, RdrName) elt -> (RdrName, RdrName) -> elt -> FiniteMap (RdrName, RdrName) elt
-                , (elt -> elt -> elt) -> FiniteMap (OrigName, OrigName) elt -> (OrigName, OrigName) -> elt -> FiniteMap (OrigName, OrigName) elt
                 , (elt -> elt -> elt) -> FiniteMap FAST_STRING elt -> FAST_STRING -> elt -> FiniteMap FAST_STRING elt
     IF_NCG(COMMA   (elt -> elt -> elt) -> FiniteMap Reg elt -> Reg -> elt -> FiniteMap Reg elt)
     #-}
@@ -791,7 +797,6 @@ When the FiniteMap module is used in GHC, we specialise it for
     #-}
 {-# SPECIALIZE delListFromFM
                :: FiniteMap RdrName elt -> [RdrName]   -> FiniteMap RdrName elt
-                , FiniteMap OrigName elt -> [OrigName]   -> FiniteMap OrigName elt
                 , FiniteMap FAST_STRING elt -> [FAST_STRING]   -> FiniteMap FAST_STRING elt
     IF_NCG(COMMA   FiniteMap Reg elt -> [Reg]   -> FiniteMap Reg elt)
     #-}
@@ -799,7 +804,6 @@ When the FiniteMap module is used in GHC, we specialise it for
                :: [([Char],elt)] -> FiniteMap [Char] elt
                 , [(FAST_STRING,elt)] -> FiniteMap FAST_STRING elt
                 , [((FAST_STRING,FAST_STRING),elt)] -> FiniteMap (FAST_STRING, FAST_STRING) elt
-                , [(OrigName,elt)] -> FiniteMap OrigName elt
     IF_NCG(COMMA   [(Reg COMMA elt)] -> FiniteMap Reg elt)
     #-}
 {-# SPECIALIZE lookupFM
@@ -807,8 +811,6 @@ When the FiniteMap module is used in GHC, we specialise it for
                 , FiniteMap [Char] elt -> [Char] -> Maybe elt
                 , FiniteMap FAST_STRING elt -> FAST_STRING -> Maybe elt
                 , FiniteMap (FAST_STRING,FAST_STRING) elt -> (FAST_STRING,FAST_STRING) -> Maybe elt
-                , FiniteMap OrigName elt -> OrigName -> Maybe elt
-                , FiniteMap (OrigName,OrigName) elt -> (OrigName,OrigName) -> Maybe elt
                 , FiniteMap RdrName elt -> RdrName -> Maybe elt
                 , FiniteMap (RdrName,RdrName) elt -> (RdrName,RdrName) -> Maybe elt
     IF_NCG(COMMA   FiniteMap Reg elt -> Reg -> Maybe elt)
@@ -819,7 +821,6 @@ When the FiniteMap module is used in GHC, we specialise it for
     #-}
 {-# SPECIALIZE plusFM
                :: FiniteMap RdrName elt -> FiniteMap RdrName elt -> FiniteMap RdrName elt
-                , FiniteMap OrigName elt -> FiniteMap OrigName elt -> FiniteMap OrigName elt
                 , FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt -> FiniteMap FAST_STRING elt
     IF_NCG(COMMA   FiniteMap Reg elt -> FiniteMap Reg elt -> FiniteMap Reg elt)
     #-}