diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2013-01-30 14:29:20 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2013-01-30 14:29:20 +0000 |
| commit | dd86634af16956f555b228948acc578d678219b4 (patch) | |
| tree | 314422e13d45aa53f09092064e2f9e2a57697342 /compiler/hsSyn | |
| parent | 677144b858f4a425e77399bdfbfcd43dbabd1488 (diff) | |
| parent | 9c6dd15b206bddc860a537cc059284ba4b6aa80f (diff) | |
| download | haskell-dd86634af16956f555b228948acc578d678219b4.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts:
compiler/types/Coercion.lhs
Diffstat (limited to 'compiler/hsSyn')
| -rw-r--r-- | compiler/hsSyn/HsTypes.lhs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/hsSyn/HsTypes.lhs b/compiler/hsSyn/HsTypes.lhs index 93d91b19b1..74aa4773b6 100644 --- a/compiler/hsSyn/HsTypes.lhs +++ b/compiler/hsSyn/HsTypes.lhs @@ -652,9 +652,12 @@ ppr_mono_ty ctxt_prec (HsAppTy fun_ty arg_ty) = maybeParen ctxt_prec pREC_CON $ hsep [ppr_mono_lty pREC_FUN fun_ty, ppr_mono_lty pREC_CON arg_ty] -ppr_mono_ty ctxt_prec (HsOpTy ty1 (wrapper, op) ty2) +ppr_mono_ty ctxt_prec (HsOpTy ty1 (_wrapper, L _ op) ty2) = maybeParen ctxt_prec pREC_OP $ - ppr_mono_lty pREC_OP ty1 <+> ppr_mono_ty pREC_CON (HsWrapTy wrapper (HsTyVar (unLoc op))) <+> ppr_mono_lty pREC_OP ty2 + sep [ ppr_mono_lty pREC_OP ty1 + , sep [pprInfixOcc op, ppr_mono_lty pREC_OP ty2 ] ] + -- Don't print the wrapper (= kind applications) + -- c.f. HsWrapTy ppr_mono_ty _ (HsParTy ty) = parens (ppr_mono_lty pREC_TOP ty) |