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
Add getGlobalBinders accessor.
[matthijs/master-project/cλash.git]
/
Pretty.hs
diff --git
a/Pretty.hs
b/Pretty.hs
index 43e0e49bf7aa6c2dc3ce6822bf47306d57136175..b2ac91ddb6e3334b4b075df407c96936d8855195 100644
(file)
--- a/
Pretty.hs
+++ b/
Pretty.hs
@@
-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
@@
-141,3
+144,10
@@
prettyBind (b, expr) =
where
b' = show b
expr' = show expr
where
b' = show b
expr' = show expr
+
+instance (Pretty k, Pretty v) => Pretty (Map.Map k v) where
+ pPrint =
+ vcat . map ppentry . Map.toList
+ where
+ ppentry (k, v) =
+ pPrint k <> text " : " $$ nest 15 (pPrint v)