X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcExpr.lhs;h=6d441b2497e6639b5b8edb411135b4bbb9e5e4fc;hb=43c2b68138397eb08aa386e2818b6cc17e94fd1e;hp=c509c67736a341b5b1caccebb4e7124bba38591c;hpb=7ea374f542afae31e3758ae9e767a8950a1bb1e0;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcExpr.lhs b/ghc/compiler/typecheck/TcExpr.lhs index c509c67..6d441b2 100644 --- a/ghc/compiler/typecheck/TcExpr.lhs +++ b/ghc/compiler/typecheck/TcExpr.lhs @@ -49,7 +49,7 @@ import Kind ( openTypeKind, liftedTypeKind, argTypeKind ) import Id ( idType, recordSelectorFieldLabel, isRecordSelector ) import DataCon ( DataCon, dataConFieldLabels, dataConStrictMarks, - dataConWrapId, dataConWorkId ) + dataConWrapId ) import Name ( Name ) import TyCon ( TyCon, FieldLabel, tyConTyVars, tyConStupidTheta, tyConDataCons, tyConFields ) @@ -381,7 +381,7 @@ tcExpr expr@(RecordCon con@(L loc con_name) _ rbinds) res_ty -- Check for missing fields checkMissingFields data_con rbinds `thenM_` - returnM (RecordCon (L loc (dataConWorkId data_con)) con_expr rbinds') + returnM (RecordCon (L loc (dataConWrapId data_con)) con_expr rbinds') -- The main complication with RecordUpd is that we need to explicitly -- handle the *non-updated* fields. Consider: @@ -791,7 +791,6 @@ tcId orig id_name -- Look up the Id and instantiate its type -> do { checkProcLevel id proc_level ; tc_local_id id th_level } - -- THis ; other -> failWithTc (ppr other <+> ptext SLIT("used where a value identifer was expected")) } where