[project @ 1997-06-05 09:16:04 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 2f5324e..319e386 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,12 +69,22 @@ module FiniteMap (
 #endif
     ) where
 
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(SpecLoop)
+#else
+import {-# SOURCE #-} Name
+#endif
+
+#if __GLASGOW_HASKELL__ >= 202
+import GlaExts
+#endif
+#if defined(USE_FAST_STRINGS)
+import FastString
+#endif
 import Maybes
-import Bag       ( Bag, foldBag )
-import Outputable ( Outputable(..) )
-import PprStyle        ( PprStyle )
-import Pretty  ( SYN_IE(Pretty), PrettyRep )
+import Bag       ( Bag, foldrBag )
+import Outputable ( PprStyle, Outputable(..) )
+import Pretty  ( Doc )
 
 #ifdef COMPILING_GHC
 
@@ -215,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}
 
@@ -433,7 +443,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])
@@ -698,11 +708,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