Enumerate imports and remove dead code.

[ghc-hetmet.git] / ghc / compiler / main / HscMain.lhs

diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs
index 3885bd3..124d9f0 100644 (file)
--- a/ghc/compiler/main/HscMain.lhs
+++ b/ghc/compiler/main/HscMain.lhs
@@ -58,9 +58,9 @@ import IfaceEnv               ( initNameCache )
 import LoadIface       ( ifaceStats, initExternalPackageState )
 import PrelInfo                ( wiredInThings, basicKnownKeyNames )
 import MkIface         ( checkOldIface, mkIface, writeIfaceFile )
-import Desugar
+import Desugar          ( deSugar )
 import Flattening       ( flatten )
-import SimplCore
+import SimplCore        ( core2core )
 import TidyPgm         ( tidyProgram, mkBootModDetails )
 import CorePrep                ( corePrepPgm )
 import CoreToStg       ( coreToStg )
@@ -74,7 +74,6 @@ import CodeOutput     ( codeOutput )
 
 import DynFlags
 import ErrUtils
-import Util
 import UniqSupply      ( mkSplitUniqSupply )
 
 import Outputable
@@ -87,7 +86,6 @@ import FastString
 import Maybes          ( expectJust )
 import Bag             ( unitBag )
 import Monad           ( when )
-import Maybe           ( isJust )
 import IO
 import DATA_IOREF      ( newIORef, readIORef )
 \end{code}
@@ -253,7 +251,7 @@ hscCompileMake hsc_env mod_summary
     = compiler hsc_env mod_summary
     where mkComp = hscMkCompiler norecompMake
           backend = case hscTarget (hsc_dflags hsc_env) of
-                      HscNothing -> hscCodeGenSimple (\(i, d, g) -> (HscRecomp False, i, d))
+                      HscNothing -> hscCodeGenNothing
                       _other     -> hscCodeGenMake
           compiler
               = case ms_hsc_src mod_summary of
@@ -503,7 +501,6 @@ hscCodeGenCompile hsc_env mod_summary cgguts
                      cg_dep_pkgs = dependencies } = cgguts
              dflags = hsc_dflags hsc_env
              location = ms_location mod_summary
-             modName = ms_mod mod_summary
              data_tycons = filter isDataTyCon tycons
              -- cg_tycons includes newtypes, for the benefit of External Core,
              -- but we don't generate any code for newtypes
@@ -531,9 +528,6 @@ hscCodeGenCompile hsc_env mod_summary cgguts
 hscCodeGenIdentity :: CodeGen a a
 hscCodeGenIdentity hsc_env mod_summary a = return a
 
-hscCodeGenSimple :: (a -> b) -> CodeGen a b
-hscCodeGenSimple fn hsc_env mod_summary a = return (fn a)
-
 hscCodeGenConst :: b -> CodeGen a b
 hscCodeGenConst b hsc_env mod_summary a = return b
 
@@ -551,7 +545,6 @@ hscCodeGenInteractive hsc_env mod_summary (iface, details, cgguts)
                      cg_dep_pkgs = dependencies } = cgguts
              dflags = hsc_dflags hsc_env
              location = ms_location mod_summary
-             modName = ms_mod mod_summary
              data_tycons = filter isDataTyCon tycons
              -- cg_tycons includes newtypes, for the benefit of External Core,
              -- but we don't generate any code for newtypes