Move around a bunch of types.

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

diff --git a/Pretty.hs b/Pretty.hs
index ff84a56cc61c5f39bbedec587584f0f0755026da..6f88877948320aa11b1015184ecd8dc005763c45 100644 (file)
--- a/Pretty.hs
+++ b/Pretty.hs
@@ -1,9 +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
@@ -43,12 +48,14 @@ instance Pretty CondDef where
   pPrint _ = text "TODO"
 
 instance Pretty VHDLSession where
-  pPrint (VHDLSession nameCount funcs) =
-    text "NameCount: " $$ nest 15 (int nameCount)
-    $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc funcs))
+  pPrint (VHDLSession mod nameCount funcs) =
+    text "Module: " $$ nest 15 (text modname)
+    $+$ text "NameCount: " $$ nest 15 (int nameCount)
+    $+$ 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)
 
 instance (OutputableBndr b) => Pretty (CoreSyn.Bind b) where
   pPrint (CoreSyn.NonRec b expr) =