X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDriverMkDepend.hs;h=e430c6e269aae507eda90251045233f76e9b8b02;hb=9c84f11b774960077d33d94a23ebc42af79d2ec4;hp=400f8bdf0b927ee84495c3a0b1ac31c3c27805e2;hpb=34cc75e1a62638f2833815746ebce0a9114dc26b;p=ghc-hetmet.git diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs index 400f8bd..e430c6e 100644 --- a/compiler/main/DriverMkDepend.hs +++ b/compiler/main/DriverMkDepend.hs @@ -16,9 +16,9 @@ module DriverMkDepend ( #include "HsVersions.h" import qualified GHC -import GHC ( ModSummary(..), GhcMonad ) +-- import GHC ( ModSummary(..), GhcMonad ) +import GhcMonad import HsSyn ( ImportDecl(..) ) -import PrelNames import DynFlags import Util import HscTypes @@ -35,7 +35,7 @@ import FastString import Exception import ErrUtils -import MonadUtils ( liftIO ) +-- import MonadUtils ( liftIO ) import System.Directory import System.FilePath @@ -73,7 +73,7 @@ doMkDependHS srcs = do -- and complaining about cycles hsc_env <- getSession root <- liftIO getCurrentDirectory - mapM (liftIO . processDeps dflags hsc_env excl_mods root (mkd_tmp_hdl files)) sorted + mapM_ (liftIO . processDeps dflags hsc_env excl_mods root (mkd_tmp_hdl files)) sorted -- If -ddump-mod-cycles, show cycles in the module graph liftIO $ dumpModCycles dflags mod_summaries @@ -218,9 +218,6 @@ processDeps dflags hsc_env excl_mods root hdl (AcyclicSCC node) ; do_imps True (ms_srcimps node) ; do_imps False (ms_imps node) - - ; when (dopt Opt_ImplicitPrelude (ms_hspp_opts node)) $ - do_imp noSrcSpan False Nothing pRELUDE_NAME } @@ -352,7 +349,7 @@ dumpModCycles dflags mod_summaries cycles = [ c | CyclicSCC c <- GHC.topSortModuleGraph True mod_summaries Nothing ] pp_cycles = vcat [ (ptext (sLit "---------- Cycle") <+> int n <+> ptext (sLit "----------")) - $$ pprCycle c $$ text "" + $$ pprCycle c $$ blankLine | (n,c) <- [1..] `zip` cycles ] pprCycle :: [ModSummary] -> SDoc