From 58d200ac9cb51faa5c94e7919217f170b35b8441 Mon Sep 17 00:00:00 2001 From: Manuel M T Chakravarty Date: Wed, 20 Sep 2006 17:47:10 +0000 Subject: [PATCH] Better pretty printing for CoPat Mon Sep 18 16:45:13 EDT 2006 Manuel M T Chakravarty * Better pretty printing for CoPat Sun Aug 6 17:25:19 EDT 2006 Manuel M T Chakravarty * Better pretty printing for CoPat Wed Jul 26 08:22:22 EDT 2006 simonpj@microsoft.com --- compiler/hsSyn/HsBinds.lhs | 1 + compiler/hsSyn/HsPat.lhs | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/hsSyn/HsBinds.lhs b/compiler/hsSyn/HsBinds.lhs index 900b800..adf234d 100644 --- a/compiler/hsSyn/HsBinds.lhs +++ b/compiler/hsSyn/HsBinds.lhs @@ -323,6 +323,7 @@ data ExprCoFn instance Outputable ExprCoFn where ppr co_fn = pprCoFn (ptext SLIT("<>")) co_fn +pprCoFn :: SDoc -> ExprCoFn -> SDoc pprCoFn it CoHole = it pprCoFn it (CoCompose f1 f2) = pprCoFn (pprCoFn it f2) f1 pprCoFn it (ExprCoFn co) = it <+> ptext SLIT("`cast`") <+> pprParendType co diff --git a/compiler/hsSyn/HsPat.lhs b/compiler/hsSyn/HsPat.lhs index 5bb443b..ee21ee3 100644 --- a/compiler/hsSyn/HsPat.lhs +++ b/compiler/hsSyn/HsPat.lhs @@ -22,7 +22,8 @@ module HsPat ( import {-# SOURCE #-} HsExpr ( SyntaxExpr ) -- friends: -import HsBinds ( DictBinds, HsBind(..), ExprCoFn, isIdCoercion, emptyLHsBinds, pprLHsBinds ) +import HsBinds ( DictBinds, HsBind(..), ExprCoFn, isIdCoercion, pprCoFn, + emptyLHsBinds, pprLHsBinds ) import HsLit ( HsLit(HsCharPrim), HsOverLit ) import HsTypes ( LHsType, PostTcType ) import BasicTypes ( Boxity, tupleParens ) @@ -192,7 +193,7 @@ pprPat (NPat l Nothing _ _) = ppr l pprPat (NPat l (Just _) _ _) = char '-' <> ppr l pprPat (NPlusKPat n k _ _) = hcat [ppr n, char '+', ppr k] pprPat (TypePat ty) = ptext SLIT("{|") <> ppr ty <> ptext SLIT("|}") -pprPat (CoPat co pat _) = parens (ppr co) <+> ptext SLIT("`cast`") <+> ppr pat +pprPat (CoPat co pat _) = parens (pprCoFn (ppr pat) co) pprPat (SigPatIn pat ty) = ppr pat <+> dcolon <+> ppr ty pprPat (SigPatOut pat ty) = ppr pat <+> dcolon <+> ppr ty pprPat (DictPat ds ms) = parens (sep [ptext SLIT("{-dict-}"), -- 1.7.10.4