projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace uses of the old try function with the new one
[ghc-hetmet.git]
/
compiler
/
main
/
DriverMkDepend.hs
diff --git
a/compiler/main/DriverMkDepend.hs
b/compiler/main/DriverMkDepend.hs
index
400f8bd
..
e430c6e
100644
(file)
--- a/
compiler/main/DriverMkDepend.hs
+++ b/
compiler/main/DriverMkDepend.hs
@@
-16,9
+16,9
@@
module DriverMkDepend (
#include "HsVersions.h"
import qualified GHC
#include "HsVersions.h"
import qualified GHC
-import GHC ( ModSummary(..), GhcMonad )
+-- import GHC ( ModSummary(..), GhcMonad )
+import GhcMonad
import HsSyn ( ImportDecl(..) )
import HsSyn ( ImportDecl(..) )
-import PrelNames
import DynFlags
import Util
import HscTypes
import DynFlags
import Util
import HscTypes
@@
-35,7
+35,7
@@
import FastString
import Exception
import ErrUtils
import Exception
import ErrUtils
-import MonadUtils ( liftIO )
+-- import MonadUtils ( liftIO )
import System.Directory
import System.FilePath
import System.Directory
import System.FilePath
@@
-73,7
+73,7
@@
doMkDependHS srcs = do
-- and complaining about cycles
hsc_env <- getSession
root <- liftIO getCurrentDirectory
-- 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
-- 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)
; 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 "----------"))
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
| (n,c) <- [1..] `zip` cycles ]
pprCycle :: [ModSummary] -> SDoc