Allow a FlatFunction to be named as well as unnamed.

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

diff --git a/Pretty.hs b/Pretty.hs
index c4556a81b90980dcc8bcfd97457c901fb0568e58..3c6e9fcf5225025fd16a4d8ea00a9d4d73aac33f 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 Flatten
+
+import HsValueMap
+import FlattenTypes
 import TranslatorTypes
 
 instance Pretty HsFunction where
@@ -25,25 +27,26 @@ instance Pretty HsValueUse where
   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 "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
 
-instance Pretty SignalDef where
-  pPrint (SignalDef id) = pPrint id
+instance Pretty id => Pretty (CondDef id) where
+  pPrint _ = text "TODO"
 
-instance Pretty SignalUse where
-  pPrint (SignalUse id) = pPrint id
+instance Pretty id => Pretty (Signal id) where
+  pPrint (Signal id) = pPrint id
 
-instance Pretty CondDef where
-  pPrint _ = text "TODO"
+instance Pretty NamedSignal where
+  pPrint (NamedSignal name) = pPrint name
 
 instance Pretty VHDLSession where
   pPrint (VHDLSession mod nameCount funcs) =
@@ -51,8 +54,11 @@ instance Pretty VHDLSession where
     $+$ text "NameCount: " $$ nest 15 (int nameCount)
     $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc (Map.toList funcs)))
     where
-      ppfunc (hsfunc, (flatfunc)) =
-        pPrint hsfunc $+$ (text "Flattened: " $$ nest 15 (pPrint flatfunc))
+      ppfunc (hsfunc, (FuncData flatfunc)) =
+        pPrint hsfunc $+$ (text "Flattened: " $$ nest 15 (ppffunc flatfunc))
+      ppffunc (Just (Left f)) = pPrint f
+      ppffunc (Just (Right f)) = pPrint f
+      ppffunc Nothing = text "Nothing"
       modname = showSDoc $ Module.pprModule (HscTypes.cm_module mod)
 
 instance (OutputableBndr b) => Pretty (CoreSyn.Bind b) where