[project @ 1997-06-18 23:52:36 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 27fda94..e550d1e 100644 (file)
--- a/ghc/compiler/utils/FiniteMap.lhs
+++ b/ghc/compiler/utils/FiniteMap.lhs
@@ -69,7 +69,12 @@ 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
@@ -78,8 +83,7 @@ import FastString
 #endif
 import Maybes
 import Bag       ( Bag, foldrBag )
-import Outputable ( Outputable(..) )
-import PprStyle        ( PprStyle )
+import Outputable ( PprStyle, Outputable(..) )
 import Pretty  ( Doc )
 
 #ifdef COMPILING_GHC
@@ -299,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