Changeset 13740 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Apr 8, 2006, 10:21:52 AM (19 years ago)

Author:

ap

Message:

Reviewed by Darin.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8264 toLowerCase and toUpperCase don't honor special mappings

Test: fast/js/string-capitalization.html

• JavaScriptCore.xcodeproj/project.pbxproj: Added KXMLCore::Unicode headers to the project.
• icu/unicode/putil.h: Added (copied from WebCore).
• icu/unicode/uiter.h: Ditto.
• icu/unicode/ustring.h: Ditto.
• kjs/string_object.cpp: (StringProtoFunc::callAsFunction): Use the new KXMLCore::Unicode::toUpper() and toLower().
• kjs/ustring.cpp: Removed unused (and evil) UChar::toLower() and toUpper().
• kjs/ustring.h: Ditto.

• kxmlcore/unicode/Unicode.h: Corrected capitalization of the word Unicode.
• kxmlcore/unicode/UnicodeCategory.h: Renamed include guard macro to match file name.

• kxmlcore/unicode/icu/UnicodeIcu.h: (KXMLCore::Unicode::toLower): Work on strings, not individual characters. Use ICU root locale. (KXMLCore::Unicode::toUpper): Ditto. (KXMLCore::Unicode::isFormatChar): Use int32_t, which can hold a complete code point. (KXMLCore::Unicode::isSeparatorSpace): Ditto. (KXMLCore::Unicode::category): Ditto.
• kxmlcore/unicode/qt4/UnicodeQt4.h: (KXMLCore::Unicode::toLower): Work on strings, not individual characters. (KXMLCore::Unicode::toUpper): Ditto. (KXMLCore::Unicode::isFormatChar): Use int32_t, which can hold a complete code point. (KXMLCore::Unicode::isSeparatorSpace): Ditto. (KXMLCore::Unicode::category): Ditto.

• tests/mozilla/ecma/String/15.5.4.12-1.js: Corrected expected results.
• tests/mozilla/ecma/String/15.5.4.12-5.js: Corrected expected results.

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -35 +35 @@
 #include <stdio.h>
 #include "string_object.lut.h"
+#include <kxmlcore/unicode/Unicode.h>
 
 using namespace KJS;
@@ -624 +625 @@
     break;
   case ToLowerCase:
-  case ToLocaleLowerCase: // FIXME: To get this 100% right we need to detect Turkish and change I to lowercase i without a dot.
+  case ToLocaleLowerCase: { // FIXME: See http://www.unicode.org/Public/UNIDATA/SpecialCasing.txt for locale-sensitive mappings that aren't implemented.
     u = s;
-    for (i = 0; i < len; i++)
-      u[i] = u[i].toLower();
-    result = jsString(u);
-    break;
+    u.copyForWriting();
+    uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
+    uint16_t* destIfNeeded;
+
+    int len = KXMLCore::Unicode::toLower(dataPtr, u.size(), destIfNeeded);
+    if (len >= 0)
+        result = jsString(UString(reinterpret_cast<UChar *>(destIfNeeded ? destIfNeeded : dataPtr), len));
+    else
+        result = jsString(s);
+
+    free(destIfNeeded);
+    break;
+  }
   case ToUpperCase:
-  case ToLocaleUpperCase: // FIXME: To get this 100% right we need to detect Turkish and change i to uppercase I with a dot.
+  case ToLocaleUpperCase: { // FIXME: See http://www.unicode.org/Public/UNIDATA/SpecialCasing.txt for locale-sensitive mappings that aren't implemented.
     u = s;
-    for (i = 0; i < len; i++)
-      u[i] = u[i].toUpper();
-    result = jsString(u);
-    break;
+    u.copyForWriting();
+    uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
+    uint16_t* destIfNeeded;
+
+    int len = KXMLCore::Unicode::toUpper(dataPtr, u.size(), destIfNeeded);
+    if (len >= 0)
+        result = jsString(UString(reinterpret_cast<UChar *>(destIfNeeded ? destIfNeeded : dataPtr), len));
+    else
+        result = jsString(s);
+
+    free(destIfNeeded);
+    break;
+  }
 #ifndef KJS_PURE_ECMA
   case Big: