Chromium Code Reviews| Index: src/parsing/scanner.cc |
| diff --git a/src/parsing/scanner.cc b/src/parsing/scanner.cc |
| index faec88b8a4bfb5ff37bf8dad58fefc32cd8ff03f..718dbab73c8054ceff6b8f93e3d72348188d1128 100644 |
| --- a/src/parsing/scanner.cc |
| +++ b/src/parsing/scanner.cc |
| @@ -40,6 +40,7 @@ Scanner::Scanner(UnicodeCache* unicode_cache) |
| : unicode_cache_(unicode_cache), |
| bookmark_c0_(kNoBookmark), |
| octal_pos_(Location::invalid()), |
| + decimal_with_leading_zero_pos_(Location::invalid()), |
| found_html_comment_(false), |
| allow_harmony_exponentiation_operator_(false) { |
| bookmark_current_.literal_chars = &bookmark_current_literal_; |
| @@ -975,10 +976,18 @@ void Scanner::ScanDecimalDigits() { |
| Token::Value Scanner::ScanNumber(bool seen_period) { |
| DCHECK(IsDecimalDigit(c0_)); // the first digit of the number or the fraction |
| - enum { DECIMAL, HEX, OCTAL, IMPLICIT_OCTAL, BINARY } kind = DECIMAL; |
| + enum { |
| + DECIMAL, |
| + DECIMAL_WITH_LEADING_ZERO, |
| + HEX, |
| + OCTAL, |
| + IMPLICIT_OCTAL, |
| + BINARY |
| + } kind = DECIMAL; |
| LiteralScope literal(this); |
| bool at_start = !seen_period; |
| + int start_pos; // For reporting octal positions. |
|
caitp (gmail)
2016/05/13 12:58:31
Maybe rename this to `octal_start_pos` and initial
|
| if (seen_period) { |
| // we have already seen a decimal point of the float |
| AddLiteralChar('.'); |
| @@ -987,7 +996,7 @@ Token::Value Scanner::ScanNumber(bool seen_period) { |
| } else { |
| // if the first character is '0' we must check for octals and hex |
| if (c0_ == '0') { |
| - int start_pos = source_pos(); // For reporting octal positions. |
| + start_pos = source_pos(); |
| AddLiteralCharAdvance(); |
| // either 0, 0exxx, 0Exxx, 0.xxx, a hex number, a binary number or |
| @@ -1029,7 +1038,7 @@ Token::Value Scanner::ScanNumber(bool seen_period) { |
| while (true) { |
| if (c0_ == '8' || c0_ == '9') { |
| at_start = false; |
| - kind = DECIMAL; |
| + kind = DECIMAL_WITH_LEADING_ZERO; |
| break; |
| } |
| if (c0_ < '0' || '7' < c0_) { |
| @@ -1039,11 +1048,13 @@ Token::Value Scanner::ScanNumber(bool seen_period) { |
| } |
| AddLiteralCharAdvance(); |
| } |
| + } else if (c0_ == '8' || c0_ == '9') { |
| + kind = DECIMAL_WITH_LEADING_ZERO; |
| } |
| } |
| // Parse decimal digits and allow trailing fractional part. |
| - if (kind == DECIMAL) { |
| + if (kind == DECIMAL || kind == DECIMAL_WITH_LEADING_ZERO) { |
| if (at_start) { |
| uint64_t value = 0; |
| while (IsDecimalDigit(c0_)) { |
| @@ -1060,6 +1071,8 @@ Token::Value Scanner::ScanNumber(bool seen_period) { |
| literal.Complete(); |
| HandleLeadSurrogate(); |
| + if (kind == DECIMAL_WITH_LEADING_ZERO) |
| + decimal_with_leading_zero_pos_ = Location(start_pos, source_pos()); |
| return Token::SMI; |
| } |
| HandleLeadSurrogate(); |
| @@ -1076,7 +1089,8 @@ Token::Value Scanner::ScanNumber(bool seen_period) { |
| // scan exponent, if any |
| if (c0_ == 'e' || c0_ == 'E') { |
| DCHECK(kind != HEX); // 'e'/'E' must be scanned as part of the hex number |
| - if (kind != DECIMAL) return Token::ILLEGAL; |
| + if (!(kind == DECIMAL || kind == DECIMAL_WITH_LEADING_ZERO)) |
| + return Token::ILLEGAL; |
| // scan exponent |
| AddLiteralCharAdvance(); |
| if (c0_ == '+' || c0_ == '-') |
| @@ -1098,6 +1112,8 @@ Token::Value Scanner::ScanNumber(bool seen_period) { |
| literal.Complete(); |
| + if (kind == DECIMAL_WITH_LEADING_ZERO) |
| + decimal_with_leading_zero_pos_ = Location(start_pos, source_pos()); |
| return Token::NUMBER; |
| } |