X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcArrows.lhs;h=2e5992683ebc2c523283619f38fa9ebcee9dfcf4;hb=b9235325e1dfc23cc489aa478aef852e76c4075f;hp=ee14eb85eddd215e259cfe9abc69d8d1c2336a3a;hpb=259d5ea8479dbbf0220335c740efebec1bc19a7f;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcArrows.lhs b/compiler/typecheck/TcArrows.lhs
index ee14eb8..2e59926 100644
--- a/compiler/typecheck/TcArrows.lhs
+++ b/compiler/typecheck/TcArrows.lhs
@@ -27,7 +27,6 @@ import Name
 import TysWiredIn
 import VarSet 
 import TysPrim
-import Type
 
 import SrcLoc
 import Outputable
@@ -215,11 +214,10 @@ tc_cmd env cmd@(HsLam (MatchGroup [L mtch_loc (match@(Match pats _maybe_rhs_sig
 
 tc_cmd env cmd@(HsDo do_or_lc stmts body _ty) (cmd_stk, res_ty)
   = do 	{ checkTc (null cmd_stk) (nonEmptyCmdStkErr cmd)
-	; (stmts', body') <- tcStmts do_or_lc tc_stmt stmts res_ty $
+	; (stmts', body') <- tcStmts do_or_lc (tcMDoStmt tc_rhs) stmts res_ty $
 			     tcGuardedCmd env body []
 	; return (HsDo do_or_lc stmts' body' res_ty) }
   where
-    tc_stmt = tcMDoStmt tc_rhs
     tc_rhs rhs = do { ty <- newFlexiTyVarTy liftedTypeKind
 		    ; rhs' <- tcCmd env rhs ([], ty)
 		    ; return (rhs', ty) }
@@ -295,14 +293,13 @@ tc_cmd env cmd@(HsArrForm expr fixity cmd_args) (cmd_stk, res_ty)
 
     unscramble :: TcType -> (TcType, [TcType])
     -- unscramble ((w,s1) .. sn)	=  (w, [s1..sn])
-    unscramble ty
+    unscramble ty = unscramble' ty []
+
+    unscramble' ty ss
        = case tcSplitTyConApp_maybe ty of
 	    Just (tc, [t,s]) | tc == pairTyCon 
-	       ->  let 
-		      (w,ss) = unscramble t  
-		   in (w, s:ss)
-				    
-	    _ -> (ty, [])
+	       ->  unscramble' t (s:ss)
+	    _ -> (ty, ss)
 
 -----------------------------------------------------------------
 --		Base case for illegal commands