diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2016-07-29 23:47:55 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2016-08-13 00:08:14 +0300 |
| commit | f6624782d41dce401a4103240daa06011ed326a5 (patch) | |
| tree | c49cfbbaccd0f0d9398cb90d57a096c2c47c3973 /src/libsyntax/parse/parser.rs | |
| parent | 59be332a1b3b190ec5dfdb6768e80f9d312a0c6b (diff) | |
| download | rust-f6624782d41dce401a4103240daa06011ed326a5.tar.gz rust-f6624782d41dce401a4103240daa06011ed326a5.zip | |
Parse numeric fields in struct expressions and patterns
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 1b32632a06f..4c279b2fe48 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2009,10 +2009,19 @@ impl<'a> Parser<'a> { } } + pub fn parse_field_name(&mut self) -> PResult<'a, Ident> { + if let token::Literal(token::Integer(name), None) = self.token { + self.bump(); + Ok(Ident::with_empty_ctxt(name)) + } else { + self.parse_ident() + } + } + /// Parse ident COLON expr pub fn parse_field(&mut self) -> PResult<'a, Field> { let lo = self.span.lo; - let i = self.parse_ident()?; + let i = self.parse_field_name()?; let hi = self.last_span.hi; self.expect(&token::Colon)?; let e = self.parse_expr()?; @@ -3508,7 +3517,7 @@ impl<'a> Parser<'a> { // Check if a colon exists one ahead. This means we're parsing a fieldname. let (subpat, fieldname, is_shorthand) = if self.look_ahead(1, |t| t == &token::Colon) { // Parsing a pattern of the form "fieldname: pat" - let fieldname = self.parse_ident()?; + let fieldname = self.parse_field_name()?; self.bump(); let pat = self.parse_pat()?; hi = pat.span.hi; |
