Changeset 60332 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

May 27, 2010, 4:43:54 PM (15 years ago)

Author:

[email protected]

Message:

2010-05-27 Luiz Agostini <​[email protected]>

Reviewed by Darin Adler.

UTF-16 code points compare() for String objects
​https://bugs.webkit.org/show_bug.cgi?id=39701

Moving compare() implementation from UString to StringImpl for it to be shared
with String. Adding overloaded free functions codePointCompare() in StringImpl
and WTFString. Renaming function compare in UString to codePointCompare to be
consistent.

• runtime/JSArray.cpp: (JSC::compareByStringPairForQSort):
• runtime/UString.cpp:
• runtime/UString.h: (JSC::codePointCompare):
• wtf/text/StringImpl.cpp: (WebCore::codePointCompare):
• wtf/text/StringImpl.h:
• wtf/text/WTFString.cpp: (WebCore::codePointCompare):
• wtf/text/WTFString.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• JSArray.cpp (modified) (1 diff)
• UString.cpp (modified) (1 diff)
• UString.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSArray.cpp

@@ -650 +650 @@
     const ValueStringPair* va = static_cast<const ValueStringPair*>(a);
     const ValueStringPair* vb = static_cast<const ValueStringPair*>(b);
-    return compare(va->second, vb->second);
+    return codePointCompare(va->second, vb->second);
 }
 

trunk/JavaScriptCore/runtime/UString.cpp

@@ -581 +581 @@
 }
 
-int compare(const UString& s1, const UString& s2)
-{
-    const unsigned l1 = s1.size();
-    const unsigned l2 = s2.size();
-    const unsigned lmin = l1 < l2 ? l1 : l2;
-    const UChar* c1 = s1.data();
-    const UChar* c2 = s2.data();
-    unsigned l = 0;
-    while (l < lmin && *c1 == *c2) {
-        c1++;
-        c2++;
-        l++;
-    }
-
-    if (l < lmin)
-        return (c1[0] > c2[0]) ? 1 : -1;
-
-    if (l1 == l2)
-        return 0;
-
-    return (l1 > l2) ? 1 : -1;
-}
-
 CString UString::UTF8String(bool strict) const
 {

trunk/JavaScriptCore/runtime/UString.h

@@ -203 +203 @@
     }
 
-    int compare(const UString&, const UString&);
+    inline int codePointCompare(const UString& s1, const UString& s2)
+    {
+        return codePointCompare(s1.rep(), s2.rep());
+    }
 
     // Rule from ECMA 15.2 about what an array index is.