X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Pretty.hs;h=3c6e9fcf5225025fd16a4d8ea00a9d4d73aac33f;hb=4fb701e41729143a897d43cd8a9c0217b8b3f68a;hp=22862d59a0f256f16f87bfd0aeef87051b0c7f8c;hpb=1de7e7d5eb0c3fd3be4a348e10fec91c7f3d029d;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/Pretty.hs b/Pretty.hs
index 22862d5..3c6e9fc 100644
--- a/Pretty.hs
+++ b/Pretty.hs
@@ -28,11 +28,12 @@ instance Pretty HsValueUse where
   pPrint (HighOrder _ _) = text "Higher Order"
 
 instance Pretty id => Pretty (FlatFunction' id) where
-  pPrint (FlatFunction args res apps conds) =
+  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 id => Pretty (FApp id) where
   pPrint (FApp func args res) =
@@ -41,6 +42,12 @@ instance Pretty id => Pretty (FApp id) where
 instance Pretty id => Pretty (CondDef id) where
   pPrint _ = text "TODO"
 
+instance Pretty id => Pretty (Signal id) where
+  pPrint (Signal id) = pPrint id
+
+instance Pretty NamedSignal where
+  pPrint (NamedSignal name) = pPrint name
+
 instance Pretty VHDLSession where
   pPrint (VHDLSession mod nameCount funcs) =
     text "Module: " $$ nest 15 (text modname)
@@ -48,7 +55,10 @@ instance Pretty VHDLSession where
     $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc (Map.toList funcs)))
     where
       ppfunc (hsfunc, (FuncData flatfunc)) =
-        pPrint hsfunc $+$ (text "Flattened: " $$ nest 15 (pPrint 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