[project @ 1997-03-14 07:52:06 by simonpj]

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

diff --git a/ghc/compiler/utils/FiniteMap.lhs b/ghc/compiler/utils/FiniteMap.lhs
index 2f5324e..d00d6fe 100644 (file)
--- a/ghc/compiler/utils/FiniteMap.lhs
+++ b/ghc/compiler/utils/FiniteMap.lhs
@@ -70,8 +70,11 @@ module FiniteMap (
     ) where
 
 IMPORT_DELOOPER(SpecLoop)
+#if defined(USE_FAST_STRINGS)
+import FastString
+#endif
 import Maybes
-import Bag       ( Bag, foldBag )
+import Bag       ( Bag, foldrBag )
 import Outputable ( Outputable(..) )
 import PprStyle        ( PprStyle )
 import Pretty  ( SYN_IE(Pretty), PrettyRep )
@@ -215,7 +218,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}