projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add pprDefiniteTrace and use it
[ghc-hetmet.git]
/
compiler
/
utils
/
Outputable.lhs
diff --git
a/compiler/utils/Outputable.lhs
b/compiler/utils/Outputable.lhs
index
96cf492
..
c4a685b
100644
(file)
--- 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,
-- * Error handling and debugging utilities
pprPanic, pprSorry, assertPprPanic, pprPanicFastInt, pprPgmError,
- pprTrace, warnPprTrace,
+ pprTrace, pprDefiniteTrace, warnPprTrace,
trace, pgmError, panic, sorry, panicFastInt, assertPanic
) where
trace, pgmError, panic, sorry, panicFastInt, assertPanic
) where
@@
-82,12
+82,12
@@
import System.IO ( Handle, stderr, stdout, hFlush )
import System.FilePath
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
#else
showMultiLineString :: String -> [String]
-- Crude version
-showMultiLineString s = [s]
+showMultiLineString s = [ showList s "" ]
#endif
\end{code}
#endif
\end{code}
@@
-800,6
+800,9
@@
pprTrace str doc x
| opt_NoDebugOutput = x
| otherwise = pprAndThen trace 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'
pprPanicFastInt :: String -> SDoc -> FastInt
-- ^ Specialization of pprPanic that can be safely used with 'FastInt'