dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify

This commit is contained in:
Aleksey Kladov 2018-01-28 01:12:49 +03:00
parent da9bfacd98
commit b7ae5bbba2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/parser/event_parser/grammar/items.rs
View File

@ -103,18 +103,27 @@ fn struct_item(p: &mut Parser) {
}
fn named_fields(p: &mut Parser) {
p.curly_block(|p| comma_list(p, EOF, |p| {
assert!(p.at(L_CURLY));
p.bump();
while !p.at(R_CURLY) && !p.at(EOF) {
named_field(p);
true
}));
if !p.at(R_CURLY) {
p.expect(COMMA);
}
}
p.expect(R_CURLY);
fn named_field(p: &mut Parser) {
let field = p.start();
visibility(p);
if p.expect(IDENT) && p.expect(COLON) {
if p.expect(IDENT) {
p.expect(COLON);
types::type_ref(p);
};
field.complete(p, NAMED_FIELD);
field.complete(p, NAMED_FIELD);
} else {
field.abandon(p);
p.err_and_bump("expected field declaration");
}
}
}