diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 14:20:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-18 16:35:26 +0100 |
| commit | b8e0da25ee8efac3bb05cd6b2730aafbd96119f4 (patch) | |
| tree | c5ef7652343a7e4b55601fa0a4c94cf46ba09585 /src/preparser-api.cc | |
| parent | 086aeeaae12517475c22695a200be45495516549 (diff) | |
| download | android_external_v8-b8e0da25ee8efac3bb05cd6b2730aafbd96119f4.tar.gz android_external_v8-b8e0da25ee8efac3bb05cd6b2730aafbd96119f4.tar.bz2 android_external_v8-b8e0da25ee8efac3bb05cd6b2730aafbd96119f4.zip | |
Update V8 to r6387 as required by WebKit r76408
Change-Id: Icfc5385b0996bd592f8b1ac8cbb44767ee09f1f6
Diffstat (limited to 'src/preparser-api.cc')
| -rw-r--r-- | src/preparser-api.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/preparser-api.cc b/src/preparser-api.cc index dba30265..3817935f 100644 --- a/src/preparser-api.cc +++ b/src/preparser-api.cc @@ -69,8 +69,12 @@ class InputStreamUTF16Buffer : public UC16CharacterStream { } } - virtual void PushBack(uc16 ch) { + virtual void PushBack(uc32 ch) { ASSERT(pos_ > 0); + if (ch == kEndOfInput) { + pos_--; + return; + } if (buffer_cursor_ <= pushback_buffer_) { // No more room in the current buffer to do pushbacks. if (pushback_buffer_end_cache_ == NULL) { @@ -98,7 +102,8 @@ class InputStreamUTF16Buffer : public UC16CharacterStream { buffer_end_ = pushback_buffer_backing_ + pushback_buffer_backing_size_; } } - pushback_buffer_[buffer_cursor_ - pushback_buffer_- 1] = ch; + pushback_buffer_[buffer_cursor_ - pushback_buffer_- 1] = + static_cast<uc16>(ch); pos_--; } |