X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Futils%2FOutputable.lhs;h=c4a685b3b5e3ab05029bb68ab7a3ea0e7f502e0c;hp=96cf492105749d238dcbc926e7390857f115f545;hb=b187c221cc97679e28118ae8ac2997d6a686ba14;hpb=3a7e2b3ad24b08dd68c96421d1ef94baa9b00c92

diff --git a/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs
index 96cf492..c4a685b 100644
--- a/compiler/utils/Outputable.lhs
+++ b/compiler/utils/Outputable.lhs
@@ -60,7 +60,7 @@ module Outputable (
 	
 	-- * Error handling and debugging utilities
 	pprPanic, pprSorry, assertPprPanic, pprPanicFastInt, pprPgmError, 
-	pprTrace, warnPprTrace,
+	pprTrace, pprDefiniteTrace, warnPprTrace,
 	trace, pgmError, panic, sorry, panicFastInt, assertPanic
     ) where
 
@@ -82,12 +82,12 @@ import System.IO	( Handle, stderr, stdout, hFlush )
 import System.FilePath
 
 
-#if __GLASGOW_HASKELL__ >= 700
-import GHC.Show		( showMultiLineString )
+#if __GLASGOW_HASKELL__ >= 701
+import GHC.Show         ( showMultiLineString )
 #else
 showMultiLineString :: String -> [String]
 -- Crude version
-showMultiLineString s = [s]
+showMultiLineString s = [ showList s "" ]
 #endif
 \end{code}
 
@@ -800,6 +800,9 @@ pprTrace str doc x
    | opt_NoDebugOutput = x
    | otherwise         = pprAndThen trace str doc x
 
+pprDefiniteTrace :: String -> SDoc -> a -> a
+-- ^ Same as pprTrace, but show even if -dno-debug-output is on
+pprDefiniteTrace str doc x = pprAndThen trace str doc x
 
 pprPanicFastInt :: String -> SDoc -> FastInt
 -- ^ Specialization of pprPanic that can be safely used with 'FastInt'