From 27ca67931713c36f5ed248de88298416892e5649 Mon Sep 17 00:00:00 2001 From: Manuel M T Chakravarty Date: Wed, 20 Sep 2006 18:51:09 +0000 Subject: [PATCH] Adjust code from manual merges Tue Sep 19 14:12:36 EDT 2006 Manuel M T Chakravarty * Adjust code from manual merges --- compiler/typecheck/TcExpr.lhs | 4 ++-- compiler/typecheck/TcMatches.lhs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/typecheck/TcExpr.lhs b/compiler/typecheck/TcExpr.lhs index d609981..d68e8b0 100644 --- a/compiler/typecheck/TcExpr.lhs +++ b/compiler/typecheck/TcExpr.lhs @@ -772,8 +772,8 @@ instFun orig fun subst [] = return fun -- Common short cut instFun orig fun subst tv_theta_prs - = do {-- !!!SPJ: -- Horrid check for tagToEnum; see Note [tagToEnum#] - -- !!!SPJ: checkBadTagToEnumCall fun_id qtv_tys + = do { -- !!!SPJ: -- Horrid check for tagToEnum; see Note [tagToEnum#] + -- !!!SPJ: checkBadTagToEnumCall fun_id qtv_tys ; let ty_theta_prs' = map subst_pr tv_theta_prs diff --git a/compiler/typecheck/TcMatches.lhs b/compiler/typecheck/TcMatches.lhs index 61faca8..7f5dfad 100644 --- a/compiler/typecheck/TcMatches.lhs +++ b/compiler/typecheck/TcMatches.lhs @@ -172,10 +172,10 @@ tcMatch ctxt pat_tys rhs_ty match = tcGRHSs ctxt grhss rhs_ty -- No result signature -- Result type sigs are no longer supported - tc_grhss ctxt (Just res_sig) grhss (co,rhs_ty) + tc_grhss ctxt (Just res_sig) grhss (co, rhs_ty) = do { addErr (ptext SLIT("Ignoring (deprecated) result type signature") <+> ppr res_sig) - tcGRHSs ctxt grhss (co, inner_ty) } + ; tcGRHSs ctxt grhss (co, rhs_ty) } ------------- tcGRHSs :: TcMatchCtxt -> GRHSs Name -> (Refinement, BoxyRhoType) -- 1.7.10.4