user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Typechecking bugfix for anon objs. Removes duplicate methods in outer

Browse source 
object types.
This commit is contained in:
Lindsey Kuper 2011-07-29 10:31:52 -07:00
parent a6151aa9a8
commit 9705f97ead
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/comp/middle/typeck.rs
View file

@ -2417,6 +2417,26 @@ fn check_expr(fcx: &@fn_ctxt, expr: &@ast::expr) {
~[anon_obj(ivec::map(ast::obj_field_from_anon_obj_field,
fields), inner_obj_sty)];
// Whenever an outer method overrides an inner, we need to remove
// that inner from the type. Filter inner_obj_methods to remove
// any methods that share a name with an outer method.
fn filtering_fn(m: &ty::method,
outer_obj_methods: (@ast::method)[]) ->
option::t[ty::method] {
for om: @ast::method in outer_obj_methods {
if str::eq(om.node.ident, m.ident) {
ret none;
}
}
ret some(m);
}
let f = bind filtering_fn(_, ao.methods);
inner_obj_methods =
std::ivec::filter_map[ty::method,
ty::method](f, inner_obj_methods);
methods += inner_obj_methods;
ret methods;
}