Skip to content

Commit cc29240

Browse files
committed
Replace various ints with ast::crate_nums
1 parent 29b7660 commit cc29240

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

src/comp/metadata/creader.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type env =
4848
@rec(session::session sess,
4949
@hashmap[str, int] crate_cache,
5050
vec[str] library_search_paths,
51-
mutable int next_crate_num);
51+
mutable ast::crate_num next_crate_num);
5252

5353
fn visit_view_item(env e, &@ast::view_item i) {
5454
alt (i.node) {
@@ -210,7 +210,7 @@ fn get_metadata_section(str filename) -> option::t[vec[u8]] {
210210
ret option::none[vec[u8]];
211211
}
212212

213-
fn load_library_crate(&session::session sess, span span, int cnum,
213+
fn load_library_crate(&session::session sess, span span, ast::crate_num cnum,
214214
&ast::ident ident, &(@ast::meta_item)[] metas,
215215
&vec[str] library_search_paths) {
216216
alt (find_library_crate(sess, ident, metas, library_search_paths)) {

src/comp/metadata/cstore.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type crate_metadata = rec(str name, vec[u8] data);
1111
// Map from node_id's of local use statements to crate numbers
1212
type use_crate_map = map::hashmap[ast::node_id, ast::crate_num];
1313

14-
type cstore = @rec(map::hashmap[int, crate_metadata] metas,
14+
type cstore = @rec(map::hashmap[ast::crate_num, crate_metadata] metas,
1515
use_crate_map use_crate_map,
1616
mutable vec[str] used_crate_files,
1717
mutable vec[str] used_libraries,
@@ -27,15 +27,15 @@ fn mk_cstore() -> cstore {
2727
mutable used_link_args = []);
2828
}
2929

30-
fn get_crate_data(&cstore cstore, int cnum) -> crate_metadata {
30+
fn get_crate_data(&cstore cstore, ast::crate_num cnum) -> crate_metadata {
3131
ret cstore.metas.get(cnum);
3232
}
3333

34-
fn set_crate_data(&cstore cstore, int cnum, &crate_metadata data) {
34+
fn set_crate_data(&cstore cstore, ast::crate_num cnum, &crate_metadata data) {
3535
cstore.metas.insert(cnum, data);
3636
}
3737

38-
fn have_crate_data(&cstore cstore, int cnum) -> bool {
38+
fn have_crate_data(&cstore cstore, ast::crate_num cnum) -> bool {
3939
ret cstore.metas.contains_key(cnum);
4040
}
4141

@@ -72,7 +72,8 @@ fn get_used_link_args(&cstore cstore) -> vec[str] {
7272
ret cstore.used_link_args;
7373
}
7474

75-
fn add_use_stmt_cnum(&cstore cstore, ast::node_id use_id, int cnum) {
75+
fn add_use_stmt_cnum(&cstore cstore, ast::node_id use_id,
76+
ast::crate_num cnum) {
7677
cstore.use_crate_map.insert(use_id, cnum);
7778
}
7879

src/comp/metadata/decoder.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ fn variant_tag_id(&ebml::doc d) -> ast::def_id {
8282
ret parse_def_id(ebml::doc_data(tagdoc));
8383
}
8484

85-
fn item_type(&ebml::doc item, int this_cnum, ty::ctxt tcx) -> ty::t {
86-
fn parse_external_def_id(int this_cnum, str s) -> ast::def_id {
85+
fn item_type(&ebml::doc item, ast::crate_num this_cnum,
86+
ty::ctxt tcx) -> ty::t {
87+
fn parse_external_def_id(ast::crate_num this_cnum, str s) -> ast::def_id {
8788
// FIXME: This is completely wrong when linking against a crate
8889
// that, in turn, links against another crate. We need a mapping
8990
// from crate ID to crate "meta" attributes as part of the crate
@@ -107,7 +108,8 @@ fn item_ty_param_count(&ebml::doc item) -> uint {
107108
ret ty_param_count;
108109
}
109110

110-
fn tag_variant_ids(&ebml::doc item, int this_cnum) -> vec[ast::def_id] {
111+
fn tag_variant_ids(&ebml::doc item,
112+
ast::crate_num this_cnum) -> vec[ast::def_id] {
111113
let vec[ast::def_id] ids = [];
112114
auto v = tag_items_data_item_variant;
113115
for each (ebml::doc p in ebml::tagged_docs(item, v)) {
@@ -136,15 +138,16 @@ fn resolve_path(vec[ast::ident] path, vec[u8] data) -> vec[ast::def_id] {
136138
}
137139

138140
// Crate metadata queries
139-
fn lookup_defs(session::session sess, int cnum, vec[ast::ident] path) ->
140-
vec[ast::def] {
141+
fn lookup_defs(session::session sess, ast::crate_num cnum,
142+
vec[ast::ident] path) -> vec[ast::def] {
141143
auto data = cstore::get_crate_data(sess.get_cstore(), cnum).data;
142144
ret vec::map(bind lookup_def(cnum, data, _), resolve_path(path, data));
143145
}
144146

145147

146148
// FIXME doesn't yet handle re-exported externals
147-
fn lookup_def(int cnum, vec[u8] data, &ast::def_id did_) -> ast::def {
149+
fn lookup_def(ast::crate_num cnum, vec[u8] data,
150+
&ast::def_id did_) -> ast::def {
148151
auto item = lookup_item(did_._1, data);
149152
auto kind_ch = item_kind(item);
150153
auto did = tup(cnum, did_._1);

0 commit comments

Comments
 (0)