diff options
| author | Ben Murdoch <benm@google.com> | 2012-04-11 10:23:59 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-04-11 15:40:41 +0100 |
| commit | 5d4cdbf7a67d3662fa0bee4efdb7edd8daec9b0b (patch) | |
| tree | 7b717e53b80c4a64bf9b723aabcf7c909ae3c243 /src/preparser.cc | |
| parent | c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9 (diff) | |
| download | android_external_v8-5d4cdbf7a67d3662fa0bee4efdb7edd8daec9b0b.tar.gz android_external_v8-5d4cdbf7a67d3662fa0bee4efdb7edd8daec9b0b.tar.bz2 android_external_v8-5d4cdbf7a67d3662fa0bee4efdb7edd8daec9b0b.zip | |
Merge V8 3.9 at 3.9.24.9
http://v8.googlecode.com/svn/branches/3.9@11260
Bug: 5688872
Change-Id: Iddd944e82189d92df3fc427dc5f0d3f1b2f0c6c8
Diffstat (limited to 'src/preparser.cc')
| -rw-r--r-- | src/preparser.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/preparser.cc b/src/preparser.cc index b36f4fac..20d3b9c5 100644 --- a/src/preparser.cc +++ b/src/preparser.cc @@ -1214,7 +1214,7 @@ void PreParser::CheckDuplicate(DuplicateFinder* finder, old_type = finder->AddAsciiSymbol(scanner_->literal_ascii_string(), type); } else { - old_type = finder->AddUC16Symbol(scanner_->literal_uc16_string(), type); + old_type = finder->AddUtf16Symbol(scanner_->literal_utf16_string(), type); } if (HasConflict(old_type, type)) { if (IsDataDataConflict(old_type, type)) { @@ -1387,7 +1387,7 @@ PreParser::Expression PreParser::ParseFunctionLiteral(bool* ok) { duplicate_finder.AddAsciiSymbol(scanner_->literal_ascii_string(), 1); } else { prev_value = - duplicate_finder.AddUC16Symbol(scanner_->literal_uc16_string(), 1); + duplicate_finder.AddUtf16Symbol(scanner_->literal_utf16_string(), 1); } if (prev_value != 0) { @@ -1485,7 +1485,7 @@ void PreParser::LogSymbol() { if (scanner_->is_literal_ascii()) { log_->LogAsciiSymbol(identifier_pos, scanner_->literal_ascii_string()); } else { - log_->LogUC16Symbol(identifier_pos, scanner_->literal_uc16_string()); + log_->LogUtf16Symbol(identifier_pos, scanner_->literal_utf16_string()); } } @@ -1657,7 +1657,7 @@ int DuplicateFinder::AddAsciiSymbol(i::Vector<const char> key, int value) { return AddSymbol(i::Vector<const byte>::cast(key), true, value); } -int DuplicateFinder::AddUC16Symbol(i::Vector<const uint16_t> key, int value) { +int DuplicateFinder::AddUtf16Symbol(i::Vector<const uint16_t> key, int value) { return AddSymbol(i::Vector<const byte>::cast(key), false, value); } |