AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[scanner] Tweak ScanNumber

Browse Source 
Change-Id: I1654da286ae15bc028803286a188b5d89111c3d3
Reviewed-on: https://chromium-review.googlesource.com/c/1495983
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59986}
This commit is contained in:
Toon Verwaest 2019-03-01 13:16:24 +01:00 committed by Commit Bot
parent ab24897cb0
commit c0eb72e063
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/parsing/scanner.cc
View File

@ -853,15 +853,15 @@ Token::Value Scanner::ScanNumber(bool seen_period) {
// either 0, 0exxx, 0Exxx, 0.xxx, a hex number, a binary number or
// an octal number.
if (c0_ == 'x' || c0_ == 'X') {
if (AsciiAlphaToLower(c0_) == 'x') {
AddLiteralCharAdvance();
kind = HEX;
if (!ScanHexDigits()) return Token::ILLEGAL;
} else if (c0_ == 'o' || c0_ == 'O') {
} else if (AsciiAlphaToLower(c0_) == 'o') {
AddLiteralCharAdvance();
kind = OCTAL;
if (!ScanOctalDigits()) return Token::ILLEGAL;
} else if (c0_ == 'b' || c0_ == 'B') {
} else if (AsciiAlphaToLower(c0_) == 'b') {
AddLiteralCharAdvance();
kind = BINARY;
if (!ScanBinaryDigits()) return Token::ILLEGAL;
@ -883,14 +883,12 @@ Token::Value Scanner::ScanNumber(bool seen_period) {
}
// Parse decimal digits and allow trailing fractional part.
if (kind == DECIMAL || kind == DECIMAL_WITH_LEADING_ZERO) {
if (IsDecimalNumberKind(kind)) {
// This is an optimization for parsing Decimal numbers as Smi's.
if (at_start) {
uint64_t value = 0;
// scan subsequent decimal digits
if (!ScanDecimalAsSmi(&value)) {
return Token::ILLEGAL;
}
if (!ScanDecimalAsSmi(&value)) return Token::ILLEGAL;
if (next().literal_chars.one_byte_literal().length() <= 10 &&
value <= Smi::kMaxValue && c0_ != '.' && !IsIdentifierStart(c0_)) {
@ -917,8 +915,7 @@ Token::Value Scanner::ScanNumber(bool seen_period) {
}
bool is_bigint = false;
if (c0_ == 'n' && !seen_period &&
(kind == DECIMAL || kind == HEX || kind == OCTAL || kind == BINARY)) {
if (c0_ == 'n' && !seen_period && IsValidBigIntKind(kind)) {
// Check that the literal is within our limits for BigInt length.
// For simplicity, use 4 bits per character to calculate the maximum
// allowed literal length.
@ -932,12 +929,11 @@ Token::Value Scanner::ScanNumber(bool seen_period) {
is_bigint = true;
Advance();
} else if (c0_ == 'e' || c0_ == 'E') {
} else if (AsciiAlphaToLower(c0_) == 'e') {
// scan exponent, if any
DCHECK(kind != HEX); // 'e'/'E' must be scanned as part of the hex number
if (!(kind == DECIMAL || kind == DECIMAL_WITH_LEADING_ZERO))
return Token::ILLEGAL;
if (!IsDecimalNumberKind(kind)) return Token::ILLEGAL;
// scan exponent
AddLiteralCharAdvance();

10
src/parsing/scanner.h
View File

@ -543,14 +543,22 @@ class Scanner {
};
enum NumberKind {
IMPLICIT_OCTAL,
BINARY,
OCTAL,
IMPLICIT_OCTAL,
HEX,
DECIMAL,
DECIMAL_WITH_LEADING_ZERO
};
inline bool IsValidBigIntKind(NumberKind kind) {
return IsInRange(kind, BINARY, DECIMAL);
}
inline bool IsDecimalNumberKind(NumberKind kind) {
return IsInRange(kind, DECIMAL, DECIMAL_WITH_LEADING_ZERO);
}
static const int kCharacterLookaheadBufferSize = 1;
static const int kMaxAscii = 127;