Changeset 18354 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 20, 2006, 12:11:47 PM (18 years ago)

Author:

andersca

Message:

Reviewed by Darin.

<rdar://problem/4235733>
<​http://bugs.webkit.org/?show_bug.cgi?id=10193>
support String.localeCompare.

Implement localeCompare.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/string_object.cpp: (localeCompare): (StringProtoFunc::callAsFunction):
• kjs/string_object.h: (KJS::StringProtoFunc::):

Location:

trunk/JavaScriptCore/kjs

Files:

• string_object.cpp (modified) (4 diffs)
• string_object.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -31 +31 @@
 #include "regexp_object.h"
 #include <wtf/unicode/Unicode.h>
+
+#if PLATFORM(CF)
+#include <CoreFoundation/CoreFoundation.h>
+#endif
 
 using namespace KJS;
@@ -126 +130 @@
   toLocaleLowerCase     StringProtoFunc::ToLocaleLowerCase DontEnum|Function    0
   toLocaleUpperCase     StringProtoFunc::ToLocaleUpperCase DontEnum|Function    0
+  localeCompare         StringProtoFunc::LocaleCompare  DontEnum|Function       1
 #
 # Under here: html extension, should only exist if KJS_PURE_ECMA is not defined
@@ -277 +282 @@
   return substitutedReplacement;
 }
+
+#if PLATFORM(WIN_OS)
+static inline int localeCompare(const UString& a, const UString& b)
+{
+    return CompareStringW(LOCALE_USER_DEFAULT, 0, 
+                          a.data(), a.length(),
+                          b.data(), b.length());
+}
+#elif PLATFORM(CF)
+static inline int localeCompare(const UString& a, const UString& b)
+{
+    CFStringRef sa = CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, reinterpret_cast<const UniChar*>(a.data()), a.size(), kCFAllocatorNull);
+    CFStringRef sb = CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, reinterpret_cast<const UniChar*>(b.data()), b.size(), kCFAllocatorNull);
+    
+    int retval = CFStringCompare(sa, sb, kCFCompareLocalized);
+    
+    CFRelease(sa);
+    CFRelease(sb);
+    
+    return retval;
+}
+#else
+static inline int localeCompare(const UString& a, const UString& b)
+{
+    return compare(a, b);
+}
+#endif
 
 static JSValue *replace(ExecState *exec, const UString &source, JSValue *pattern, JSValue *replacement)
@@ -675 +707 @@
     break;
   }
+  case LocaleCompare:
+    return jsNumber(localeCompare(s, a0->toString(exec)));
 #ifndef KJS_PURE_ECMA
   case Big:

trunk/JavaScriptCore/kjs/string_object.h

@@ -84 +84 @@
            Match, Replace, Search, Slice, Split,
            Substr, Substring, FromCharCode, ToLowerCase, ToUpperCase,
-           ToLocaleLowerCase, ToLocaleUpperCase
+           ToLocaleLowerCase, ToLocaleUpperCase, LocaleCompare
 #ifndef KJS_PURE_ECMA
            , Big, Small, Blink, Bold, Fixed, Italics, Strike, Sub, Sup,