[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 c5abb68..f67bedc 100644 (file)
--- a/ghc/compiler/main/ErrUtils.lhs
+++ b/ghc/compiler/main/ErrUtils.lhs
@@ -9,17 +9,20 @@ module ErrUtils (
        addShortErrLocLine, addShortWarnLocLine,
        addErrLocHdrLine,
        dontAddErrLoc,
-       pprBagOfErrors, pprBagOfWarnings,
+       printErrorsAndWarnings, pprBagOfErrors, pprBagOfWarnings,
        ghcExit,
        doIfSet, dumpIfSet
     ) where
 
 #include "HsVersions.h"
 
-import Bag             ( Bag, bagToList )
+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}
@@ -57,6 +60,16 @@ dontAddErrLoc title 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 [text "" $$ p | (_,p) <- sorted_errs ]
@@ -72,11 +85,10 @@ pprBagOfWarnings bag_of_warns = pprBagOfErrors bag_of_warns
 
 \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}
@@ -86,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