projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
External Core: print function types correctly, improve newtype pretty-printing
[ghc-hetmet.git]
/
compiler
/
utils
/
Outputable.lhs
diff --git
a/compiler/utils/Outputable.lhs
b/compiler/utils/Outputable.lhs
index
839eda1
..
8380c76
100644
(file)
--- a/
compiler/utils/Outputable.lhs
+++ b/
compiler/utils/Outputable.lhs
@@
-45,9
+45,9
@@
module Outputable (
pprHsChar, pprHsString,
-- error handling
pprHsChar, pprHsString,
-- error handling
- pprPanic, assertPprPanic, pprPanic#, pprPgmError,
+ pprPanic, assertPprPanic, pprPanicFastInt, pprPgmError,
pprTrace, warnPprTrace,
pprTrace, warnPprTrace,
- trace, pgmError, panic, panic#, assertPanic
+ trace, pgmError, panic, panicFastInt, assertPanic
) where
#include "HsVersions.h"
) where
#include "HsVersions.h"
@@
-59,7
+59,6
@@
import {-# SOURCE #-} OccName( OccName )
import StaticFlags ( opt_PprStyle_Debug, opt_PprUserLength )
import FastString
import FastTypes
import StaticFlags ( opt_PprStyle_Debug, opt_PprUserLength )
import FastString
import FastTypes
-import GHC.Ptr
import qualified Pretty
import Pretty ( Doc, Mode(..) )
import Panic
import qualified Pretty
import Pretty ( Doc, Mode(..) )
import Panic
@@
-336,7
+335,7
@@
empty :: SDoc
text :: String -> SDoc
char :: Char -> SDoc
ftext :: FastString -> SDoc
text :: String -> SDoc
char :: Char -> SDoc
ftext :: FastString -> SDoc
-ptext :: Ptr t -> SDoc
+ptext :: LitString -> SDoc
int :: Int -> SDoc
integer :: Integer -> SDoc
float :: Float -> SDoc
int :: Int -> SDoc
integer :: Integer -> SDoc
float :: Float -> SDoc
@@
-446,6
+445,9
@@
instance Outputable Bool where
instance Outputable Int where
ppr n = int n
instance Outputable Int where
ppr n = int n
+instance Outputable Word32 where
+ ppr n = integer $ fromIntegral n
+
instance Outputable () where
ppr _ = text "()"
instance Outputable () where
ppr _ = text "()"
@@
-625,8
+627,8
@@
pprPgmError = pprAndThen pgmError -- Throw an exn saying "bug in pgm being compi
-- (used for unusual pgm errors)
pprTrace = pprAndThen trace
-- (used for unusual pgm errors)
pprTrace = pprAndThen trace
-pprPanic# :: String -> SDoc -> FastInt
-pprPanic# heading pretty_msg = panic# (show (doc PprDebug))
+pprPanicFastInt :: String -> SDoc -> FastInt
+pprPanicFastInt heading pretty_msg = panicFastInt (show (doc PprDebug))
where
doc = text heading <+> pretty_msg
where
doc = text heading <+> pretty_msg