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

Refactor load_library_crate and resolve_crate

Browse source
This commit is contained in:
Brian Anderson 2011-07-08 12:40:16 -07:00
parent dd8ab24da2
commit 412e203b3c
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/comp/metadata/creader.rs
View file

@ -220,32 +220,41 @@ fn get_metadata_section(str filename) -> option::t[vec[u8]] {
ret option::none[vec[u8]];
}
fn load_library_crate(&session::session sess, span span, ast::crate_num cnum,
fn load_library_crate(&session::session sess, span span,
&ast::ident ident, &(@ast::meta_item)[] metas,
&vec[str] library_search_paths) {
&vec[str] library_search_paths)
-> tup(str, vec[u8]) {
alt (find_library_crate(sess, ident, metas, library_search_paths)) {
case (some(?t)) {
auto cstore = sess.get_cstore();
auto cmeta = rec(name=ident,
data=t._1,
cnum_map = new_int_hash[ast::crate_num]());
cstore::set_crate_data(cstore, cnum, cmeta);
cstore::add_used_crate_file(cstore, t._0);
ret;
ret t;
}
case (none) {
sess.span_fatal(span, #fmt("can't find crate for '%s'", ident));
}
case (_) { }
}
sess.span_fatal(span, #fmt("can't find crate for '%s'", ident));
}
fn resolve_crate(env e, ast::ident ident, (@ast::meta_item)[] metas,
span span) -> ast::crate_num {
if (!e.crate_cache.contains_key(ident)) {
auto cinfo = load_library_crate(e.sess, span, ident, metas,
e.library_search_paths);
auto cfilename = cinfo._0;
auto cdata = cinfo._1;
auto cmeta = rec(name=ident,
data=cdata,
cnum_map = new_int_hash[ast::crate_num]());
auto cnum = e.next_crate_num;
load_library_crate(e.sess, span, cnum, ident,
metas, e.library_search_paths);
e.crate_cache.insert(ident, e.next_crate_num);
e.crate_cache.insert(ident, cnum);
e.next_crate_num += 1;
auto cstore = e.sess.get_cstore();
cstore::set_crate_data(cstore, cnum, cmeta);
cstore::add_used_crate_file(cstore, cfilename);
ret cnum;
} else {
ret e.crate_cache.get(ident);