[project @ 2000-10-10 13:20:38 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 71823f1..f67bedc 100644 (file)
--- a/ghc/compiler/main/ErrUtils.lhs
+++ b/ghc/compiler/main/ErrUtils.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The AQUA Project, Glasgow University, 1994-1995
+% (c) The AQUA Project, Glasgow University, 1994-1998
 %
 \section[ErrsUtils]{Utilities for error reporting}
 
@@ -7,54 +7,88 @@
 module ErrUtils (
        ErrMsg, WarnMsg, Message,
        addShortErrLocLine, addShortWarnLocLine,
+       addErrLocHdrLine,
        dontAddErrLoc,
-       pprBagOfErrors, pprBagOfWarnings,
+       printErrorsAndWarnings, pprBagOfErrors, pprBagOfWarnings,
        ghcExit,
        doIfSet, dumpIfSet
     ) where
 
 #include "HsVersions.h"
 
-import Bag             ( Bag, bagToList )
-import SrcLoc          ( SrcLoc )
+import Bag             ( Bag, bagToList, isEmptyBag )
+import SrcLoc          ( SrcLoc, noSrcLoc )
+import Util            ( sortLt )
 import Outputable
+
+import System          ( ExitCode(..), exitWith )
+import IO              ( hPutStr, stderr )
 \end{code}
 
 \begin{code}
-type ErrMsg   = SDoc
-type WarnMsg = SDoc
+type MsgWithLoc = (SrcLoc, SDoc)
+
+type ErrMsg  = MsgWithLoc
+type WarnMsg = MsgWithLoc
 type Message = SDoc
 
-addShortErrLocLine, addShortWarnLocLine :: SrcLoc -> ErrMsg -> ErrMsg
+addShortErrLocLine  :: SrcLoc -> Message -> ErrMsg
+addErrLocHdrLine    :: SrcLoc -> Message -> Message -> ErrMsg
+addShortWarnLocLine :: SrcLoc -> Message -> WarnMsg
 
 addShortErrLocLine locn rest_of_err_msg
-  = hang (ppr locn <> colon)
-        4 rest_of_err_msg
+  = ( locn
+    , hang (ppr locn <> colon) 
+         4 rest_of_err_msg
+    )
+
+addErrLocHdrLine locn hdr rest_of_err_msg
+  = ( locn
+    , hang (ppr locn <> colon<+> hdr) 
+         4 rest_of_err_msg
+    )
 
 addShortWarnLocLine locn rest_of_err_msg
-  = hang (ppr locn <> ptext SLIT(": Warning:"))
-        4 rest_of_err_msg
+  = ( locn
+    , hang (ppr locn <> colon)
+        4 (ptext SLIT("Warning:") <+> rest_of_err_msg)
+    )
 
-dontAddErrLoc :: String -> ErrMsg -> ErrMsg
+dontAddErrLoc :: String -> Message -> ErrMsg
 dontAddErrLoc title rest_of_err_msg
-  = hang (hcat [text title, char ':'])
-        4 rest_of_err_msg
+ | null title = (noSrcLoc, rest_of_err_msg)
+ | otherwise  =
+    ( noSrcLoc, hang (text title <> colon) 4 rest_of_err_msg )
+
+printErrorsAndWarnings :: Bag ErrMsg -> Bag WarnMsg -> IO ()
+       -- Don't print any warnings if there are errors
+printErrorsAndWarnings errs warns
+  | no_errs && no_warns  = return ()
+  | no_errs             = printErrs (pprBagOfWarnings warns)
+  | otherwise           = printErrs (pprBagOfErrors   errs)
+  where
+    no_warns = isEmptyBag warns
+    no_errs  = isEmptyBag errs
 
 pprBagOfErrors :: Bag ErrMsg -> SDoc
 pprBagOfErrors bag_of_errors
-  = vcat [space $$ p | p <- bagToList bag_of_errors]
+  = vcat [text "" $$ p | (_,p) <- sorted_errs ]
+    where
+      bag_ls     = bagToList bag_of_errors
+      sorted_errs = sortLt occ'ed_before bag_ls
+
+      occ'ed_before (a,_) (b,_) = LT == compare a b
 
-pprBagOfWarnings :: Bag ErrMsg -> SDoc
+pprBagOfWarnings :: Bag WarnMsg -> SDoc
 pprBagOfWarnings bag_of_warns = pprBagOfErrors bag_of_warns
 \end{code}
 
 \begin{code}
 ghcExit :: Int -> IO ()
-
 ghcExit val
-  = if val /= 0
-    then error "Compilation had errors\n"
-    else return ()
+  | val == 0  = exitWith ExitSuccess
+  | otherwise = do hPutStr stderr "\nCompilation had errors\n\n"
+                  exitWith (ExitFailure val)
 \end{code}
 
 \begin{code}
@@ -64,7 +98,7 @@ doIfSet flag action | flag      = action
 \end{code}
 
 \begin{code}
-dumpIfSet :: Bool -> String -> SDoc -> IO ()
+dumpIfSet :: DynFlags -> (DynFlags -> Bool) -> String -> SDoc -> IO ()
 dumpIfSet flag hdr doc
   | not flag  = return ()
   | otherwise = printDump dump