diff options
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 68ddd17dd01..38c985af370 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -637,7 +637,7 @@ impl<'a> StringReader<'a> { 'b' => { self.bump(); base = 2; num_digits = self.scan_digits(2); } 'o' => { self.bump(); base = 8; num_digits = self.scan_digits(8); } 'x' => { self.bump(); base = 16; num_digits = self.scan_digits(16); } - '0'..'9' | '_' | '.' => { + '0'...'9' | '_' | '.' => { num_digits = self.scan_digits(10) + 1; } 'u' | 'i' => { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 0780e68a062..c8f1b7f9a8e 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3256,8 +3256,7 @@ impl<'a> Parser<'a> { // These expressions are limited to literals (possibly // preceded by unary-minus) or identifiers. let val = self.parse_literal_maybe_minus(); - // FIXME(#17295) remove the DOTDOT option. - if (self.token == token::DOTDOTDOT || self.token == token::DOTDOT) && + if (self.token == token::DOTDOTDOT) && self.look_ahead(1, |t| { *t != token::COMMA && *t != token::RBRACKET }) { @@ -3302,16 +3301,12 @@ impl<'a> Parser<'a> { } }); - // FIXME(#17295) remove the DOTDOT option. - if self.look_ahead(1, |t| *t == token::DOTDOTDOT || *t == token::DOTDOT) && + if self.look_ahead(1, |t| *t == token::DOTDOTDOT) && self.look_ahead(2, |t| { *t != token::COMMA && *t != token::RBRACKET }) { let start = self.parse_expr_res(RestrictionNoBarOp); - // FIXME(#17295) remove the DOTDOT option (self.eat(&token::DOTDOTDOT)). - if self.token == token::DOTDOTDOT || self.token == token::DOTDOT { - self.bump(); - } + self.eat(&token::DOTDOTDOT); let end = self.parse_expr_res(RestrictionNoBarOp); pat = PatRange(start, end); } else if is_plain_ident(&self.token) && !can_be_enum_or_struct { |