From: sof Date: Mon, 26 May 1997 04:49:43 +0000 (+0000) Subject: [project @ 1997-05-26 04:49:07 by sof] X-Git-Tag: Approximately_1000_patches_recorded~485 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a2127bdc86e325979e1ec55b25c9957ed2e15e8a;p=ghc-hetmet.git [project @ 1997-05-26 04:49:07 by sof] Updated imports --- diff --git a/ghc/compiler/deSugar/DsExpr.lhs b/ghc/compiler/deSugar/DsExpr.lhs index 1c25806..32a0471 100644 --- a/ghc/compiler/deSugar/DsExpr.lhs +++ b/ghc/compiler/deSugar/DsExpr.lhs @@ -42,11 +42,10 @@ import Id ( idType, nullIdEnv, addOneToIdEnv, ) import Literal ( mkMachInt, Literal(..) ) import Name ( Name{--O only-} ) -import PprStyle ( PprStyle(..) ) +import Outputable ( PprStyle(..), Outputable(..) ) import PprType ( GenType ) import PrelVals ( rEC_CON_ERROR_ID, rEC_UPD_ERROR_ID, voidId ) import Pretty ( Doc, hcat, ptext, text ) -import TyCon ( isDataTyCon, isNewTyCon ) import Type ( splitSigmaTy, splitFunTy, typePrimRep, getAppDataTyConExpandingDicts, maybeAppTyCon, getAppTyCon, applyTy, maybeBoxedPrimType, splitAppTy, SYN_IE(Type) @@ -60,10 +59,6 @@ import Usage ( SYN_IE(UVar) ) import Maybes ( maybeToBool ) import Util ( zipEqual, pprError, panic, assertPanic ) -#if __GLASGOW_HASKELL__ >= 202 -import Outputable -#endif - mk_nil_con ty = mkCon nilDataCon [] [ty] [] -- micro utility... \end{code} diff --git a/ghc/compiler/deSugar/DsGRHSs.lhs b/ghc/compiler/deSugar/DsGRHSs.lhs index b6a1c90..8dcf96d 100644 --- a/ghc/compiler/deSugar/DsGRHSs.lhs +++ b/ghc/compiler/deSugar/DsGRHSs.lhs @@ -29,7 +29,7 @@ import Id ( GenId ) #endif import CoreUtils ( coreExprType, mkCoreIfThenElse ) import PrelVals ( nON_EXHAUSTIVE_GUARDS_ERROR_ID ) -import PprStyle ( PprStyle(..) ) +import Outputable ( PprStyle(..) ) import SrcLoc ( SrcLoc{-instance-} ) import Type ( SYN_IE(Type) ) import Unique ( Unique, otherwiseIdKey )