[project @ 2004-08-16 09:53:47 by simonpj]

[ghc-hetmet.git] / ghc / compiler / deSugar / Desugar.lhs

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 5f8192e..84b7216 100644 (file)
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -73,8 +73,7 @@ deSugar hsc_env
   = do { showPass dflags "Desugar"
 
        -- Do desugaring
-       ; let { is_boot = imp_dep_mods imports }
-       ; (results, warnings) <- initDs hsc_env mod type_env is_boot $
+       ; (results, warnings) <- initDs hsc_env mod type_env $
                                 dsProgram ghci_mode tcg_env
 
        ; let { (ds_binds, ds_rules, ds_fords) = results
@@ -112,7 +111,7 @@ deSugar hsc_env
                mg_exports  = exports,
                mg_deps     = deps,
                mg_usages   = usages,
-               mg_dir_imps = [m | (m,_) <- moduleEnvElts (imp_mods imports)],
+               mg_dir_imps = [m | (m,_,_) <- moduleEnvElts (imp_mods imports)],
                mg_rdr_env  = rdr_env,
                mg_fix_env  = fix_env,
                mg_deprecs  = deprecs,
@@ -145,9 +144,7 @@ deSugarExpr hsc_env this_mod rdr_env type_env tc_expr
        ; us <- mkSplitUniqSupply 'd'
 
        -- Do desugaring
-       ; let { is_boot = emptyModuleEnv }      -- Assume no hi-boot files when
-                                               -- doing stuff from the command line
-       ; (core_expr, ds_warns) <- initDs hsc_env this_mod type_env is_boot $
+       ; (core_expr, ds_warns) <- initDs hsc_env this_mod type_env $
                                   dsLExpr tc_expr
 
        -- Display any warnings