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
Fill the signal list in FlatFunction.
[matthijs/master-project/cλash.git]
/
Pretty.hs
diff --git
a/Pretty.hs
b/Pretty.hs
index 4136adea2ab9b9450046351c96b5cac9906da2eb..74ffec79cc52f268ef6217b3a66d5e05f2c944b9 100644
(file)
--- a/
Pretty.hs
+++ b/
Pretty.hs
@@
-6,7
+6,9
@@
import qualified Module
import qualified HscTypes
import Text.PrettyPrint.HughesPJClass
import Outputable ( showSDoc, ppr, Outputable, OutputableBndr)
import qualified HscTypes
import Text.PrettyPrint.HughesPJClass
import Outputable ( showSDoc, ppr, Outputable, OutputableBndr)
-import Flatten
+
+import HsValueMap
+import FlattenTypes
import TranslatorTypes
instance Pretty HsFunction where
import TranslatorTypes
instance Pretty HsFunction where
@@
-25,26
+27,24
@@
instance Pretty HsValueUse where
pPrint (State n) = char 'C' <> int n
pPrint (HighOrder _ _) = text "Higher Order"
pPrint (State n) = char 'C' <> int n
pPrint (HighOrder _ _) = text "Higher Order"
-instance Pretty
FlatFunction
where
- pPrint (FlatFunction args res apps conds) =
+instance Pretty
id => Pretty (FlatFunction' id)
where
+ pPrint (FlatFunction args res apps conds
sigs
) =
(text "Args: ") $$ nest 10 (pPrint args)
$+$ (text "Result: ") $$ nest 10 (pPrint res)
$+$ (text "Apps: ") $$ nest 10 (vcat (map pPrint apps))
$+$ (text "Conds: ") $$ nest 10 (pPrint conds)
(text "Args: ") $$ nest 10 (pPrint args)
$+$ (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)
-instance Pretty
FApp
where
+instance Pretty
id => Pretty (FApp id)
where
pPrint (FApp func args res) =
pPrint func <> text " : " <> pPrint args <> text " -> " <> pPrint res
pPrint (FApp func args res) =
pPrint func <> text " : " <> pPrint args <> text " -> " <> pPrint res
-instance Pretty SignalDef where
- pPrint (SignalDef id) = pPrint id
-
-instance Pretty SignalUse where
- pPrint (SignalUse id) = pPrint id
-
-instance Pretty CondDef where
+instance Pretty id => Pretty (CondDef id) where
pPrint _ = text "TODO"
pPrint _ = text "TODO"
+instance Pretty id => Pretty (Signal id) where
+ pPrint (Signal id) = pPrint id
+
instance Pretty VHDLSession where
pPrint (VHDLSession mod nameCount funcs) =
text "Module: " $$ nest 15 (text modname)
instance Pretty VHDLSession where
pPrint (VHDLSession mod nameCount funcs) =
text "Module: " $$ nest 15 (text modname)