diff options
| author | Patrick Walton <[email protected]> | 2011-03-15 17:33:05 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2011-03-15 17:33:05 -0700 |
| commit | 71b6e602c54f78dc2f8f33de2d74b40879316165 (patch) | |
| tree | 87d92ce397c471e3046868b38a40ed67a69ca9f3 /src/comp/middle | |
| parent | Revert "Change the numbering of upcall functions. upcall_0 now calls a functi... (diff) | |
| download | rust-71b6e602c54f78dc2f8f33de2d74b40879316165.tar.xz rust-71b6e602c54f78dc2f8f33de2d74b40879316165.zip | |
rustc: Add an annotation for the crate definition to view_item_use
Diffstat (limited to 'src/comp/middle')
| -rw-r--r-- | src/comp/middle/fold.rs | 12 | ||||
| -rw-r--r-- | src/comp/middle/resolve.rs | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs index 1fc91693..73b2cab3 100644 --- a/src/comp/middle/fold.rs +++ b/src/comp/middle/fold.rs @@ -263,7 +263,7 @@ type ast_fold[ENV] = // View Item folds. (fn(&ENV e, &span sp, ident ident, vec[@meta_item] meta_items, - def_id id) -> @view_item) fold_view_item_use, + def_id id, ann a) -> @view_item) fold_view_item_use, (fn(&ENV e, &span sp, ident i, vec[ident] idents, def_id id, option.t[def]) -> @view_item) fold_view_item_import, @@ -882,9 +882,9 @@ fn fold_view_item[ENV](&ENV env, ast_fold[ENV] fld, @view_item vi) } alt (vi.node) { - case (ast.view_item_use(?ident, ?meta_items, ?def_id)) { + case (ast.view_item_use(?ident, ?meta_items, ?def_id, ?ann)) { ret fld.fold_view_item_use(env_, vi.span, ident, meta_items, - def_id); + def_id, ann); } case (ast.view_item_import(?def_ident, ?idents, ?def_id, ?target_def)) { @@ -1397,8 +1397,8 @@ fn identity_fold_item_obj[ENV](&ENV e, &span sp, ident i, fn identity_fold_view_item_use[ENV](&ENV e, &span sp, ident i, vec[@meta_item] meta_items, - def_id id) -> @view_item { - ret @respan(sp, ast.view_item_use(i, meta_items, id)); + def_id id, ann a) -> @view_item { + ret @respan(sp, ast.view_item_use(i, meta_items, id, a)); } fn identity_fold_view_item_import[ENV](&ENV e, &span sp, ident i, @@ -1595,7 +1595,7 @@ fn new_identity_fold[ENV]() -> ast_fold[ENV] { fold_item_obj = bind identity_fold_item_obj[ENV](_,_,_,_,_,_,_), fold_view_item_use = - bind identity_fold_view_item_use[ENV](_,_,_,_,_), + bind identity_fold_view_item_use[ENV](_,_,_,_,_,_), fold_view_item_import = bind identity_fold_view_item_import[ENV](_,_,_,_,_,_), fold_view_item_export = diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index 1079489e..62021ee9 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -45,7 +45,7 @@ fn unwrap_def(def_wrap d) -> def { alt (d) { case (def_wrap_use(?it)) { alt (it.node) { - case (ast.view_item_use(_, _, ?id)) { + case (ast.view_item_use(_, _, ?id, _)) { ret ast.def_use(id); } } @@ -265,7 +265,7 @@ fn lookup_name_wrapped(&env e, ast.ident i) -> option.t[tup(@env, def_wrap)] { fn found_def_view(@ast.view_item i) -> def_wrap { alt (i.node) { - case (ast.view_item_use(_, _, ?id)) { + case (ast.view_item_use(_, _, ?id, _)) { ret def_wrap_use(i); } case (ast.view_item_import(_, ?idents,?d, _)) { |