OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc: Sort object methods when parsing textual types in the AST

This commit is contained in:
Patrick Walton 2011-03-17 11:40:05 -07:00
parent bc51842d4f
commit 55587a554c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/comp/middle/ty.rs
View File

@ -793,6 +793,14 @@ fn method_idx(session.session sess, &span sp,
fail;
}
fn sort_methods(vec[method] meths) -> vec[method] {
fn method_lteq(&method a, &method b) -> bool {
ret _str.lteq(a.ident, b.ident);
}
ret std.sort.merge_sort[method](bind method_lteq(_,_), meths);
}
fn is_lval(@ast.expr expr) -> bool {
alt (expr.node) {
case (ast.expr_field(_,_,_)) { ret true; }

12
src/comp/middle/typeck.rs
View File

@ -376,7 +376,8 @@ fn ast_ty_to_ty(ty_getter getter, &@ast.ty ast_ty) -> @ty.t {
inputs=ins,
output=out));
}
sty = ty.ty_obj(tmeths);
sty = ty.ty_obj(ty.sort_methods(tmeths));
}
}
@ -545,14 +546,7 @@ fn collect_item_types(session.session sess, @ast.crate crate)
auto methods =
_vec.map[@ast.method,method](f, obj_info.methods);
fn method_lteq(&method a, &method b) -> bool {
ret _str.lteq(a.ident, b.ident);
}
methods = std.sort.merge_sort[method](bind method_lteq(_,_),
methods);
auto t_obj = plain_ty(ty.ty_obj(methods));
auto t_obj = plain_ty(ty.ty_obj(ty.sort_methods(methods)));
ret t_obj;
}