bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

convert ast::struct_dtor_ into a struct

Browse source
This commit is contained in:
Erick Tryzelaar 2013-01-13 12:29:36 -08:00
parent 5c0d674a45
commit ebea895d02
5 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/librustc/middle/astencode.rs
View file

@ -288,10 +288,12 @@ fn simplify_ast(ii: ast::inlined_item) -> ast::inlined_item {
} }
ast::ii_dtor(ref dtor, nm, ref tps, parent_id) => { ast::ii_dtor(ref dtor, nm, ref tps, parent_id) => {
let dtor_body = fld.fold_block((*dtor).node.body); let dtor_body = fld.fold_block((*dtor).node.body);
ast::ii_dtor(ast::spanned { node: { body: dtor_body, ast::ii_dtor(
.. /*bad*/copy (*dtor).node }, ast::spanned {
.. (/*bad*/copy *dtor) }, node: ast::struct_dtor_ { body: dtor_body,
nm, /*bad*/copy *tps, parent_id) .. /*bad*/copy (*dtor).node },
.. (/*bad*/copy *dtor) },
nm, /*bad*/copy *tps, parent_id)
} }
} }
} }
@ -327,12 +329,15 @@ fn renumber_ast(xcx: extended_decode_ctxt, ii: ast::inlined_item)
let dtor_id = fld.new_id((*dtor).node.id); let dtor_id = fld.new_id((*dtor).node.id);
let new_parent = xcx.tr_def_id(parent_id); let new_parent = xcx.tr_def_id(parent_id);
let new_self = fld.new_id((*dtor).node.self_id); let new_self = fld.new_id((*dtor).node.self_id);
ast::ii_dtor(ast::spanned { node: { id: dtor_id, ast::ii_dtor(
attrs: dtor_attrs, ast::spanned {
self_id: new_self, node: ast::struct_dtor_ { id: dtor_id,
body: dtor_body }, attrs: dtor_attrs,
.. (/*bad*/copy *dtor)}, self_id: new_self,
nm, new_params, new_parent) body: dtor_body },
.. (/*bad*/copy *dtor)
},
nm, new_params, new_parent)
} }
} }
} }

10
src/libsyntax/ast.rs
View file

@ -1567,10 +1567,12 @@ type struct_dtor = spanned<struct_dtor_>;
#[auto_encode] #[auto_encode]
#[auto_decode] #[auto_decode]
type struct_dtor_ = {id: node_id, struct struct_dtor_ {
attrs: ~[attribute], id: node_id,
self_id: node_id, attrs: ~[attribute],
body: blk}; self_id: node_id,
body: blk,
}
#[auto_encode] #[auto_encode]
#[auto_decode] #[auto_decode]

8
src/libsyntax/ast_map.rs
View file

@ -185,8 +185,12 @@ fn map_fn(fk: visit::fn_kind, decl: fn_decl, body: blk,
match fk { match fk {
visit::fk_dtor(tps, ref attrs, self_id, parent_id) => { visit::fk_dtor(tps, ref attrs, self_id, parent_id) => {
let dt = @spanned { let dt = @spanned {
node: {id: id, attrs: (*attrs), self_id: self_id, node: ast::struct_dtor_ {
body: /* FIXME (#2543) */ copy body}, id: id,
attrs: (*attrs),
self_id: self_id,
body: /* FIXME (#2543) */ copy body,
},
span: sp, span: sp,
}; };
cx.map.insert(id, node_dtor(/* FIXME (#2543) */ copy tps, dt, cx.map.insert(id, node_dtor(/* FIXME (#2543) */ copy tps, dt,

10
src/libsyntax/fold.rs
View file

@ -276,8 +276,9 @@ fn fold_struct_def(struct_def: @ast::struct_def, fld: ast_fold)
let dtor = do option::map(&struct_def.dtor) |dtor| { let dtor = do option::map(&struct_def.dtor) |dtor| {
let dtor_body = fld.fold_block(dtor.node.body); let dtor_body = fld.fold_block(dtor.node.body);
let dtor_id = fld.new_id(dtor.node.id); let dtor_id = fld.new_id(dtor.node.id);
spanned { node: { body: dtor_body, spanned { node: ast::struct_dtor_ { body: dtor_body,
id: dtor_id, .. dtor.node}, id: dtor_id,
.. dtor.node},
span: dtor.span } span: dtor.span }
}; };
return @{ return @{
@ -576,8 +577,9 @@ fn noop_fold_variant(v: variant_, fld: ast_fold) -> variant_ {
let dtor = do option::map(&struct_def.dtor) |dtor| { let dtor = do option::map(&struct_def.dtor) |dtor| {
let dtor_body = fld.fold_block(dtor.node.body); let dtor_body = fld.fold_block(dtor.node.body);
let dtor_id = fld.new_id(dtor.node.id); let dtor_id = fld.new_id(dtor.node.id);
spanned { node: { body: dtor_body, spanned { node: ast::struct_dtor_ { body: dtor_body,
id: dtor_id, .. dtor.node}, id: dtor_id,
.. dtor.node},
.. *dtor } .. *dtor }
}; };
kind = struct_variant_kind(@{ kind = struct_variant_kind(@{

20
src/libsyntax/parse/parser.rs
View file

@ -2836,16 +2836,16 @@ impl Parser {
let actual_dtor = do the_dtor.map |dtor| { let actual_dtor = do the_dtor.map |dtor| {
let (d_body, d_attrs, d_s) = *dtor; let (d_body, d_attrs, d_s) = *dtor;
spanned { node: { id: self.get_id(), spanned { node: ast::struct_dtor_ { id: self.get_id(),
attrs: d_attrs, attrs: d_attrs,
self_id: self.get_id(), self_id: self.get_id(),
body: d_body}, body: d_body},
span: d_s}}; span: d_s}};
let _ = self.get_id(); // XXX: Workaround for crazy bug. let _ = self.get_id(); // XXX: Workaround for crazy bug.
let new_id = self.get_id(); let new_id = self.get_id();
(class_name, (class_name,
item_struct(@{ item_struct(@{
fields: move fields, fields: fields,
dtor: actual_dtor, dtor: actual_dtor,
ctor_id: if is_tuple_like { Some(new_id) } else { None } ctor_id: if is_tuple_like { Some(new_id) } else { None }
}, ty_params), }, ty_params),
@ -3333,15 +3333,15 @@ impl Parser {
self.bump(); self.bump();
let mut actual_dtor = do the_dtor.map |dtor| { let mut actual_dtor = do the_dtor.map |dtor| {
let (d_body, d_attrs, d_s) = *dtor; let (d_body, d_attrs, d_s) = *dtor;
spanned { node: { id: self.get_id(), spanned { node: ast::struct_dtor_ { id: self.get_id(),
attrs: d_attrs, attrs: d_attrs,
self_id: self.get_id(), self_id: self.get_id(),
body: d_body }, body: d_body },
span: d_s } span: d_s }
}; };
return @{ return @{
fields: move fields, fields: fields,
dtor: actual_dtor, dtor: actual_dtor,
ctor_id: None ctor_id: None
}; };