Changeset 30942 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Mar 10, 2008, 3:06:44 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Remove KJS::UChar, use ::UChar instead
​http://bugs.webkit.org/show_bug.cgi?id=17017

To functional changes, thus no tests.

• bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::hasCSSPropertyNamePrefix): (WebCore::cssPropertyName):
• bindings/js/JSDOMWindowBase.cpp: (WebCore::windowProtoFuncAToB): (WebCore::windowProtoFuncBToA):
• bindings/js/JSSVGPODTypeWrapper.h:
• bindings/js/kjs_proxy.cpp: (WebCore::KJSProxy::evaluate):
• bridge/objc/objc_utility.mm: (KJS::Bindings::throwError):
• dom/Document.cpp: (WebCore::Document::parseQualifiedName):
• platform/text/AtomicString.cpp: (WebCore::AtomicString::add):
• platform/text/String.cpp: (WebCore::String::String): (WebCore::String::operator Identifier): (WebCore::String::operator UString):
• platform/text/TextCodecICU.cpp: (WebCore::TextCodecICU::decode):
• svg/SVGAnimatedTemplate.h:

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (21 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -164 +164 @@
 
 // Hack here to avoid a global with a constructor; point to an unsigned short instead of a UChar.
-static unsigned short almostUChar;
+static UChar sharedEmptyChar;
 UString::Rep UString::Rep::null = { 0, 0, 1, 0, 0, &UString::Rep::null, 0, 0, 0, 0, 0, 0 };
-UString::Rep UString::Rep::empty = { 0, 0, 1, 0, 0, &UString::Rep::empty, 0, reinterpret_cast<UChar*>(&almostUChar), 0, 0, 0, 0 };
+UString::Rep UString::Rep::empty = { 0, 0, 1, 0, 0, &UString::Rep::empty, 0, &sharedEmptyChar, 0, 0, 0, 0 };
 const int normalStatBufferSize = 4096;
 static char *statBuffer = 0; // FIXME: This buffer is never deallocated.
@@ -265 +265 @@
   // Main loop
   for (; l > 0; l--) {
-    hash += s[0].uc;
-    tmp = (s[1].uc << 11) ^ hash;
+    hash += s[0];
+    tmp = (s[1] << 11) ^ hash;
     hash = (hash << 16) ^ tmp;
     s += 2;
@@ -274 +274 @@
   // Handle end case
   if (rem) {
-    hash += s[0].uc;
+    hash += s[0];
     hash ^= hash << 11;
     hash += hash >> 17;
@@ -430 +430 @@
   else {
       for (size_t i = 0; i < length; i++)
-          d[i].uc = c[i];
+          d[i] = static_cast<unsigned char>(c[i]); // use unsigned char to zero-extend instead of sign-extend
       m_rep = Rep::create(d, static_cast<int>(length));
   }
@@ -710 +710 @@
 }
 
-UString &UString::append(const UString &t)
+UString& UString::append(const UString &t)
 {
   int thisSize = size();
@@ -755 +755 @@
 }
 
-UString &UString::append(const char *t)
+UString& UString::append(const char *t)
 {
   int thisSize = size();
@@ -774 +774 @@
     if (d) {
         for (int i = 0; i < tSize; ++i)
-            d[thisSize + i] = t[i];
+            d[thisSize + i] = static_cast<unsigned char>(t[i]); // use unsigned char to zero-extend instead of sign-extend
         m_rep->len = length;
         m_rep->_hash = 0;
@@ -784 +784 @@
     if (d) {
         for (int i = 0; i < tSize; ++i)
-            d[thisSize + i] = t[i];
+            d[thisSize + i] = static_cast<unsigned char>(t[i]); // use unsigned char to zero-extend instead of sign-extend
         m_rep = Rep::create(m_rep, 0, length);
     }
@@ -796 +796 @@
         memcpy(d, data(), thisSize * sizeof(UChar));
         for (int i = 0; i < tSize; ++i)
-            d[thisSize + i] = t[i];
+            d[thisSize + i] = static_cast<unsigned char>(t[i]); // use unsigned char to zero-extend instead of sign-extend
         m_rep = Rep::create(d, length);
         m_rep->capacity = newCapacity;
@@ -805 +805 @@
 }
 
-UString &UString::append(unsigned short c)
+UString& UString::append(UChar c)
 {
   int thisOffset = m_rep->offset;
@@ -880 +880 @@
   const UChar *limit = p + length;
   while (p != limit) {
-    *q = static_cast<char>(p->uc);
+    *q = static_cast<char>(p[0]);
     ++p;
     ++q;
@@ -889 +889 @@
 }
 
-UString &UString::operator=(const char *c)
+UString& UString::operator=(const char *c)
 {
     if (!c) {
@@ -916 +916 @@
   }
   for (int i = 0; i < l; i++)
-    d[i].uc = c[i];
+    d[i] = static_cast<unsigned char>(c[i]); // use unsigned char to zero-extend instead of sign-extend
 
   return *this;
@@ -926 +926 @@
   const UChar *limit = u + size();
   while (u < limit) {
-    if (u->uc > 0xFF)
+    if (u[0] > 0xFF)
       return false;
     ++u;
@@ -1069 +1069 @@
     return 0;
   const UChar *p = m_rep->data();
-  unsigned short c = p->unicode();
+  unsigned short c = p[0];
 
   // If the first digit is 0, only 0 itself is OK.
@@ -1105 +1105 @@
     
     // Get next character.
-    c = (++p)->unicode();
+    c = *(++p);
   }
 }
@@ -1122 +1122 @@
   int fsizeminusone = (fsz - 1) * sizeof(UChar);
   const UChar *fdata = f.data();
-  unsigned short fchar = fdata->uc;
+  unsigned short fchar = fdata[0];
   ++fdata;
   for (const UChar *c = data() + pos; c <= end; c++)
-    if (c->uc == fchar && !memcmp(c + 1, fdata, fsizeminusone))
+    if (c[0] == fchar && !memcmp(c + 1, fdata, fsizeminusone))
       return static_cast<int>(c - data());
 
@@ -1216 +1216 @@
   const UChar *uend = u + s1.size();
   while (u != uend && *s2) {
-    if (u->uc != (unsigned char)*s2)
+    if (u[0] != (unsigned char)*s2)
       return false;
     s2++;
@@ -1239 +1239 @@
   }
   if (l < lmin)
-    return (c1->uc < c2->uc);
+    return (c1[0] < c2[0]);
 
   return (l1 < l2);
@@ -1259 +1259 @@
 
   if (l < lmin)
-    return (c1->uc > c2->uc) ? 1 : -1;
+    return (c1[0] > c2[0]) ? 1 : -1;
 
   if (l1 == l2)
@@ -1275 +1275 @@
   // Convert to runs of 8-bit characters.
   char* p = buffer.data();
-  const ::UChar* d = reinterpret_cast<const ::UChar*>(&data()->uc);
+  const UChar* d = reinterpret_cast<const UChar*>(&data()[0]);
   ConversionResult result = convertUTF16ToUTF8(&d, d + length, &p, p + buffer.size(), strict);
   if (result != conversionOK)