From: Manuel M T Chakravarty <chak@cse.unsw.edu.au>
Date: Wed, 20 Sep 2006 18:51:09 +0000 (+0000)
Subject: Adjust code from manual merges
X-Git-Tag: After_FC_branch_merge~6
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=27ca67931713c36f5ed248de88298416892e5649;ds=sidebyside

Adjust code from manual merges
Tue Sep 19 14:12:36 EDT 2006  Manuel M T Chakravarty <chak@cse.unsw.edu.au>
  * Adjust code from manual merges
---

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)