X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Pretty.hs;h=75c73cc095e422f0b52456d75350853738cdfe18;hb=0de275199ba2f3a98339eefb7784e061a451c5f7;hp=433c15a7abdc29914c2a6f84d0cd89a9f2cb2512;hpb=ee2454dbeb8d41d615726593acd8600c4a3253ae;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/Pretty.hs b/Pretty.hs
index 433c15a..75c73cc 100644
--- a/Pretty.hs
+++ b/Pretty.hs
@@ -1,5 +1,9 @@
+-- Needed for the Show deriving for Core types
+{-# LANGUAGE StandaloneDeriving #-}
+
 module Pretty (prettyShow) where
 
+
 import qualified Data.Map as Map
 import qualified Data.Foldable as Foldable
 import qualified List
@@ -47,7 +51,7 @@ instance Pretty FlatFunction where
     (text "Args: ") $$ nest 10 (pPrint args)
     $+$ (text "Result: ") $$ nest 10 (pPrint res)
     $+$ (text "Defs: ") $$ nest 10 (ppdefs defs)
-    $+$ text "Signals: " $$ nest 10 (printList ppsig sigs)
+    $+$ text "Signals: " $$ nest 10 (ppsigs sigs)
     where
       ppsig (id, info) = pPrint id <> pPrint info
       ppdefs defs = vcat (map pPrint sorted)
@@ -57,6 +61,9 @@ instance Pretty FlatFunction where
           sigDefDst (FApp _ _ dst) = head $ Foldable.toList dst
           sigDefDst (CondDef _ _ _ dst) = dst
           sigDefDst (UncondDef _ dst) = dst
+      ppsigs sigs = vcat (map pPrint sorted)
+        where
+          sorted = List.sortBy (\a b -> compare (fst a) (fst b)) sigs
 
 
 instance Pretty SigDef where
@@ -117,14 +124,17 @@ instance Pretty FuncData where
       pparch (Just _) = text "VHDL architecture present"
 
 instance Pretty Entity where
-  pPrint (Entity id args res decl) =
+  pPrint (Entity id args res decl pkg) =
     text "Entity: " $$ nest 10 (pPrint id)
     $+$ text "Args: " $$ nest 10 (pPrint args)
     $+$ text "Result: " $$ nest 10 (pPrint res)
     $+$ ppdecl decl
+    $+$ pppkg pkg
     where
       ppdecl Nothing = text "VHDL entity not present"
       ppdecl (Just _) = text "VHDL entity present"
+      pppkg Nothing = text "VHDL package not present"
+      pppkg (Just _) = text "VHDL package present"
 
 instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Bind b) where
   pPrint (CoreSyn.NonRec b expr) =