Remove the distinction between SignalDef and SignalUse.

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

diff --git a/Pretty.hs b/Pretty.hs
index 4136adea2ab9b9450046351c96b5cac9906da2eb..22862d59a0f256f16f87bfd0aeef87051b0c7f8c 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,24 +27,18 @@ 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
-  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"
 
 instance Pretty VHDLSession where