projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-16 09:53:47 by simonpj]
[ghc-hetmet.git]
/
ghc
/
compiler
/
deSugar
/
DsMonad.lhs
diff --git
a/ghc/compiler/deSugar/DsMonad.lhs
b/ghc/compiler/deSugar/DsMonad.lhs
index
fe0645e
..
7605687
100644
(file)
--- 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 TcRnMonad
import HsSyn ( HsExpr, HsMatchContext, Pat )
-import IfaceEnv ( tcIfaceGlobal )
+import TcIface ( tcIfaceGlobal )
import HscTypes ( TyThing(..), TypeEnv, HscEnv,
IsBootInterface,
tyThingId, tyThingTyCon, tyThingDataCon )
import HscTypes ( TyThing(..), TypeEnv, HscEnv,
IsBootInterface,
tyThingId, tyThingTyCon, tyThingDataCon )
@@
-102,14
+102,12
@@
data DsMetaVal
initDs :: HscEnv
-> Module -> TypeEnv
initDs :: HscEnv
-> Module -> TypeEnv
- -> ModuleEnv (ModuleName,IsBootInterface)
-> DsM a
-> IO (a, Bag DsWarning)
-> 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
= 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 }
; gbl_env = DsGblEnv { ds_mod = mod,
ds_if_env = if_env,
ds_warns = warn_var }