[project @ 1997-06-05 21:19:14 by sof]

imports updated

diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs
index 20c1051..1285857 100644 (file)
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/ghc/compiler/basicTypes/Name.lhs
@@ -55,7 +55,13 @@ module Name (
     ) where
 
 IMP_Ubiq()
-import TyLoop          --( GenId, Id(..), TyCon )                      -- Used inside Names
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
+IMPORT_DELOOPER(TyLoop)        ( GenId, Id(..), TyCon )                        -- Used inside Names
+#else
+import {-# SOURCE #-} Id    ( Id )
+import {-# SOURCE #-} TyCon ( TyCon )
+#endif
+
 import CStrings                ( identToC, modnameToC, cSEP )
 import CmdLineOpts     ( opt_OmitInterfacePragmas, opt_EnsureSplittableC )
 import BasicTypes      ( SYN_IE(Module), moduleString, pprModule )

diff --git a/ghc/compiler/basicTypes/PprEnv.lhs b/ghc/compiler/basicTypes/PprEnv.lhs
index 2c4dd1f..63aa9c3 100644 (file)
--- a/ghc/compiler/basicTypes/PprEnv.lhs
+++ b/ghc/compiler/basicTypes/PprEnv.lhs
@@ -31,7 +31,9 @@ import Unique         ( initRenumberingUniques, Unique )
 import UniqFM          ( emptyUFM, UniqFM )
 import Util            ( panic )
 #if __GLASGOW_HASKELL__ >= 202
-IMPORT_DELOOPER(TyLoop)
+import {-# SOURCE #-}   Type  ( GenType )
+import {-# SOURCE #-}   TyVar ( TyVar   )
+import {-# SOURCE #-}   Id ( Id )
 import Outputable       ( PprStyle )
 import Literal          ( Literal )
 import Usage            ( GenUsage, SYN_IE(Usage) )