projects
/
matthijs
/
master-project
/
cλash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
678eabd
)
Improve the pretty output of the signal list.
author
Matthijs Kooijman
<m.kooijman@student.utwente.nl>
Mon, 16 Feb 2009 16:11:13 +0000
(17:11 +0100)
committer
Matthijs Kooijman
<m.kooijman@student.utwente.nl>
Mon, 16 Feb 2009 16:11:13 +0000
(17:11 +0100)
Pretty.hs
patch
|
blob
|
history
diff --git
a/Pretty.hs
b/Pretty.hs
index dd8e4eea33cac26e083046ca63434f4e19e02cf6..65645760959aa7f314633f0848c7a14617d39a5b 100644
(file)
--- a/
Pretty.hs
+++ b/
Pretty.hs
@@
-15,6
+15,11
@@
import FlattenTypes
import TranslatorTypes
import VHDLTypes
import TranslatorTypes
import VHDLTypes
+-- | A version of the default pPrintList method, which uses a custom function
+-- f instead of pPrint to print elements.
+printList :: (a -> Doc) -> [a] -> Doc
+printList f = brackets . fsep . punctuate comma . map f
+
instance Pretty HsFunction where
pPrint (HsFunction name args res) =
text name <> char ' ' <> parens (hsep $ punctuate comma args') <> text " -> " <> res'
instance Pretty HsFunction where
pPrint (HsFunction name args res) =
text name <> char ' ' <> parens (hsep $ punctuate comma args') <> text " -> " <> res'
@@
-37,7
+42,9
@@
instance Pretty id => Pretty (FlatFunction' id) where
$+$ (text "Result: ") $$ nest 10 (pPrint res)
$+$ (text "Apps: ") $$ nest 10 (vcat (map pPrint apps))
$+$ (text "Conds: ") $$ nest 10 (pPrint conds)
$+$ (text "Result: ") $$ nest 10 (pPrint res)
$+$ (text "Apps: ") $$ nest 10 (vcat (map pPrint apps))
$+$ (text "Conds: ") $$ nest 10 (pPrint conds)
- $+$ text "Signals: " $$ nest 10 (pPrint sigs)
+ $+$ text "Signals: " $$ nest 10 (printList ppsig sigs)
+ where
+ ppsig (id, info) = pPrint id <> pPrint info
instance Pretty id => Pretty (FApp id) where
pPrint (FApp func args res) =
instance Pretty id => Pretty (FApp id) where
pPrint (FApp func args res) =