X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnSource.lhs;fp=compiler%2Frename%2FRnSource.lhs;h=f2683e8058cbdf20af3184c79269fe1792f284e2;hp=c01afec63ace7ff411743fbb5128765f45259f98;hb=f1cc3eb980a634e62f2739a7a25387c902fa9d8a;hpb=0a5613f40b0e32cf59966e6b56b807cdbe80aa7b diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs index c01afec..f2683e8 100644 --- a/compiler/rename/RnSource.lhs +++ b/compiler/rename/RnSource.lhs @@ -125,7 +125,7 @@ rnSrcDecls group@(HsGroup {hs_valds = val_decls, -- It uses the fixity env from (A) to bind fixities for view patterns. new_lhs <- rnTopBindsLHS local_fix_env val_decls ; -- bind the LHSes (and their fixities) in the global rdr environment - let { val_binders = map unLoc $ collectHsValBinders new_lhs ; + let { val_binders = collectHsValBinders new_lhs ; val_bndr_set = mkNameSet val_binders ; all_bndr_set = val_bndr_set `unionNameSets` availsToNameSet tc_avails ; val_avails = map Avail val_binders @@ -440,7 +440,7 @@ rnSrcInstDecl (InstDecl inst_ty mbinds uprags ats) -- The typechecker (not the renamer) checks that all -- the bindings are for the right class let - meth_names = collectHsBindLocatedBinders mbinds + meth_names = collectMethodBinders mbinds (inst_tyvars, _, cls,_) = splitHsInstDeclTy (unLoc inst_ty') in checkDupRdrNames meth_names `thenM_` @@ -478,7 +478,7 @@ rnSrcInstDecl (InstDecl inst_ty mbinds uprags ats) -- -- But the (unqualified) method names are in scope let - binders = collectHsBindBinders mbinds' + binders = collectHsBindsBinders mbinds' bndr_set = mkNameSet binders in bindLocalNames binders