X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FErrUtils.lhs;h=18b9e38bf606a552b79566714b2760e931200b69;hb=2b4d4dcc7f2bb1e90a7c06f111c8460b6348920a;hp=d588f68d721e48240cdf46c445f6bbea8b24734e;hpb=7d61cb61daa5e433a0cb85b34b7f0c58b2f961ff;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/ErrUtils.lhs b/ghc/compiler/main/ErrUtils.lhs
index d588f68..18b9e38 100644
--- a/ghc/compiler/main/ErrUtils.lhs
+++ b/ghc/compiler/main/ErrUtils.lhs
@@ -1,50 +1,112 @@
 %
-% (c) The AQUA Project, Glasgow University, 1994-1995
+% (c) The AQUA Project, Glasgow University, 1994-1998
 %
 \section[ErrsUtils]{Utilities for error reporting}
 
 \begin{code}
+module ErrUtils (
+	ErrMsg, WarnMsg, Message,
+	addShortErrLocLine, addShortWarnLocLine,
+	addErrLocHdrLine,
+	dontAddErrLoc,
+	printErrorsAndWarnings, pprBagOfErrors, pprBagOfWarnings,
+	ghcExit,
+	doIfSet, dumpIfSet
+    ) where
+
 #include "HsVersions.h"
 
-module ErrUtils (
+import Bag		( Bag, bagToList, isEmptyBag )
+import SrcLoc		( SrcLoc, noSrcLoc )
+import Util		( sortLt )
+import Outputable
+import CmdLineOpts	( DynFlags )
+
+import System		( ExitCode(..), exitWith )
+import IO		( hPutStr, stderr )
+\end{code}
 
-	Error(..),
-	addErrLoc, addShortErrLocLine,
-	dontAddErrLoc, pprBagOfErrors
+\begin{code}
+type MsgWithLoc = (SrcLoc, SDoc)
 
-    ) where
+type ErrMsg  = MsgWithLoc
+type WarnMsg = MsgWithLoc
+type Message = SDoc
+
+addShortErrLocLine  :: SrcLoc -> Message -> ErrMsg
+addErrLocHdrLine    :: SrcLoc -> Message -> Message -> ErrMsg
+addShortWarnLocLine :: SrcLoc -> Message -> WarnMsg
+
+addShortErrLocLine locn rest_of_err_msg
+  = ( locn
+    , hang (ppr locn <> colon) 
+         4 rest_of_err_msg
+    )
 
-import Ubiq{-uitous-}
+addErrLocHdrLine locn hdr rest_of_err_msg
+  = ( locn
+    , hang (ppr locn <> colon<+> hdr) 
+         4 rest_of_err_msg
+    )
 
-import Bag		( bagToList )
-import PprStyle		( PprStyle(..) )
-import Pretty
-import SrcLoc		( mkUnknownSrcLoc, SrcLoc{-instance-} )
+addShortWarnLocLine locn rest_of_err_msg
+  = ( locn
+    , hang (ppr locn <> colon)
+	 4 (ptext SLIT("Warning:") <+> rest_of_err_msg)
+    )
+
+dontAddErrLoc :: String -> Message -> ErrMsg
+dontAddErrLoc title rest_of_err_msg
+ | null title = (noSrcLoc, rest_of_err_msg)
+ | otherwise  =
+    ( noSrcLoc, hang (text title <> colon) 4 rest_of_err_msg )
+
+printErrorsAndWarnings :: (Bag WarnMsg, Bag ErrMsg) -> IO ()
+	-- Don't print any warnings if there are errors
+printErrorsAndWarnings (warns, errs)
+  | 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 ]
+    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 WarnMsg -> SDoc
+pprBagOfWarnings bag_of_warns = pprBagOfErrors bag_of_warns
 \end{code}
 
 \begin{code}
-type Error   = PprStyle -> Pretty
-
-addErrLoc :: SrcLoc -> String -> Error -> Error
-addErrLoc locn title rest_of_err_msg sty
-  = ppHang (ppBesides [ppr PprForUser locn,
-		       if null title then ppNil else ppStr (": " ++ title),
-		       ppChar ':'])
-    	 4 (rest_of_err_msg sty)
-
-addShortErrLocLine :: SrcLoc -> Error -> Error
-addShortErrLocLine locn rest_of_err_msg sty
-  = ppHang (ppBeside (ppr PprForUser locn) (ppChar ':'))
-	 4 (rest_of_err_msg sty)
-
-dontAddErrLoc :: String -> Error -> Error
-dontAddErrLoc title rest_of_err_msg sty
-  = ppHang (ppBesides [ppStr title, ppChar ':'])
-    	 4 (rest_of_err_msg sty)
-
-pprBagOfErrors :: PprStyle -> Bag Error -> Pretty
-pprBagOfErrors sty bag_of_errors
-  = let  pretties = map ( \ e -> e sty ) (bagToList bag_of_errors)  in
-    ppAboves (map (\ p -> ppAbove ppSP p) pretties)
+ghcExit :: Int -> IO ()
+ghcExit val
+  | val == 0  = exitWith ExitSuccess
+  | otherwise = do hPutStr stderr "\nCompilation had errors\n\n"
+	           exitWith (ExitFailure val)
 \end{code}
 
+\begin{code}
+doIfSet :: Bool -> IO () -> IO ()
+doIfSet flag action | flag      = action
+		    | otherwise = return ()
+\end{code}
+
+\begin{code}
+dumpIfSet :: DynFlags -> (DynFlags -> Bool) -> String -> SDoc -> IO ()
+dumpIfSet dflags flag hdr doc
+  | not (flag dflags)  = return ()
+  | otherwise          = printDump dump
+  where
+    dump = vcat [text "", 
+		 line <+> text hdr <+> line,
+		 doc,
+		 text ""]
+    line = text (take 20 (repeat '='))
+\end{code}