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

Refactoring and cleaning up.

Browse source
This commit is contained in:
Lindsey Kuper 2011-07-20 12:14:13 -07:00
parent 94c91382cd
commit 00f54b4a42
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1207,27 +1207,22 @@ fn gather_locals(&@crate_ctxt ccx, &ast::_fn f,
auto nvi = @mutable 0;
// Add object fields, if any.
auto obj_fields = ~[];
alt (get_obj_info(ccx)) {
case (some(?oinfo)) {
some(?oinfo) {
alt (oinfo) {
case (regular_obj(?obj_fields, _)) {
for (ast::obj_field f in obj_fields) {
auto field_ty = ty::node_id_to_type(ccx.tcx, f.id);
assign(ccx.tcx, vb, locals, local_names, nvi, f.id,
f.ident, some(field_ty));
}
}
case (anon_obj(?obj_fields, _)) {
for (ast::obj_field f in obj_fields) {
auto field_ty = ty::node_id_to_type(ccx.tcx, f.id);
assign(ccx.tcx, vb, locals, local_names, nvi, f.id,
f.ident, some(field_ty));
}
}
regular_obj(?ofs, _) { obj_fields = ofs; }
anon_obj(?ofs, _) { obj_fields = ofs; }
}
}
case (none) {/* no fields */ }
none { /* no fields */ }
}
for (ast::obj_field f in obj_fields) {
auto field_ty = ty::node_id_to_type(ccx.tcx, f.id);
assign(ccx.tcx, vb, locals, local_names, nvi, f.id, f.ident,
some(field_ty));
}
// Add formal parameters.
auto args = ty::ty_fn_args(ccx.tcx, ty::node_id_to_type(ccx.tcx, id));
auto i = 0u;