Changeset 60332 in webkit

Timestamp:

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

Author:

eric@webkit.org

Message:

2010-05-27 Luiz Agostini <​luiz.agostini@openbossa.org>

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

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSArray.cpp (modified) (1 diff)
• runtime/UString.cpp (modified) (1 diff)
• runtime/UString.h (modified) (1 diff)
• wtf/text/StringImpl.cpp (modified) (1 diff)
• wtf/text/StringImpl.h (modified) (1 diff)
• wtf/text/WTFString.cpp (modified) (1 diff)
• wtf/text/WTFString.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-05-27  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        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:
+
 2010-05-26  Darin Adler  <darin@apple.com>
 

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.

trunk/JavaScriptCore/wtf/text/StringImpl.cpp

@@ -477 +477 @@
 }
 
+int codePointCompare(const StringImpl* s1, const StringImpl* s2)
+{
+    const unsigned l1 = s1 ? s1->length() : 0;
+    const unsigned l2 = s2 ? s2->length() : 0;
+    const unsigned lmin = l1 < l2 ? l1 : l2;
+    const UChar* c1 = s1 ? s1->characters() : 0;
+    const UChar* c2 = s2 ? s2->characters() : 0;
+    unsigned pos = 0;
+    while (pos < lmin && *c1 == *c2) {
+        c1++;
+        c2++;
+        pos++;
+    }
+
+    if (pos < lmin)
+        return (c1[0] > c2[0]) ? 1 : -1;
+
+    if (l1 == l2)
+        return 0;
+
+    return (l1 > l2) ? 1 : -1;
+}
+
 int StringImpl::find(const char* chs, int index, bool caseSensitive)
 {

trunk/JavaScriptCore/wtf/text/StringImpl.h

@@ -353 +353 @@
 bool equalIgnoringNullity(StringImpl*, StringImpl*);
 
+int codePointCompare(const StringImpl*, const StringImpl*);
+
 static inline bool isSpaceOrNewline(UChar c)
 {

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -127 +127 @@
 }
 
+int codePointCompare(const String& a, const String& b)
+{
+    return codePointCompare(a.impl(), b.impl());
+}
+
 void String::insert(const String& str, unsigned pos)
 {

trunk/JavaScriptCore/wtf/text/WTFString.h

@@ -352 +352 @@
 }
 
+int codePointCompare(const String&, const String&);
+
 inline int find(const UChar* characters, size_t length, UChar character, int startPosition)
 {