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

Merge remote branch 'espindola/import'

Browse source
This commit is contained in:
Graydon Hoare 2011-01-04 15:07:38 -08:00
commit 2ec0b724c4
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/comp/middle/resolve.rs
View file

@ -73,7 +73,7 @@ fn lookup_name(&env e, ast.ident i) -> option.t[def] {
ret some[def](ast.def_use(id));
}
case (ast.view_item_import(_,?id)) {
fail;
ret some[def](ast.def_import(id));
}
}
}
@ -82,7 +82,7 @@ fn lookup_name(&env e, ast.ident i) -> option.t[def] {
alt (m.index.find(i)) {
case (some[ast.mod_index_entry](?ent)) {
alt (ent) {
case (ast.mie_use(?ix)) {
case (ast.mie_view_item(?ix)) {
ret found_def_view(m.view_items.(ix));
}
case (ast.mie_item(?ix)) {