From f6624782d41dce401a4103240daa06011ed326a5 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Fri, 29 Jul 2016 23:47:55 +0300 Subject: Parse numeric fields in struct expressions and patterns --- src/libsyntax/parse/parser.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/libsyntax/parse') 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; -- cgit 1.4.1-3-g733a5