[project @ 2005-05-16 13:47:57 by simonmar]

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

diff --git a/ghc/compiler/main/ErrUtils.lhs b/ghc/compiler/main/ErrUtils.lhs
index d6f1ae1..e53e40c 100644 (file)
--- a/ghc/compiler/main/ErrUtils.lhs
+++ b/ghc/compiler/main/ErrUtils.lhs
@@ -8,7 +8,7 @@ module ErrUtils (
        Message, mkLocMessage, printError,
 
        ErrMsg, WarnMsg,
-       errMsgSpans, errMsgShortDoc, errMsgExtraInfo,
+       errMsgSpans, errMsgContext, errMsgShortDoc, errMsgExtraInfo,
        Messages, errorsFound, emptyMessages,
        mkErrMsg, mkWarnMsg, mkPlainErrMsg, mkLongErrMsg,
        printErrorsAndWarnings, pprBagOfErrors, pprBagOfWarnings,
@@ -18,7 +18,7 @@ module ErrUtils (
        dumpIfSet, dumpIfSet_core, dumpIfSet_dyn, dumpIfSet_dyn_or, mkDumpDoc,
        showPass,
 
-       -- * Messages during compilation
+       --  * Messages during compilation
        setMsgHandler,
        putMsg,
        compilationProgressMsg,
@@ -34,13 +34,11 @@ import Util         ( sortLe, global )
 import Outputable
 import qualified Pretty
 import SrcLoc          ( srcSpanStart )
-import CmdLineOpts     ( DynFlags(..), DynFlag(..), dopt,
-                         opt_ErrorSpans )
-
-import List             ( replicate, sortBy )
+import DynFlags                ( DynFlags(..), DynFlag(..), dopt )
+import StaticFlags     ( opt_ErrorSpans )
 import System          ( ExitCode(..), exitWith )
 import DATA_IOREF
-import IO              ( hPutStrLn, stderr, stdout )
+import IO              ( hPutStrLn, stderr )
 
 
 -- -----------------------------------------------------------------------------
@@ -92,18 +90,9 @@ mkLongErrMsg :: SrcSpan -> PrintUnqualified -> Message -> Message -> ErrMsg
 mkLongErrMsg locn print_unqual msg extra 
  = ErrMsg [locn] print_unqual msg extra
 
--- A long (multi-line) error message, with context to tell us whether
--- to qualify names in the message or not.
-mkLongMultiLocErrMsg :: [SrcSpan] -> PrintUnqualified -> Message -> Message -> ErrMsg
-mkLongMultiLocErrMsg locns print_unqual msg extra
-  = ErrMsg locns print_unqual msg extra
-
 mkWarnMsg :: SrcSpan -> PrintUnqualified -> Message -> WarnMsg
 mkWarnMsg = mkErrMsg
 
-mkLongWarnMsg :: SrcSpan -> PrintUnqualified -> Message -> Message -> WarnMsg
-mkLongWarnMsg = mkLongErrMsg
-
 type Messages = (Bag WarnMsg, Bag ErrMsg)
 
 emptyMessages :: Messages
@@ -230,9 +219,9 @@ compilationPassMsg :: DynFlags -> String -> IO ()
 compilationPassMsg dflags msg
   = ifVerbose dflags 2 (putMsg msg)
 
-debugTraceMsg :: DynFlags -> String -> IO ()
-debugTraceMsg dflags msg
-  = ifVerbose dflags 2 (putMsg msg)
+debugTraceMsg :: DynFlags -> Int -> String -> IO ()
+debugTraceMsg dflags val msg
+  = ifVerbose dflags val (putMsg msg)
 
 GLOBAL_VAR(msgHandler, hPutStrLn stderr, (String -> IO ()))