X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FErrUtils.lhs;h=a33098a42c3bfb991054cf18cacfdc52cbdcdcb3;hb=3a223cd2811d46295048b3a2dab11403ca291b20;hp=dcf2934f7a9094882e0483033fc5c9700fbcad55;hpb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/ErrUtils.lhs b/ghc/compiler/main/ErrUtils.lhs
index dcf2934..a33098a 100644
--- a/ghc/compiler/main/ErrUtils.lhs
+++ b/ghc/compiler/main/ErrUtils.lhs
@@ -5,73 +5,183 @@
 
 \begin{code}
 module ErrUtils (
-	ErrMsg, WarnMsg, Message,
+	ErrMsg, WarnMsg, Message, 
+	Messages, errorsFound, emptyMessages,
+
 	addShortErrLocLine, addShortWarnLocLine,
-	dontAddErrLoc,
-	pprBagOfErrors, pprBagOfWarnings,
+	addErrLocHdrLine, addWarnLocHdrLine, dontAddErrLoc,
+
+	printErrorsAndWarnings, pprBagOfErrors, pprBagOfWarnings,
+
+	printError,
 	ghcExit,
-	doIfSet, dumpIfSet
+	doIfSet, doIfSet_dyn, 
+	dumpIfSet, dumpIfSet_core, dumpIfSet_dyn, dumpIfSet_dyn_or, mkDumpDoc,
+	showPass
     ) where
 
 #include "HsVersions.h"
 
-import Bag		( Bag, bagToList )
-import SrcLoc		( SrcLoc )
+import Bag		( Bag, bagToList, isEmptyBag, emptyBag )
+import SrcLoc		( SrcLoc, noSrcLoc, isGoodSrcLoc )
+import Util		( sortLt )
 import Outputable
+import qualified Pretty
+import CmdLineOpts	( DynFlags(..), DynFlag(..), dopt )
+
+import List             ( replicate )
+import System		( ExitCode(..), exitWith )
+import IO		( hPutStr, hPutStrLn, stderr, stdout )
 \end{code}
 
 \begin{code}
-type ErrMsg   = SDoc
-type WarnMsg = SDoc
+type MsgWithLoc = (SrcLoc, Pretty.Doc)
+	-- The SrcLoc is used for sorting errors into line-number order
+	-- NB  Pretty.Doc not SDoc: we deal with the printing style (in ptic 
+	-- whether to qualify an External Name) at the error occurrence
+
+type ErrMsg  = MsgWithLoc
+type WarnMsg = MsgWithLoc
 type Message = SDoc
 
-addShortErrLocLine, addShortWarnLocLine :: SrcLoc -> ErrMsg -> ErrMsg
+addShortErrLocLine  :: SrcLoc -> PrintUnqualified -> Message -> ErrMsg
+addShortWarnLocLine :: SrcLoc -> PrintUnqualified -> Message -> WarnMsg
+	-- Used heavily by renamer/typechecker
+	-- Be refined about qualification, return an ErrMsg
+
+addErrLocHdrLine    :: SrcLoc -> Message -> Message -> Message
+addWarnLocHdrLine   :: SrcLoc -> Message -> Message -> Message
+	-- Used by Lint and other system stuff
+	-- Always print qualified, return a Message
+
+addShortErrLocLine locn print_unqual msg
+  = (locn, doc (mkErrStyle print_unqual))
+  where
+    doc = mkErrDoc locn msg
+
+addShortWarnLocLine locn print_unqual msg
+  = (locn, doc (mkErrStyle print_unqual))
+  where
+    doc = mkWarnDoc locn msg
+
+addErrLocHdrLine locn hdr msg
+  = mkErrDoc locn (hdr $$ msg)
+
+addWarnLocHdrLine locn hdr msg
+  = mkWarnDoc locn (hdr $$ msg)
 
-addShortErrLocLine locn rest_of_err_msg
-  = hang (ppr locn <> colon)
-	 4 rest_of_err_msg
+dontAddErrLoc :: Message -> ErrMsg
+dontAddErrLoc msg = (noSrcLoc, msg defaultErrStyle)
 
-addShortWarnLocLine locn rest_of_err_msg
-  = hang (ppr locn <> ptext SLIT(": Warning:"))
-	 4 rest_of_err_msg
+mkErrDoc locn msg
+  | isGoodSrcLoc locn = hang (ppr locn <> colon) 4 msg
+  | otherwise	      = msg
+	
+mkWarnDoc locn msg 
+  | isGoodSrcLoc locn = hang (ppr locn <> colon) 4 warn_msg
+  | otherwise	      = warn_msg
+  where
+    warn_msg = ptext SLIT("Warning:") <+> msg
+\end{code}
 
-dontAddErrLoc :: String -> ErrMsg -> ErrMsg
-dontAddErrLoc title rest_of_err_msg
-  = hang (hcat [text title, char ':'])
-    	 4 rest_of_err_msg
+\begin{code}
+printError :: String -> IO ()
+printError str = hPutStrLn stderr str
+\end{code}
 
-pprBagOfErrors :: Bag ErrMsg -> SDoc
+\begin{code}
+type Messages = (Bag WarnMsg, Bag ErrMsg)
+
+emptyMessages :: Messages
+emptyMessages = (emptyBag, emptyBag)
+
+errorsFound :: DynFlags -> Messages -> Bool
+-- The dyn-flags are used to see if the user has specified
+-- -Werorr, which says that warnings should be fatal
+errorsFound dflags (warns, errs) 
+  | dopt Opt_WarnIsError dflags = not (isEmptyBag errs) || not (isEmptyBag warns)
+  | otherwise  		        = not (isEmptyBag errs)
+
+printErrorsAndWarnings :: Messages -> 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 -> Pretty.Doc
 pprBagOfErrors bag_of_errors
-  = vcat [space $$ p | p <- bagToList bag_of_errors]
+  = Pretty.vcat [Pretty.text "" Pretty.$$ p | (_,p) <- sorted_errs ]
+    where
+      bag_ls	  = bagToList bag_of_errors
+      sorted_errs = sortLt occ'ed_before bag_ls
 
-pprBagOfWarnings :: Bag ErrMsg -> SDoc
+      occ'ed_before (a,_) (b,_) = LT == compare a b
+
+pprBagOfWarnings :: Bag WarnMsg -> Pretty.Doc
 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}
 doIfSet :: Bool -> IO () -> IO ()
 doIfSet flag action | flag      = action
 		    | otherwise = return ()
+
+doIfSet_dyn :: DynFlags -> DynFlag -> IO () -> IO()
+doIfSet_dyn dflags flag action | dopt flag dflags = action
+		               | otherwise        = return ()
 \end{code}
 
 \begin{code}
+showPass :: DynFlags -> String -> IO ()
+showPass dflags what
+  | verbosity dflags >= 2 = hPutStr stderr ("*** "++what++":\n")
+  | otherwise		  = return ()
+
 dumpIfSet :: Bool -> String -> SDoc -> IO ()
 dumpIfSet flag hdr doc
-  | not flag  = return ()
-  | otherwise = printDump dump
-  where
-    dump = vcat [text "", 
-		 line <+> text hdr <+> line,
-		 doc,
-		 text ""]
-    line = text (take 20 (repeat '='))
+  | not flag   = return ()
+  | otherwise  = printDump (mkDumpDoc 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 (mkDumpDoc hdr doc)
+  | otherwise                                   = return ()
+
+dumpIfSet_dyn :: DynFlags -> DynFlag -> String -> SDoc -> IO ()
+dumpIfSet_dyn dflags flag hdr doc
+  | dopt flag dflags || verbosity dflags >= 4 
+  = if   flag `elem` [Opt_D_dump_stix, Opt_D_dump_asm]
+    then printForC stdout (mkDumpDoc hdr doc)
+    else printDump (mkDumpDoc 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 (mkDumpDoc hdr doc)
+  | otherwise = return ()
+
+mkDumpDoc hdr doc 
+   = vcat [text "", 
+	   line <+> text hdr <+> line,
+	   doc,
+	   text ""]
+     where 
+        line = text (replicate 20 '=')
 \end{code}