[project @ 1997-05-26 03:15:36 by sof]

Updated imports

diff --git a/ghc/compiler/simplCore/FloatOut.lhs b/ghc/compiler/simplCore/FloatOut.lhs
index b891f4f..a4d051f 100644 (file)
--- a/ghc/compiler/simplCore/FloatOut.lhs
+++ b/ghc/compiler/simplCore/FloatOut.lhs
@@ -20,9 +20,8 @@ import CostCentre     ( dupifyCC, CostCentre )
 import Id              ( nullIdEnv, addOneToIdEnv, growIdEnvList, SYN_IE(IdEnv),
                          GenId{-instance Outputable-}, SYN_IE(Id)
                        )
-import Outputable      ( Outputable(..){-instance (,)-} )
+import Outputable      ( PprStyle(..), Outputable(..){-instance (,)-} )
 import PprCore
-import PprStyle                ( PprStyle(..) )
 import PprType         ( GenTyVar )
 import Pretty          ( Doc, int, ptext, hcat, vcat )
 import SetLevels       -- all of it

diff --git a/ghc/compiler/simplCore/OccurAnal.lhs b/ghc/compiler/simplCore/OccurAnal.lhs
index 5ae771e..a05f907 100644 (file)
--- a/ghc/compiler/simplCore/OccurAnal.lhs
+++ b/ghc/compiler/simplCore/OccurAnal.lhs
@@ -18,7 +18,6 @@ module OccurAnal (
     ) where
 
 IMP_Ubiq(){-uitous-}
-IMPORT_DELOOPER(IdLoop)        -- paranoia
 IMPORT_1_3(List(partition))
 
 import BinderInfo
@@ -26,7 +25,7 @@ import CmdLineOpts    ( opt_D_dump_occur_anal, SimplifierSwitch(..) )
 import CoreSyn
 import Digraph         ( stronglyConnComp, stronglyConnCompR, SCC(..) )
 import Id              ( idWantsToBeINLINEd, addNoInlinePragma, nukeNoInlinePragma,
-                         idType, idUnique,
+                         idType, idUnique, SYN_IE(Id),
                          isConstMethodId,
                          emptyIdSet, unionIdSets, mkIdSet,
                          unitIdSet, elementOfIdSet,
@@ -39,9 +38,8 @@ import Id             ( idWantsToBeINLINEd, addNoInlinePragma, nukeNoInlinePragma,
 import Name            ( isExported, isLocallyDefined )
 import Type            ( getFunTy_maybe, splitForAllTy )
 import Maybes          ( maybeToBool )
-import Outputable      ( Outputable(..){-instance * (,) -} )
+import Outputable      ( PprStyle(..), Outputable(..){-instance * (,) -} )
 import PprCore
-import PprStyle                ( PprStyle(..) )
 import PprType         ( GenType{-instance Outputable-}, GenTyVar{-ditto-} )
 import Pretty          ( Doc, vcat, ptext, nest, punctuate, comma, hcat, text )
 import TyVar           ( GenTyVar{-instance Eq-} )