From: wolfgang Date: Thu, 14 Apr 2005 14:06:25 +0000 (+0000) Subject: [project @ 2005-04-14 14:06:25 by wolfgang] X-Git-Tag: Initial_conversion_from_CVS_complete~740 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c1197baecba4c74b22f274d294b39aea5751d6c0;p=ghc-hetmet.git [project @ 2005-04-14 14:06:25 by wolfgang] Fix previous commit --- diff --git a/ghc/compiler/main/GHC.hs b/ghc/compiler/main/GHC.hs index fadcd2c..215b381 100644 --- a/ghc/compiler/main/GHC.hs +++ b/ghc/compiler/main/GHC.hs @@ -875,16 +875,16 @@ upsweep upsweep hsc_env old_hpt stable_mods cleanup msg_act mods = upsweep' hsc_env old_hpt stable_mods cleanup msg_act mods 1 (length mods) -upsweep hsc_env old_hpt stable_mods cleanup msg_act +upsweep' hsc_env old_hpt stable_mods cleanup msg_act [] _ _ = return (Succeeded, hsc_env, []) -upsweep hsc_env old_hpt stable_mods cleanup msg_act +upsweep' hsc_env old_hpt stable_mods cleanup msg_act (CyclicSCC ms:_) _ _ = do putMsg (showSDoc (cyclicModuleErr ms)) return (Failed, hsc_env, []) -upsweep hsc_env old_hpt stable_mods cleanup msg_act +upsweep' hsc_env old_hpt stable_mods cleanup msg_act (AcyclicSCC mod:mods) mod_index nmods = do -- putStrLn ("UPSWEEP_MOD: hpt = " ++ -- show (map (moduleUserString.moduleName.mi_module.hm_iface) @@ -915,7 +915,7 @@ upsweep hsc_env old_hpt stable_mods cleanup msg_act | otherwise = delModuleEnv old_hpt this_mod ; (restOK, hsc_env2, modOKs) - <- upsweep hsc_env1 old_hpt1 stable_mods cleanup + <- upsweep' hsc_env1 old_hpt1 stable_mods cleanup msg_act mods (mod_index+1) nmods ; return (restOK, hsc_env2, mod:modOKs) }