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

rustc: Encode crate hash into metadata

This commit is contained in:
Haitao Li 2011-12-11 23:23:38 +08:00 committed by Graydon Hoare
parent 2ba317ddb2
commit f3c206c9f4
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/comp/metadata/common.rs
View File

@ -64,6 +64,8 @@ const tag_crate_dep: uint = 0x26u;
const tag_items_data_item_inlineness: uint = 0x27u;
const tag_crate_hash: uint = 0x28u;
// djb's cdb hashes.
fn hash_node_id(&&node_id: int) -> uint { ret 177573u ^ (node_id as uint); }

14
src/comp/metadata/decoder.rs
View File

@ -19,6 +19,7 @@ export get_crate_attributes;
export list_crate_metadata;
export crate_dep;
export get_crate_deps;
export get_crate_hash;
export external_resolver;
// A function that takes a def_id relative to the crate being searched and
@ -347,8 +348,8 @@ fn list_meta_items(meta_items: ebml::doc, out: io::writer) {
}
}
fn list_crate_attributes(md: ebml::doc, out: io::writer) {
out.write_str("=Crate Attributes=\n");
fn list_crate_attributes(md: ebml::doc, hash: str, out: io::writer) {
out.write_str(#fmt("=Crate Attributes (%s)=\n", hash));
for attr: ast::attribute in get_attributes(md) {
out.write_str(#fmt["%s\n", pprust::attribute_to_str(attr)]);
@ -386,6 +387,12 @@ fn list_crate_deps(data: @[u8], out: io::writer) {
out.write_str("\n");
}
fn get_crate_hash(data: @[u8]) -> str {
let cratedoc = ebml::new_doc(data);
let hashdoc = ebml::get_doc(cratedoc, tag_crate_hash);
ret str::unsafe_from_bytes(ebml::doc_data(hashdoc));
}
fn list_crate_items(bytes: @[u8], md: ebml::doc, out: io::writer) {
out.write_str("=Items=\n");
let paths = ebml::get_doc(md, tag_paths);
@ -407,8 +414,9 @@ fn list_crate_items(bytes: @[u8], md: ebml::doc, out: io::writer) {
}
fn list_crate_metadata(bytes: @[u8], out: io::writer) {
let hash = get_crate_hash(bytes);
let md = ebml::new_doc(bytes);
list_crate_attributes(md, out);
list_crate_attributes(md, hash, out);
list_crate_deps(bytes, out);
list_crate_items(bytes, md, out);
}

8
src/comp/metadata/encoder.rs
View File

@ -576,6 +576,12 @@ fn encode_crate_deps(ebml_w: ebml::writer, cstore: cstore::cstore) {
ebml::end_tag(ebml_w);
}
fn encode_hash(ebml_w: ebml::writer, hash: str) {
ebml::start_tag(ebml_w, tag_crate_hash);
ebml_w.writer.write(str::bytes(hash));
ebml::end_tag(ebml_w);
}
fn encode_metadata(cx: @crate_ctxt, crate: @crate) -> str {
let abbrevs = map::mk_hashmap(ty::hash_ty, ty::eq_ty);
@ -585,6 +591,8 @@ fn encode_metadata(cx: @crate_ctxt, crate: @crate) -> str {
let buf_w = string_w.get_writer().get_buf_writer();
let ebml_w = ebml::create_writer(buf_w);
encode_hash(ebml_w, cx.link_meta.extras_hash);
let crate_attrs = synthesize_crate_attrs(ecx, crate);
encode_attributes(ebml_w, crate_attrs);