From e1804fc0ff2824e3584383ad7553a8f265ab615b Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Wed, 18 Feb 2009 15:37:32 +0100 Subject: [PATCH] Derive and use show instead of ppr to display Exprs. This shows the actual data structures used in an expression more clearly, without hiding details like ppr does. --- Pretty.hs | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Pretty.hs b/Pretty.hs index 183125c..6d49569 100644 --- a/Pretty.hs +++ b/Pretty.hs @@ -1,13 +1,16 @@ module Pretty (prettyShow) where import qualified Data.Map as Map +import qualified Var import qualified CoreSyn +import qualified TypeRep import qualified Module import qualified HscTypes import Text.PrettyPrint.HughesPJClass import Outputable ( showSDoc, ppr, Outputable, OutputableBndr) import qualified ForSyDe.Backend.Ppr +import qualified ForSyDe.Backend.VHDL.Ppr import qualified ForSyDe.Backend.VHDL.AST as AST import HsValueMap @@ -99,7 +102,7 @@ instance Pretty Entity where ppdecl Nothing = text "VHDL entity not present" ppdecl (Just _) = text "VHDL entity present" -instance (OutputableBndr b) => Pretty (CoreSyn.Bind b) where +instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Bind b) where pPrint (CoreSyn.NonRec b expr) = text "NonRec: " $$ nest 10 (prettyBind (b, expr)) pPrint (CoreSyn.Rec binds) = @@ -108,9 +111,21 @@ instance (OutputableBndr b) => Pretty (CoreSyn.Bind b) where instance Pretty AST.VHDLId where pPrint id = ForSyDe.Backend.Ppr.ppr id -prettyBind :: (Outputable b, Outputable e) => (b, e) -> Doc +prettyBind :: (Show b, Show e) => (b, e) -> Doc prettyBind (b, expr) = text b' <> text " = " <> text expr' where - b' = showSDoc $ ppr b - expr' = showSDoc $ ppr expr + b' = show b + expr' = show expr + +-- Derive Show for core expressions and binders, so we can see the actual +-- structure. +deriving instance (Show b) => Show (CoreSyn.Expr b) +deriving instance (Show b) => Show (CoreSyn.Bind b) + +-- Implement dummy shows for Note and Type, so we can at least use show on +-- expressions. +instance Show CoreSyn.Note where + show n = "" +instance Show TypeRep.Type where + show t = "_type:(" ++ (showSDoc $ ppr t) ++ ")" -- 2.30.2