Commit 0ff83e97 authored by Toon Verwaest's avatar Toon Verwaest Committed by Commit Bot

[scanner] Always complete literals for possibly escaped FUTURE_STRICT_RESERVED_WORD

Bug: chromium:861953
Change-Id: Id3a57aca0b24c421ac959d69265c449eaa214c16
Reviewed-on: https://chromium-review.googlesource.com/1138083
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: 's avatarMarja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54573}
parent 35f674cc
...@@ -1691,6 +1691,11 @@ Token::Value Scanner::ScanIdentifierOrKeywordInner(LiteralScope* literal) { ...@@ -1691,6 +1691,11 @@ Token::Value Scanner::ScanIdentifierOrKeywordInner(LiteralScope* literal) {
Token::Value token = Token::Value token =
KeywordOrIdentifierToken(chars.start(), chars.length()); KeywordOrIdentifierToken(chars.start(), chars.length());
/* TODO(adamk): YIELD should be handled specially. */ /* TODO(adamk): YIELD should be handled specially. */
if (token == Token::FUTURE_STRICT_RESERVED_WORD) {
literal->Complete();
if (escaped) return Token::ESCAPED_STRICT_RESERVED_WORD;
return token;
}
if (token == Token::IDENTIFIER || Token::IsContextualKeyword(token)) { if (token == Token::IDENTIFIER || Token::IsContextualKeyword(token)) {
literal->Complete(); literal->Complete();
return token; return token;
...@@ -1699,8 +1704,7 @@ Token::Value Scanner::ScanIdentifierOrKeywordInner(LiteralScope* literal) { ...@@ -1699,8 +1704,7 @@ Token::Value Scanner::ScanIdentifierOrKeywordInner(LiteralScope* literal) {
if (!escaped) return token; if (!escaped) return token;
literal->Complete(); literal->Complete();
if (token == Token::FUTURE_STRICT_RESERVED_WORD || token == Token::LET || if (token == Token::LET || token == Token::STATIC) {
token == Token::STATIC) {
return Token::ESCAPED_STRICT_RESERVED_WORD; return Token::ESCAPED_STRICT_RESERVED_WORD;
} }
return Token::ESCAPED_KEYWORD; return Token::ESCAPED_KEYWORD;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment