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

[scanner] Reduce reliance on PushBack by Peeking more

Browse Source 
Change-Id: I50f729eac8d8b0c25a1f83f2b1f86800f21a8a8b
Reviewed-on: https://chromium-review.googlesource.com/1183301
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55272}
This commit is contained in:
Toon Verwaest 2018-08-21 14:32:07 +02:00 committed by Commit Bot
parent eedc7dbf7e
commit 60cbde18a6
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/parsing/scanner.cc
View File

@ -672,12 +672,12 @@ void Scanner::Scan() {
// / // /* /=
Advance();
if (c0_ == '/') {
Advance();
if (c0_ == '#' || c0_ == '@') {
uc32 c = Peek();
if (c == '#' || c == '@') {
Advance();
Advance();
token = SkipSourceURLComment();
} else {
PushBack(c0_);
token = SkipSingleLineComment();
}
} else if (c0_ == '*') {
@ -726,12 +726,10 @@ void Scanner::Scan() {
} else {
token = Token::PERIOD;
if (c0_ == '.') {
Advance();
if (c0_ == '.') {
if (Peek() == '.') {
Advance();
Advance();
token = Token::ELLIPSIS;
} else {
PushBack('.');
}
}
}
@ -963,15 +961,14 @@ Token::Value Scanner::ScanPrivateName() {
LiteralScope literal(this);
DCHECK_EQ(c0_, '#');
AddLiteralCharAdvance();
DCHECK(!unicode_cache_->IsIdentifierStart(kEndOfInput));
if (!unicode_cache_->IsIdentifierStart(c0_)) {
PushBack(c0_);
if (!unicode_cache_->IsIdentifierStart(Peek())) {
ReportScannerError(source_pos(),
MessageTemplate::kInvalidOrUnexpectedToken);
return Token::ILLEGAL;
}
AddLiteralCharAdvance();
Token::Value token = ScanIdentifierOrKeywordInner(&literal);
return token == Token::ILLEGAL ? Token::ILLEGAL : Token::PRIVATE_NAME;
}
@ -1002,14 +999,16 @@ Token::Value Scanner::ScanTemplateSpan() {
const bool capture_raw = true;
while (true) {
uc32 c = c0_;
Advance();
if (c == '`') {
Advance(); // Consume '`'
result = Token::TEMPLATE_TAIL;
break;
} else if (c == '$' && c0_ == '{') {
} else if (c == '$' && Peek() == '{') {
Advance(); // Consume '$'
Advance(); // Consume '{'
break;
} else if (c == '\\') {
Advance(); // Consume '\\'
DCHECK(!unibrow::IsLineTerminator(kEndOfInput));
if (capture_raw) AddRawLiteralChar('\\');
if (unibrow::IsLineTerminator(c0_)) {
@ -1034,14 +1033,14 @@ Token::Value Scanner::ScanTemplateSpan() {
}
} else if (c < 0) {
// Unterminated template literal
PushBack(c);
break;
} else {
Advance(); // Consume c.
// The TRV of LineTerminatorSequence :: <CR> is the CV 0x000A.
// The TRV of LineTerminatorSequence :: <CR><LF> is the sequence
// consisting of the CV 0x000A.
if (c == '\r') {
if (c0_ == '\n') Advance(); // Skip \n
if (c0_ == '\n') Advance(); // Consume '\n'
c = '\n';
}
if (capture_raw) AddRawLiteralChar(c);