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

Timestamp:

May 29, 2007, 4:07:02 PM (18 years ago)

Author:

weinig

Message:

Reviewed by Adam Roben.

Cleanup function and fix to match comparison API.

• kjs/string_object.cpp: (KJS::substituteBackreferences): (KJS::localeCompare):

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -286 +286 @@
   return substitutedReplacement;
 }
-
+static inline int localeCompare(const UString& a, const UString& b)
+{
 #if PLATFORM(WIN_OS)
-static inline int localeCompare(const UString& a, const UString& b)
-{
-    return CompareStringW(LOCALE_USER_DEFAULT, 0, 
-                          reinterpret_cast<LPCWSTR>(a.data()), a.size(),
-                          reinterpret_cast<LPCWSTR>(b.data()), b.size());
-}
+    int retval = CompareStringW(LOCALE_USER_DEFAULT, 0,
+                                reinterpret_cast<LPCWSTR>(a.data()), a.size(),
+                                reinterpret_cast<LPCWSTR>(b.data()), b.size());
+    return !retval ? retval : retval - 2;
 #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)