X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcMatches.lhs;h=6d917d1f87406732a3c5973f2e9c823a6d8d2e2a;hb=e9f9ec1e57d53b9302a395ce0d02c0fa59e28341;hp=37b8cbe3b01589ffe6937e3b5077885d65fe6e4c;hpb=f04dead93a15af1cb818172f207b8a81d2c81298;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcMatches.lhs b/compiler/typecheck/TcMatches.lhs index 37b8cbe..6d917d1 100644 --- a/compiler/typecheck/TcMatches.lhs +++ b/compiler/typecheck/TcMatches.lhs @@ -25,7 +25,6 @@ import TcType import TcBinds import TcUnify import TcSimplify -import MkCore import Name import TysWiredIn import PrelNames @@ -244,8 +243,7 @@ tcDoStmts PArrComp stmts body res_ty (HsDo PArrComp stmts' body' (mkPArrTy elt_ty)) } tcDoStmts DoExpr stmts body res_ty - = do { (stmts', body') <- tcStmts DoExpr tcDoStmt stmts - res_ty $ + = do { (stmts', body') <- tcStmts DoExpr tcDoStmt stmts res_ty $ tcBody body ; return (HsDo DoExpr stmts' body' res_ty) } @@ -524,7 +522,7 @@ tcDoStmt ctxt (RecStmt { recS_stmts = stmts, recS_later_ids = later_names = do { let tup_names = rec_names ++ filterOut (`elem` rec_names) later_names ; tup_elt_tys <- newFlexiTyVarTys (length tup_names) liftedTypeKind ; let tup_ids = zipWith mkLocalId tup_names tup_elt_tys - tup_ty = mkCoreTupTy tup_elt_tys + tup_ty = mkBoxedTupleTy tup_elt_tys ; tcExtendIdEnv tup_ids $ do { ((stmts', (ret_op', tup_rets)), stmts_ty)