X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsMonad.lhs;h=7605687d39a0fb37aa89b1225657659735afcc20;hb=4e3255388e8b99ccdae290bfcb6cd666b8c93d4a;hp=fe0645ec48de2a9d7fb79252e7b225fbf6c4d21e;hpb=d32c5227315009f38355fe3233f0f4e5b1f61dc6;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsMonad.lhs b/ghc/compiler/deSugar/DsMonad.lhs index fe0645e..7605687 100644 --- a/ghc/compiler/deSugar/DsMonad.lhs +++ b/ghc/compiler/deSugar/DsMonad.lhs @@ -29,7 +29,7 @@ module DsMonad ( import TcRnMonad import HsSyn ( HsExpr, HsMatchContext, Pat ) -import IfaceEnv ( tcIfaceGlobal ) +import TcIface ( tcIfaceGlobal ) import HscTypes ( TyThing(..), TypeEnv, HscEnv, IsBootInterface, tyThingId, tyThingTyCon, tyThingDataCon ) @@ -102,14 +102,12 @@ data DsMetaVal initDs :: HscEnv -> Module -> TypeEnv - -> ModuleEnv (ModuleName,IsBootInterface) -> DsM a -> IO (a, Bag DsWarning) -initDs hsc_env mod type_env is_boot thing_inside +initDs hsc_env mod type_env thing_inside = do { warn_var <- newIORef emptyBag - ; let { if_env = IfGblEnv { if_rec_types = Just (mod, return type_env), - if_is_boot = is_boot } + ; let { if_env = IfGblEnv { if_rec_types = Just (mod, return type_env) } ; gbl_env = DsGblEnv { ds_mod = mod, ds_if_env = if_env, ds_warns = warn_var }