summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>2006-09-20 16:59:58 +0000
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>2006-09-20 16:59:58 +0000
commit5d541fe7c43a1dc4c1b2dd9ee49e64238b0754ca (patch)
tree421b0be8521751c30c731279dd2f2ff481a10ef8
parent44ba24dc84d271ca9bd5ab5060cb63ed87f585e3 (diff)
downloadhaskell-5d541fe7c43a1dc4c1b2dd9ee49e64238b0754ca.tar.gz
bugs
Mon Sep 18 14:34:44 EDT 2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> * bugs Sat Aug 5 21:36:50 EDT 2006 Manuel M T Chakravarty <chak@cse.unsw.edu.au> * bugs Thu Jul 13 04:20:58 EDT 2006 kevind@bu.edu
-rw-r--r--compiler/basicTypes/MkId.lhs2
-rw-r--r--compiler/typecheck/TcRnMonad.lhs2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/basicTypes/MkId.lhs b/compiler/basicTypes/MkId.lhs
index d36c94e1c6..bc45f523a0 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 af75fe6e49..5ada68a90b 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