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

[scanner] Simplify Scan

Browse Source 
Change-Id: I331ff09ee06db39e2ca051db0a91823f5b8fb402
Reviewed-on: https://chromium-review.googlesource.com/1193262
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55445}
This commit is contained in:
Toon Verwaest 2018-08-28 11:14:02 +02:00 committed by Commit Bot
parent 99a2440c22
commit 4e9ac0a60c
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/parsing/scanner.cc
View File

@ -540,23 +540,20 @@ void Scanner::Scan() {
next().invalid_template_escape_message = MessageTemplate::kNone;
Token::Value token;
do {
if (static_cast<unsigned>(c0_) <= 0x7F) {
Token::Value token = static_cast<Token::Value>(one_char_tokens[c0_]);
if (token != Token::ILLEGAL) {
int pos = source_pos();
next().token = token;
next().contextual_token = Token::UNINITIALIZED;
next().location.beg_pos = pos;
next().location.end_pos = pos + 1;
Advance();
return;
}
}
Token::Value contextual_token = Token::UNINITIALIZED;
do {
// Remember the position of the next token
next().location.beg_pos = source_pos();
if (static_cast<unsigned>(c0_) <= 0x7F) {
token = static_cast<Token::Value>(one_char_tokens[c0_]);
if (token != Token::ILLEGAL) {
Advance();
break;
}
}
switch (c0_) {
case '"':
case '\'':
@ -747,13 +744,16 @@ void Scanner::Scan() {
(CombineSurrogatePair() &&
unicode_cache_->IsIdentifierStart(c0_))) {
token = ScanIdentifierOrKeyword();
if (Token::IsContextualKeyword(token)) {
contextual_token = token;
token = Token::IDENTIFIER;
}
} else if (IsDecimalDigit(c0_)) {
token = ScanNumber(false);
} else if (c0_ == kEndOfInput) {
token = Token::EOS;
} else {
token = SkipWhiteSpace();
if (token == Token::ILLEGAL) Advance();
}
break;
}
@ -763,13 +763,8 @@ void Scanner::Scan() {
} while (token == Token::WHITESPACE);
next().location.end_pos = source_pos();
if (Token::IsContextualKeyword(token)) {
next().token = Token::IDENTIFIER;
next().contextual_token = token;
} else {
next().token = token;
next().contextual_token = Token::UNINITIALIZED;
}
next().token = token;
next().contextual_token = contextual_token;
#ifdef DEBUG
SanityCheckTokenDesc(current());