| Index: src/preparser.cc
|
| diff --git a/src/preparser.cc b/src/preparser.cc
|
| index 7cce685eee10f4728bc80eec3ed9e44ca3a57e1a..157fbea554728a801d5f2e879e581f5a07d7aed5 100644
|
| --- a/src/preparser.cc
|
| +++ b/src/preparser.cc
|
| @@ -1121,23 +1121,23 @@ void PreParser::ExpectSemicolon(bool* ok) {
|
|
|
|
|
| PreParser::Identifier PreParser::GetIdentifierSymbol() {
|
| - const char* literal_chars = scanner_->literal_string();
|
| - int literal_length = scanner_->literal_length();
|
| int identifier_pos = scanner_->location().beg_pos;
|
| -
|
| - log_->LogSymbol(identifier_pos, literal_chars, literal_length);
|
| -
|
| - return kUnknownExpression;
|
| + if (scanner_->is_literal_ascii()) {
|
| + log_->LogAsciiSymbol(identifier_pos, scanner_->literal_ascii_string());
|
| + } else {
|
| + log_->LogUC16Symbol(identifier_pos, scanner_->literal_uc16_string());
|
| + }
|
| + return kUnknownIdentifier;
|
| }
|
|
|
|
|
| PreParser::Expression PreParser::GetStringSymbol() {
|
| - const char* literal_chars = scanner_->literal_string();
|
| - int literal_length = scanner_->literal_length();
|
| -
|
| - int literal_position = scanner_->location().beg_pos;
|
| - log_->LogSymbol(literal_position, literal_chars, literal_length);
|
| -
|
| + int identifier_pos = scanner_->location().beg_pos;
|
| + if (scanner_->is_literal_ascii()) {
|
| + log_->LogAsciiSymbol(identifier_pos, scanner_->literal_ascii_string());
|
| + } else {
|
| + log_->LogUC16Symbol(identifier_pos, scanner_->literal_uc16_string());
|
| + }
|
| return kUnknownExpression;
|
| }
|
|
|
| @@ -1154,7 +1154,8 @@ PreParser::Identifier PreParser::ParseIdentifierName(bool* ok) {
|
| if (i::Token::IsKeyword(next)) {
|
| int pos = scanner_->location().beg_pos;
|
| const char* keyword = i::Token::String(next);
|
| - log_->LogSymbol(pos, keyword, i::StrLength(keyword));
|
| + log_->LogAsciiSymbol(pos, i::Vector<const char>(keyword,
|
| + i::StrLength(keyword)));
|
| return kUnknownExpression;
|
| }
|
| if (next == i::Token::IDENTIFIER) {
|
| @@ -1173,8 +1174,8 @@ PreParser::Identifier PreParser::ParseIdentifierOrGetOrSet(bool* is_get,
|
| bool* is_set,
|
| bool* ok) {
|
| Expect(i::Token::IDENTIFIER, CHECK_OK);
|
| - if (scanner_->literal_length() == 3) {
|
| - const char* token = scanner_->literal_string();
|
| + if (scanner_->is_literal_ascii() && scanner_->literal_length() == 3) {
|
| + const char* token = scanner_->literal_ascii_string().start();
|
| *is_get = strncmp(token, "get", 3) == 0;
|
| *is_set = !*is_get && strncmp(token, "set", 3) == 0;
|
| }
|
|
|