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

Treat export-globs as import-globs for sake of linking.

This commit is contained in:
Graydon Hoare 2012-02-21 15:36:15 -08:00
parent 893bbea576
commit 1f4a6bb3ad
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/comp/middle/resolve.rs
View File

@ -225,6 +225,12 @@ fn iter_export_paths(vi: ast::view_item, f: fn(vp: @ast::view_path)) {
}
}
fn iter_all_view_paths(vi: ast::view_item,
f: fn(vp: @ast::view_path)) {
iter_import_paths(vi, f);
iter_export_paths(vi, f);
}
// Locate all modules and imports and index them, so that the next passes can
// resolve through them.
fn map_crate(e: @env, c: @ast::crate) {
@ -284,9 +290,12 @@ fn map_crate(e: @env, c: @ast::crate) {
}
}
// Note: a glob export works as an implict import, along with a
// re-export of anything that was exported at the glob-target location.
// So we wind up reusing the glob-import machinery when looking at
// glob exports. They just do re-exporting in a later step.
fn link_glob(e: @env, vi: @ast::view_item, sc: scopes, _v: vt<scopes>) {
iter_import_paths(*vi) { |vp|
//if it really is a glob import, that is
iter_all_view_paths(*vi) { |vp|
alt vp.node {
ast::view_path_glob(path, _) {
alt follow_import(*e, sc, *path, vp.span) {
@ -335,7 +344,7 @@ fn map_crate(e: @env, c: @ast::crate) {
glob_imported_names: new_str_hash(),
path: ""});
// Next, assemble the links for globbed imports.
// Next, assemble the links for globbed imports and exports.
let v_link_glob =
@{visit_view_item: bind link_glob(e, _, _, _),
visit_block: visit_block_with_scope,