From: Manuel M T Chakravarty Date: Wed, 20 Sep 2006 16:59:58 +0000 (+0000) Subject: bugs X-Git-Tag: After_FC_branch_merge~86 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5d541fe7c43a1dc4c1b2dd9ee49e64238b0754ca;hp=44ba24dc84d271ca9bd5ab5060cb63ed87f585e3;p=ghc-hetmet.git bugs Mon Sep 18 14:34:44 EDT 2006 Manuel M T Chakravarty * bugs Sat Aug 5 21:36:50 EDT 2006 Manuel M T Chakravarty * bugs Thu Jul 13 04:20:58 EDT 2006 kevind@bu.edu --- diff --git a/compiler/basicTypes/MkId.lhs b/compiler/basicTypes/MkId.lhs index d36c94e..bc45f52 100644 --- a/compiler/basicTypes/MkId.lhs +++ b/compiler/basicTypes/MkId.lhs @@ -530,7 +530,7 @@ mkRecordSelId tycon field_label -- NB: A newtype always has a vanilla DataCon; no existentials etc -- res_tys will simply be the dataConUnivTyVars sel_body | isNewTyCon tycon = unwrapNewTypeBody tycon res_tys (Var data_id) - | otherwise = Case (Var data_id) data_id field_tau (default_alt ++ the_alts) + | otherwise = Case (Var data_id) data_id field_ty (default_alt ++ the_alts) mk_result poly_result = mkVarApps (mkVarApps poly_result field_tyvars) field_dict_ids -- We pull the field lambdas to the top, so we need to diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs index af75fe6..5ada68a 100644 --- a/compiler/typecheck/TcRnMonad.lhs +++ b/compiler/typecheck/TcRnMonad.lhs @@ -187,7 +187,7 @@ addBreakpointBindings thing_inside = mkGlobalId VanillaGlobal breakpointCondJumpName (basicType (FunTy boolTy)) vanillaIdInfo } - ; extendIdEnv [breakpoingJumpId, breakpointCondJumpId] thing_inside} + ; extendIdEnv [breakpointJumpId, breakpointCondJumpId] thing_inside} #else = thing_inside #endif