X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Pretty.hs;h=d88846a1f2600e30cc8f9fa6efdf6cb31446f382;hb=b8c1e8554ba8aee73bc9d9a54bb3cb32f7930957;hp=7896372f2d27dd01603664e4602dac15901dce70;hpb=ef589dec9b04aa3d0a30a2b0787c50d07c320563;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Pretty.hs b/Pretty.hs index 7896372..d88846a 100644 --- a/Pretty.hs +++ b/Pretty.hs @@ -1,4 +1,4 @@ -module Pretty (prettyShow, pprString) where +module Pretty (prettyShow, pprString, pprStringDebug) where import qualified Data.Map as Map @@ -9,11 +9,11 @@ import qualified CoreSyn import qualified Module import qualified HscTypes import Text.PrettyPrint.HughesPJClass -import Outputable ( showSDoc, ppr, Outputable, OutputableBndr) +import Outputable ( showSDoc, showSDocDebug, ppr, Outputable, OutputableBndr) -import qualified ForSyDe.Backend.Ppr -import qualified ForSyDe.Backend.VHDL.Ppr -import qualified ForSyDe.Backend.VHDL.AST as AST +import qualified Language.VHDL.Ppr as Ppr +import qualified Language.VHDL.AST as AST +import qualified Language.VHDL.AST.Ppr import HsValueMap import FlattenTypes @@ -136,7 +136,10 @@ instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Expr b) where pPrint = text . show instance Pretty AST.VHDLId where - pPrint id = ForSyDe.Backend.Ppr.ppr id + pPrint id = Ppr.ppr id + +instance Pretty AST.VHDLName where + pPrint name = Ppr.ppr name prettyBind :: (Show b, Show e) => (b, e) -> Doc prettyBind (b, expr) = @@ -155,3 +158,6 @@ instance (Pretty k, Pretty v) => Pretty (Map.Map k v) where -- Convenience method for turning an Outputable into a string pprString :: (Outputable x) => x -> String pprString = showSDoc . ppr + +pprStringDebug :: (Outputable x) => x -> String +pprStringDebug = showSDocDebug . ppr