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

Fixed bug 114

Browse Source 
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@493 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
christian.plesner.hansen@gmail.com 2008-10-14 09:13:23 +00:00
parent 9e0609db8e
commit a601594796
2 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/runtime.cc
View File

@ -2166,7 +2166,8 @@ static Object* ConvertCase(Arguments args,
// We can assume that the string is not empty
uc32 current = buffer->GetNext();
while (i < length) {
uc32 next = buffer->has_more() ? buffer->GetNext() : 0;
bool has_next = buffer->has_more();
uc32 next = has_next ? buffer->GetNext() : 0;
int char_length = mapping->get(current, next, chars);
if (char_length == 0) {
// The case conversion of this character is the character itself.
@ -2190,12 +2191,21 @@ static Object* ConvertCase(Arguments args,
// "realloc" it and probably, in the vast majority of cases,
// extend the existing string to be able to hold the full
// result.
int current_length = i + char_length + mapping->get(next, 0, chars);
int next_length = 0;
if (has_next) {
next_length = mapping->get(next, 0, chars);
if (next_length == 0) next_length = 1;
}
int current_length = i + char_length + next_length;
while (buffer->has_more()) {
current = buffer->GetNext();
// NOTE: we use 0 as the next character here because, while
// the next character may affect what a character converts to,
// it does not in any case affect the length of what it convert
// to.
int char_length = mapping->get(current, 0, chars);
if (char_length == 0) char_length = 1;
current += char_length;
current_length += char_length;
}
length = current_length;
goto try_convert;

43
test/mjsunit/regress/regress-114.js Normal file
View File

@ -0,0 +1,43 @@
// Copyright 2008 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// German eszett
assertEquals("FRIEDRICHSTRASSE 14", "friedrichstra\xDFe 14".toUpperCase());
assertEquals("XXSSSSSSXX", "xx\xDF\xDF\xDFxx".toUpperCase());
assertEquals("(SS)", "(\xDF)".toUpperCase());
assertEquals("SS", "\xDF".toUpperCase());
// Turkish dotted upper-case I lower-case converts to two characters
assertEquals("i\u0307", "\u0130".toLowerCase());
assertEquals("(i\u0307)", "(\u0130)".toLowerCase());
assertEquals("xxi\u0307xx", "XX\u0130XX".toLowerCase());
// Greek small upsilon with dialytika and tonos upper-case converts to three
// characters
assertEquals("\u03A5\u0308\u0301", "\u03B0".toUpperCase());
assertEquals("(\u03A5\u0308\u0301)", "(\u03B0)".toUpperCase());
assertEquals("XX\u03A5\u0308\u0301XX", "xx\u03B0xx".toUpperCase());