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

Eat open paren when parsing list

Browse Source
This commit is contained in:
Seiichi Uchida 2017-08-16 23:40:06 +09:00
parent c774c95919
commit 0bfe4178af
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsyntax/parse/attr.rs
View File

@ -244,10 +244,9 @@ impl<'a> Parser<'a> {
pub fn parse_meta_item_kind(&mut self) -> PResult<'a, ast::MetaItemKind> { pub fn parse_meta_item_kind(&mut self) -> PResult<'a, ast::MetaItemKind> {
Ok(if self.eat(&token::Eq) { Ok(if self.eat(&token::Eq) {
ast::MetaItemKind::NameValue(self.parse_unsuffixed_lit()?) ast::MetaItemKind::NameValue(self.parse_unsuffixed_lit()?)
} else if self.token == token::OpenDelim(token::Paren) { } else if self.eat(&token::OpenDelim(token::Paren)) {
ast::MetaItemKind::List(self.parse_meta_seq()?) ast::MetaItemKind::List(self.parse_meta_seq()?)
} else { } else {
self.eat(&token::OpenDelim(token::Paren));
ast::MetaItemKind::Word ast::MetaItemKind::Word
}) })
} }
@ -277,9 +276,8 @@ impl<'a> Parser<'a> {
/// matches meta_seq = ( COMMASEP(meta_item_inner) ) /// matches meta_seq = ( COMMASEP(meta_item_inner) )
fn parse_meta_seq(&mut self) -> PResult<'a, Vec<ast::NestedMetaItem>> { fn parse_meta_seq(&mut self) -> PResult<'a, Vec<ast::NestedMetaItem>> {
self.parse_unspanned_seq(&token::OpenDelim(token::Paren), self.parse_seq_to_end(&token::CloseDelim(token::Paren),
&token::CloseDelim(token::Paren), SeqSep::trailing_allowed(token::Comma),
SeqSep::trailing_allowed(token::Comma), |p: &mut Parser<'a>| p.parse_meta_item_inner())
|p: &mut Parser<'a>| p.parse_meta_item_inner())
} }
} }