From: sof Date: Mon, 26 May 1997 02:37:09 +0000 (+0000) Subject: [project @ 1997-05-26 02:35:56 by sof] X-Git-Tag: Approximately_1000_patches_recorded~532 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=49212e6907c3412ce9185e5462a373854159da84;p=ghc-hetmet.git [project @ 1997-05-26 02:35:56 by sof] Imports tidied up --- diff --git a/ghc/compiler/simplStg/SimplStg.lhs b/ghc/compiler/simplStg/SimplStg.lhs index 975c87f..8a38376 100644 --- a/ghc/compiler/simplStg/SimplStg.lhs +++ b/ghc/compiler/simplStg/SimplStg.lhs @@ -35,13 +35,10 @@ import Id ( nullIdEnv, lookupIdEnv, addOneToIdEnv, ) import Maybes ( maybeToBool ) import PprType ( GenType{-instance Outputable-} ) -import PprStyle ( PprStyle ) +import Outputable ( PprStyle, Outputable(..) ) import Pretty ( Doc, ($$), vcat, text, ptext ) import UniqSupply ( splitUniqSupply, UniqSupply ) import Util ( mapAccumL, panic, assertPanic ) -#if __GLASGOW_HASKELL__ >= 202 -import Outputable ( Outputable(..) ) -#endif \end{code} \begin{code} diff --git a/ghc/compiler/simplStg/StgVarInfo.lhs b/ghc/compiler/simplStg/StgVarInfo.lhs index 82a78b7..46c66de 100644 --- a/ghc/compiler/simplStg/StgVarInfo.lhs +++ b/ghc/compiler/simplStg/StgVarInfo.lhs @@ -28,14 +28,12 @@ import Id ( emptyIdSet, mkIdSet, minusIdSet, import IdInfo ( ArityInfo(..) ) import Maybes ( maybeToBool ) import Name ( isLocallyDefined ) -import TyCon ( SYN_IE(Arity) ) -import PprStyle ( PprStyle(..) ) +import BasicTypes ( SYN_IE(Arity) ) +import Outputable ( PprStyle(..), Outputable(..) ) import PprType ( GenType{-instance Outputable-} ) import Util ( panic, pprPanic, assertPanic ) import Pretty ( Doc ) -#if __GLASGOW_HASKELL__ >= 202 -import Outputable ( Outputable(..) ) -#endif + infixr 9 `thenLne`, `thenLne_` \end{code} diff --git a/ghc/compiler/specialise/SpecEnv.lhs b/ghc/compiler/specialise/SpecEnv.lhs index 0c40e24..44f6fd2 100644 --- a/ghc/compiler/specialise/SpecEnv.lhs +++ b/ghc/compiler/specialise/SpecEnv.lhs @@ -20,17 +20,7 @@ import Usage ( SYN_IE(UVar) ) import OccurAnal ( occurAnalyseGlobalExpr ) import CoreSyn ( SYN_IE(CoreExpr), SYN_IE(SimplifiableCoreExpr) ) import Maybes ( MaybeErr(..) ) ---import PprStyle--ToDo:rm ---import Util(pprTrace)--ToDo:rm ---import Outputable--ToDo:rm ---import PprType--ToDo:rm ---import Pretty--ToDo:rm ---import PprCore--ToDo:rm ---import Id--ToDo:rm import TyVar --ToDo:rm ---import Unique--ToDo:rm ---import IdInfo--ToDo:rm ---import PprEnv--ToDo:rm \end{code}