Make FlatFunction parameterized with the signal id type.

[matthijs/master-project/cλash.git] / Pretty.hs

diff --git a/Pretty.hs b/Pretty.hs
index bc72faa1c296167fbb197ee35cc5a549e9ed10ab..bd4d9e598b3f798ca8b100d28e3bb5fce8004943 100644 (file)
--- a/Pretty.hs
+++ b/Pretty.hs
@@ -1,11 +1,14 @@
 module Pretty (prettyShow) where
 
+import qualified Data.Map as Map
 import qualified CoreSyn
 import qualified Module
 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
@@ -24,33 +27,33 @@ instance Pretty HsValueUse where
   pPrint (State n)       = char 'C' <> int n
   pPrint (HighOrder _ _) = text "Higher Order"
 
-instance Pretty FlatFunction where
+instance Pretty id => Pretty (FlatFunction' id) where
   pPrint (FlatFunction args res apps 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)
 
-instance Pretty FApp where
+instance Pretty id => Pretty (FApp id) where
   pPrint (FApp func args res) =
     pPrint func <> text " : " <> pPrint args <> text " -> " <> pPrint res
 
-instance Pretty SignalDef where
+instance Pretty id => Pretty (SignalDef id) where
   pPrint (SignalDef id) = pPrint id
 
-instance Pretty SignalUse where
+instance Pretty id => Pretty (SignalUse id) where
   pPrint (SignalUse id) = pPrint id
 
-instance Pretty CondDef where
+instance Pretty id => Pretty (CondDef id) where
   pPrint _ = text "TODO"
 
 instance Pretty VHDLSession where
   pPrint (VHDLSession mod nameCount funcs) =
     text "Module: " $$ nest 15 (text modname)
     $+$ text "NameCount: " $$ nest 15 (int nameCount)
-    $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc funcs))
+    $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc (Map.toList funcs)))
     where
-      ppfunc (hsfunc, (flatfunc)) =
+      ppfunc (hsfunc, (FuncData flatfunc)) =
         pPrint hsfunc $+$ (text "Flattened: " $$ nest 15 (pPrint flatfunc))
       modname = showSDoc $ Module.pprModule (HscTypes.cm_module mod)