squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

syntax: remove parsing destructors

Browse source
This commit is contained in:
Erick Tryzelaar 2013-04-30 21:00:30 -07:00
parent 5d79f94a2f
commit 7d6d0029ba
1 changed files with 14 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,11 +102,6 @@ enum restriction {
RESTRICT_NO_BAR_OR_DOUBLEBAR_OP,
}
// So that we can distinguish a class dtor from other class members
enum class_contents { dtor_decl(blk, ~[attribute], codemap::span),
members(~[@struct_field]) }
type arg_or_capture_item = Either<arg, ()>;
type item_info = (ident, item_, Option<~[attribute]>);
@ -3299,7 +3294,6 @@ pub impl Parser {
}
let mut fields: ~[@struct_field];
let mut the_dtor: Option<(blk, ~[attribute], codemap::span)> = None;
let is_tuple_like;
if self.eat(&token::LBRACE) {
@ -3307,26 +3301,8 @@ pub impl Parser {
is_tuple_like = false;
fields = ~[];
while *self.token != token::RBRACE {
match self.parse_struct_decl_field() {
dtor_decl(ref blk, ref attrs, s) => {
match the_dtor {
Some((_, _, s_first)) => {
self.span_note(s, fmt!("Duplicate destructor \
declaration for class %s",
*self.interner.get(class_name)));
self.span_fatal(copy s_first, ~"First destructor \
declared here");
}
None => {
the_dtor = Some((copy *blk, copy *attrs, s));
}
}
}
members(mms) => {
for mms.each |struct_field| {
fields.push(*struct_field)
}
}
for self.parse_struct_decl_field().each |struct_field| {
fields.push(*struct_field)
}
}
if fields.len() == 0 {
@ -3365,19 +3341,12 @@ pub impl Parser {
);
}
let actual_dtor = do the_dtor.map |dtor| {
let (d_body, d_attrs, d_s) = copy *dtor;
codemap::spanned { node: ast::struct_dtor_ { id: self.get_id(),
attrs: d_attrs,
self_id: self.get_id(),
body: d_body},
span: d_s}};
let _ = self.get_id(); // XXX: Workaround for crazy bug.
let new_id = self.get_id();
(class_name,
item_struct(@ast::struct_def {
fields: fields,
dtor: actual_dtor,
dtor: None,
ctor_id: if is_tuple_like { Some(new_id) } else { None }
}, generics),
None)
@ -3420,34 +3389,28 @@ pub impl Parser {
}
// parse an element of a struct definition
fn parse_struct_decl_field(&self) -> class_contents {
fn parse_struct_decl_field(&self) -> ~[@struct_field] {
if self.try_parse_obsolete_priv_section() {
return members(~[]);
return ~[];
}
let attrs = self.parse_outer_attributes();
// Need this to parse comments on fields.
let _attrs = self.parse_outer_attributes();
if self.eat_keyword(&~"priv") {
return members(~[self.parse_single_struct_field(private)])
return ~[self.parse_single_struct_field(private)]
}
if self.eat_keyword(&~"pub") {
return members(~[self.parse_single_struct_field(public)]);
return ~[self.parse_single_struct_field(public)];
}
if self.try_parse_obsolete_struct_ctor() {
return members(~[]);
return ~[];
}
if self.eat_keyword(&~"drop") {
let lo = self.last_span.lo;
let body = self.parse_block();
return dtor_decl(body, attrs, mk_sp(lo, self.last_span.hi))
}
else {
return members(~[self.parse_single_struct_field(inherited)]);
}
return ~[self.parse_single_struct_field(inherited)];
}
// parse visiility: PUB, PRIV, or nothing
@ -3830,44 +3793,17 @@ pub impl Parser {
// parse a structure-like enum variant definition
// this should probably be renamed or refactored...
fn parse_struct_def(&self) -> @struct_def {
let mut the_dtor: Option<(blk, ~[attribute], codemap::span)> = None;
let mut fields: ~[@struct_field] = ~[];
while *self.token != token::RBRACE {
match self.parse_struct_decl_field() {
dtor_decl(ref blk, ref attrs, s) => {
match the_dtor {
Some((_, _, s_first)) => {
self.span_note(s, ~"duplicate destructor \
declaration");
self.span_fatal(copy s_first,
~"first destructor \
declared here");
}
None => {
the_dtor = Some((copy *blk, copy *attrs, s));
}
}
}
members(mms) => {
for mms.each |struct_field| {
fields.push(*struct_field);
}
}
for self.parse_struct_decl_field().each |struct_field| {
fields.push(*struct_field);
}
}
self.bump();
let actual_dtor = do the_dtor.map |dtor| {
let (d_body, d_attrs, d_s) = copy *dtor;
codemap::spanned { node: ast::struct_dtor_ { id: self.get_id(),
attrs: d_attrs,
self_id: self.get_id(),
body: d_body },
span: d_s }
};
return @ast::struct_def {
fields: fields,
dtor: actual_dtor,
dtor: None,
ctor_id: None
};
}