[project @ 2001-03-08 12:07:38 by simonpj]

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

diff --git a/ghc/compiler/main/ErrUtils.lhs b/ghc/compiler/main/ErrUtils.lhs
index 8267c93..a262bd6 100644 (file)
--- a/ghc/compiler/main/ErrUtils.lhs
+++ b/ghc/compiler/main/ErrUtils.lhs
@@ -8,12 +8,14 @@ module ErrUtils (
        ErrMsg, WarnMsg, Message, Messages, errorsFound, warningsFound,
 
        addShortErrLocLine, addShortWarnLocLine,
-       addErrLocHdrLine, dontAddErrLoc,
+       addErrLocHdrLine, addWarnLocHdrLine, dontAddErrLoc,
 
        printErrorsAndWarnings, pprBagOfErrors, pprBagOfWarnings,
 
        ghcExit,
-       doIfSet, doIfSet_dyn, dumpIfSet, dumpIfSet_dyn, showPass
+       doIfSet, doIfSet_dyn, 
+       dumpIfSet, dumpIfSet_core, dumpIfSet_dyn, dumpIfSet_dyn_or, 
+       showPass
     ) where
 
 #include "HsVersions.h"
@@ -22,7 +24,7 @@ import Bag            ( Bag, bagToList, isEmptyBag )
 import SrcLoc          ( SrcLoc, noSrcLoc, isGoodSrcLoc )
 import Util            ( sortLt )
 import Outputable
-import CmdLineOpts     ( DynFlags, DynFlag(..), dopt )
+import CmdLineOpts     ( DynFlags(..), DynFlag(..), dopt )
 
 import System          ( ExitCode(..), exitWith )
 import IO              ( hPutStr, stderr )
@@ -37,6 +39,7 @@ type Message = SDoc
 
 addShortErrLocLine  :: SrcLoc -> Message -> ErrMsg
 addErrLocHdrLine    :: SrcLoc -> Message -> Message -> ErrMsg
+addWarnLocHdrLine    :: SrcLoc -> Message -> Message -> ErrMsg
 addShortWarnLocLine :: SrcLoc -> Message -> WarnMsg
 
 addShortErrLocLine locn rest_of_err_msg
@@ -50,6 +53,12 @@ addErrLocHdrLine locn hdr rest_of_err_msg
          4 rest_of_err_msg
     )
 
+addWarnLocHdrLine locn hdr rest_of_err_msg
+  = ( locn
+    , hang (ppr locn <> colon <+> ptext SLIT("Warning:") <+> hdr) 
+         4 (rest_of_err_msg)
+    )
+
 addShortWarnLocLine locn rest_of_err_msg
   | isGoodSrcLoc locn = (locn, hang (ppr locn <> colon) 4 
                                    (ptext SLIT("Warning:") <+> rest_of_err_msg))
@@ -114,18 +123,32 @@ doIfSet_dyn dflags flag action | dopt flag dflags = action
 \begin{code}
 showPass :: DynFlags -> String -> IO ()
 showPass dflags what
-  | dopt Opt_D_show_passes dflags = hPutStr stderr ("*** "++what++":\n")
-  | otherwise                    = return ()
+  | verbosity dflags >= 2 = hPutStr stderr ("*** "++what++":\n")
+  | otherwise            = return ()
 
 dumpIfSet :: Bool -> String -> SDoc -> IO ()
 dumpIfSet flag hdr doc
   | not flag   = return ()
   | otherwise  = printDump (dump hdr doc)
 
+dumpIfSet_core :: DynFlags -> DynFlag -> String -> SDoc -> IO ()
+dumpIfSet_core dflags flag hdr doc
+  | dopt flag dflags
+       || verbosity dflags >= 4
+       || dopt Opt_D_verbose_core2core dflags  = printDump (dump hdr doc)
+  | otherwise                                   = return ()
+
 dumpIfSet_dyn :: DynFlags -> DynFlag -> String -> SDoc -> IO ()
 dumpIfSet_dyn dflags flag hdr doc
-  | not (dopt flag dflags)  = return ()
-  | otherwise               = printDump (dump hdr doc)
+  | dopt flag dflags || verbosity dflags >= 4 = printDump (dump hdr doc)
+  | otherwise                                 = return ()
+
+dumpIfSet_dyn_or :: DynFlags -> [DynFlag] -> String -> SDoc -> IO ()
+dumpIfSet_dyn_or dflags flags hdr doc
+  | or [dopt flag dflags | flag <- flags]
+  || verbosity dflags >= 4 
+  = printDump (dump hdr doc)
+  | otherwise = return ()
 
 dump hdr doc 
    = vcat [text "",