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

rustc: Accept commas to separate tag variants

Browse Source
This commit is contained in:
Patrick Walton 2012-01-17 16:06:32 -08:00
parent 397d9148a7
commit 1aaee20737
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/comp/syntax/parse/parser.rs
View File

@ -2047,7 +2047,8 @@ fn parse_item_tag(p: parser, attrs: [ast::attribute]) -> @ast::item {
expect(p, token::LBRACE);
let all_nullary = true;
let have_disr = false;
while p.token != token::RBRACE {
let done = false;
while !done {
let tok = p.token;
alt tok {
token::IDENT(name, _) {
@ -2075,13 +2076,21 @@ fn parse_item_tag(p: parser, attrs: [ast::attribute]) -> @ast::item {
}
_ {/* empty */ }
}
expect(p, token::SEMI);
alt p.token {
token::SEMI. | token::COMMA. {
p.bump();
if p.token == token::RBRACE { done = true; }
}
token::RBRACE. { done = true; }
_ { /* fall through */ }
}
p.get_id();
let vr = {name: p.get_str(name), args: args, id: p.get_id(),
disr_expr: disr_expr};
variants += [spanned(vlo, vhi, vr)];
}
token::RBRACE. {/* empty */ }
_ {
p.fatal("expected name of variant or '}' but found '" +
token::to_str(p.reader, tok) + "'");