From: sewardj <unknown>
Date: Tue, 21 Nov 2000 11:22:26 +0000 (+0000)
Subject: [project @ 2000-11-21 11:22:25 by sewardj]
X-Git-Tag: Approximately_9120_patches~3288
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=fe6e6832822f75a690d14bd03fff88d85bc2f3b0;p=ghc-hetmet.git

[project @ 2000-11-21 11:22:25 by sewardj]
Clean up CM's messages a bit.
---

diff --git a/ghc/compiler/compMan/CompManager.lhs b/ghc/compiler/compMan/CompManager.lhs
index 3b53564..ea850f9 100644
--- a/ghc/compiler/compMan/CompManager.lhs
+++ b/ghc/compiler/compMan/CompManager.lhs
@@ -175,7 +175,7 @@ cmLoadModule cmstate1 rootname
         -- Throw away the old home dir cache
         emptyHomeDirCache
 
-        hPutStr stderr "cmLoadModule: downsweep begins\n"
+        hPutStrLn stderr ("ghc: chasing modules, starting from: " ++ rootname)
         mg2unsorted <- downsweep [rootname]
 
         let modnames1   = map name_of_summary mg1
@@ -195,8 +195,8 @@ cmLoadModule cmstate1 rootname
         let reachable_from :: ModuleName -> [ModuleName]
             reachable_from = downwards_closure_of_module mg2unsorted
 
-        hPutStrLn stderr "after tsort:\n"
-        hPutStrLn stderr (showSDoc (vcat (map ppr mg2)))
+        --hPutStrLn stderr "after tsort:\n"
+        --hPutStrLn stderr (showSDoc (vcat (map ppr mg2)))
 
         -- Because we don't take into account source imports when doing
         -- the topological sort, there shouldn't be any cycles in mg2.
@@ -387,7 +387,9 @@ upsweep_mod :: GhciMode
             -> IO (CmThreaded, Maybe Linkable)
 
 upsweep_mod ghci_mode oldUI threaded1 summary1 reachable_from_here
-   = do let mod_name = name_of_summary summary1
+   = do hPutStr stderr ("ghc: module " 
+                        ++ moduleNameUserString (name_of_summary summary1) ++ ": ")
+        let mod_name = name_of_summary summary1
         let (CmThreaded pcs1 hst1 hit1) = threaded1
         let old_iface = lookupUFM hit1 (name_of_summary summary1)
 
@@ -496,10 +498,10 @@ downwards_closure_of_module summaries root
              = (name_of_summary summ, ms_srcimps summ ++ ms_imps summ)
          res = simple_transitive_closure (map toEdge summaries) [root]             
      in
-         trace (showSDoc (text "DC of mod" <+> ppr root
-                          <+> text "=" <+> ppr res)) (
+         --trace (showSDoc (text "DC of mod" <+> ppr root
+         --                 <+> text "=" <+> ppr res)) (
          res
-         )
+         --)
 
 -- Calculate transitive closures from a set of roots given an adjacency list
 simple_transitive_closure :: Eq a => [(a,[a])] -> [a] -> [a]
@@ -559,7 +561,7 @@ downsweep rootNm
 
         getSummary :: ModuleName -> IO ModSummary
         getSummary nm
-           | trace ("getSummary: "++ showSDoc (ppr nm)) True
+           -- | trace ("getSummary: "++ showSDoc (ppr nm)) True
            = do found <- findModule nm
 		case found of
                    -- Be sure not to use the mod and location passed in to 
diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs
index 9ea640b..7f0ea60 100644
--- a/ghc/compiler/main/HscMain.lhs
+++ b/ghc/compiler/main/HscMain.lhs
@@ -136,7 +136,7 @@ hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch
    in  return (HscNoRecomp pcs_ch bomb bomb)
  | otherwise
  = do {
-      hPutStrLn stderr "COMPILATION NOT REQUIRED";
+      hPutStrLn stderr "compilation not required";
       ;
       -- CLOSURE
       (pcs_cl, closure_errs, cl_hs_decls) 
@@ -165,7 +165,7 @@ hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch
 
 hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch
  = do	{
-      	; hPutStrLn stderr "COMPILATION IS REQUIRED";
+      	; hPutStrLn stderr "compilation IS required";
 
       	  -- what target are we shooting for?
       	; let toInterp = dopt_HscLang dflags == HscInterpreted