projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return multiple statements instead of a block.
[matthijs/master-project/cλash.git]
/
Pretty.hs
diff --git
a/Pretty.hs
b/Pretty.hs
index ef92c4dc955aeffe47dfb0877ad1b08f80abbae3..7896372f2d27dd01603664e4602dac15901dce70 100644
(file)
--- a/
Pretty.hs
+++ b/
Pretty.hs
@@
-1,4
+1,4
@@
-module Pretty (prettyShow) where
+module Pretty (prettyShow
, pprString
) where
import qualified Data.Map as Map
import qualified Data.Map as Map
@@
-76,8
+76,8
@@
instance Pretty SigDef where
instance Pretty SignalExpr where
pPrint (EqLit id lit) =
parens $ pPrint id <> text " = " <> text lit
instance Pretty SignalExpr where
pPrint (EqLit id lit) =
parens $ pPrint id <> text " = " <> text lit
- pPrint (Literal lit) =
- text lit
+ pPrint (Literal lit
ty
) =
+ text
"(" <> text (show ty) <> text ") " <> text
lit
pPrint (Eq a b) =
parens $ pPrint a <> text " = " <> pPrint b
pPrint (Eq a b) =
parens $ pPrint a <> text " = " <> pPrint b
@@
-132,6
+132,9
@@
instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Bind b) where
pPrint (CoreSyn.Rec binds) =
text "Rec: " $$ nest 10 (vcat $ map (prettyBind) binds)
pPrint (CoreSyn.Rec binds) =
text "Rec: " $$ nest 10 (vcat $ map (prettyBind) binds)
+instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Expr b) where
+ pPrint = text . show
+
instance Pretty AST.VHDLId where
pPrint id = ForSyDe.Backend.Ppr.ppr id
instance Pretty AST.VHDLId where
pPrint id = ForSyDe.Backend.Ppr.ppr id
@@
-148,3
+151,7
@@
instance (Pretty k, Pretty v) => Pretty (Map.Map k v) where
where
ppentry (k, v) =
pPrint k <> text " : " $$ nest 15 (pPrint v)
where
ppentry (k, v) =
pPrint k <> text " : " $$ nest 15 (pPrint v)
+
+-- Convenience method for turning an Outputable into a string
+pprString :: (Outputable x) => x -> String
+pprString = showSDoc . ppr