mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix encoding of class ctors

Browse Source 
Class tests still fail at runtime
This commit is contained in:
Tim Chevalier 2012-03-16 19:19:37 -07:00
parent d958123d8a
commit 16dd6c4756
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rustc/metadata/csearch.rs
View File

@ -51,6 +51,8 @@ fn lookup_method_purity(cstore: cstore::cstore, did: ast::def_id)
}
}
/* Returns a vector of possible def IDs for a given path,
in a given crate */
fn resolve_path(cstore: cstore::cstore, cnum: ast::crate_num,
path: [ast::ident]) ->
[(ast::crate_num, @[u8], ast::def_id)] {

4
src/rustc/metadata/decoder.rs
View File

@ -177,8 +177,8 @@ fn enum_variant_ids(item: ebml::doc, cdata: cmd) -> [ast::def_id] {
ret ids;
}
// Given a path and serialized crate metadata, returns the ID of the
// definition the path refers to.
// Given a path and serialized crate metadata, returns the IDs of the
// definitions the path may refer to.
fn resolve_path(path: [ast::ident], data: @[u8]) -> [ast::def_id] {
fn eq_item(data: [u8], s: str) -> bool {
ret str::eq(str::from_bytes(data), s);

38
src/rustc/metadata/encoder.rs
View File

@ -152,9 +152,8 @@ fn encode_module_item_paths(ebml_w: ebml::writer, ecx: @encode_ctxt,
encode_def_id(ebml_w, local_def(it.id));
ebml_w.end_tag();
ebml_w.start_tag(tag_paths);
/* a bit confused -- adding the same ident twice
(once for class, once for ctor) */
add_to_index(ebml_w, path, index, it.ident);
#debug("ctor id: %d", ctor.node.id);
encode_named_def_id(ebml_w, it.ident, local_def(ctor.node.id));
encode_class_item_paths(ebml_w, items, path + [it.ident],
index);
@ -364,7 +363,7 @@ fn encode_info_for_class(ecx: @encode_ctxt, ebml_w: ebml::writer,
ebml_w.start_tag(tag_items_class_member); // ???
alt ci.node.decl {
instance_var(nm, _, _, id) {
#debug("encode_info_for_class: doing %s", nm);
#debug("encode_info_for_class: doing %s %d", nm, id);
encode_family(ebml_w, 'g');
encode_name(ebml_w, nm);
encode_type(ecx, ebml_w, node_id_to_type(tcx, id));
@ -500,13 +499,13 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
encode_enum_variant_info(ecx, ebml_w, item.id, variants,
path, index, tps);
}
item_class(tps,items,_) {
item_class(tps,items,ctor) {
/* We're not forgetting about the ctor here! It gets
encoded elsewhere */
ebml_w.start_tag(tag_items_data_item);
encode_info_for_class(ecx, ebml_w, item.id, path, item.ident,
encoded elsewhere */
ebml_w.start_tag(tag_items_data_item);
encode_info_for_class(ecx, ebml_w, item.id, path, item.ident,
tps, items);
ebml_w.end_tag();
ebml_w.end_tag();
}
item_res(_, tps, _, _, ctor_id) {
let fn_ty = node_id_to_type(tcx, ctor_id);
@ -639,23 +638,22 @@ fn encode_info_for_items(ecx: @encode_ctxt, ebml_w: ebml::writer,
alt check ecx.ccx.tcx.items.get(i.id) {
ast_map::node_item(_, pt) {
encode_info_for_item(ecx, ebml_w, i, index, *pt);
}
/* TODO: encode info for class items! */
/* encode ctor, then encode items */
ast_map::node_ctor(i, path) {
alt i.node {
item_class(tps, _, ctor) {
#debug("class, encoding a fn: %d", ctor.node.id);
/* TODO: encode info for class items! */
/* encode ctor, then encode items */
alt i.node {
item_class(tps,_,ctor) {
/* this is assuming that ctors aren't inlined...
probably shouldn't assume that */
#debug("encoding info for ctor %s %d", i.ident,
ctor.node.id);
*index += [{val: ctor.node.id, pos: ebml_w.writer.tell()}];
encode_info_for_fn(ecx, ebml_w, ctor.node.id, i.ident,
*path, none, tps, ctor.node.dec)
}
_ { /* TODO: should handle item_res, probably */ }
*pt, none, tps, ctor.node.dec)
}
_ {}
}
}
}
}
},
visit_native_item: {|ni, cx, v|
visit::visit_native_item(ni, cx, v);