X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Pretty.hs;h=3c007f9c8931116b3c7d3ecd43e689c86806d3d3;hb=acb620510e3623e8dfd979a8b732babd19086a9b;hp=cb1f9fc7c1256900cb0476f0c993f43c953fdc3d;hpb=6b3da07384004751bc64ef88429f452dfe1cee45;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Pretty.hs b/Pretty.hs index cb1f9fc..3c007f9 100644 --- a/Pretty.hs +++ b/Pretty.hs @@ -47,7 +47,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 +57,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 @@ -79,7 +82,7 @@ instance Pretty SignalExpr where parens $ pPrint a <> text " = " <> pPrint b instance Pretty SignalInfo where - pPrint (SignalInfo name use ty) = + pPrint (SignalInfo name use ty hints) = text ":" <> (pPrint use) <> (ppname name) where ppname Nothing = empty