Changeset 30942 in webkit for trunk/JavaScriptCore/kjs/function.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/function.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -516 +516 @@
     if (c == '%') {
       int charLen = 0;
-      if (k <= len - 3 && isASCIIHexDigit(p[1].uc) && isASCIIHexDigit(p[2].uc)) {
-        const char b0 = Lexer::convertHex(p[1].uc, p[2].uc);
+      if (k <= len - 3 && isASCIIHexDigit(p[1]) && isASCIIHexDigit(p[2])) {
+        const char b0 = Lexer::convertHex(p[1], p[2]);
         const int sequenceLen = UTF8SequenceLength(b0);
         if (sequenceLen != 0 && k <= len - sequenceLen * 3) {
@@ -525 +525 @@
           for (int i = 1; i < sequenceLen; ++i) {
             const UChar* q = p + i * 3;
-            if (q[0] == '%' && isASCIIHexDigit(q[1].uc) && isASCIIHexDigit(q[2].uc))
-              sequence[i] = Lexer::convertHex(q[1].uc, q[2].uc);
+            if (q[0] == '%' && isASCIIHexDigit(q[1]) && isASCIIHexDigit(q[2]))
+              sequence[i] = Lexer::convertHex(q[1], q[2]);
             else {
               charLen = 0;
@@ -553 +553 @@
         // For that, it's good to support the wonky "%u" syntax for compatibility with WinIE.
         if (k <= len - 6 && p[1] == 'u'
-            && isASCIIHexDigit(p[2].uc) && isASCIIHexDigit(p[3].uc)
-            && isASCIIHexDigit(p[4].uc) && isASCIIHexDigit(p[5].uc)) {
+            && isASCIIHexDigit(p[2]) && isASCIIHexDigit(p[3])
+            && isASCIIHexDigit(p[4]) && isASCIIHexDigit(p[5])) {
           charLen = 6;
-          u = Lexer::convertUnicode(p[2].uc, p[3].uc, p[4].uc, p[5].uc);
+          u = Lexer::convertUnicode(p[2], p[3], p[4], p[5]);
         }
       }
-      if (charLen && (u.uc == 0 || u.uc >= 128 || !strchr(do_not_unescape, u.low()))) {
+      if (charLen && (u == 0 || u >= 128 || !strchr(do_not_unescape, u))) {
         c = u;
         k += charLen - 1;
@@ -632 +632 @@
     int p = 0;
 
-    while (p < length && isStrWhiteSpace(s[p].uc)) {
+    while (p < length && isStrWhiteSpace(s[p])) {
         ++p;
     }
@@ -663 +663 @@
     double number = 0;
     while (p < length) {
-        int digit = parseDigit(s[p].uc, radix);
+        int digit = parseDigit(s[p], radix);
         if (digit == -1)
             break;
@@ -691 +691 @@
     int length = s.size();
     int p = 0;
-    while (p < length && isStrWhiteSpace(s[p].uc)) {
+    while (p < length && isStrWhiteSpace(s[p])) {
         ++p;
     }
@@ -817 +817 @@
     const UChar* c = str.data();
     for (int k = 0; k < str.size(); k++, c++) {
-        int u = c->uc;
+        int u = c[0];
         if (u > 255) {
             char tmp[7];
@@ -842 +842 @@
         const UChar* c = str.data() + k;
         UChar u;
-        if (*c == UChar('%') && k <= len - 6 && *(c + 1) == UChar('u')) {
-            if (Lexer::isHexDigit((c + 2)->uc) && Lexer::isHexDigit((c + 3)->uc) && Lexer::isHexDigit((c + 4)->uc) && Lexer::isHexDigit((c + 5)->uc)) {
-                u = Lexer::convertUnicode((c + 2)->uc, (c + 3)->uc, (c + 4)->uc, (c + 5)->uc);
+        if (c[0] == '%' && k <= len - 6 && c[1] == 'u') {
+            if (Lexer::isHexDigit(c[2]) && Lexer::isHexDigit(c[3]) && Lexer::isHexDigit(c[4]) && Lexer::isHexDigit(c[5])) {
+                u = Lexer::convertUnicode(c[2], c[3], c[4], c[5]);
                 c = &u;
                 k += 5;
             }
-        } else if (*c == UChar('%') && k <= len - 3 && Lexer::isHexDigit((c + 1)->uc) && Lexer::isHexDigit((c + 2)->uc)) {
-            u = UChar(Lexer::convertHex((c+1)->uc, (c+2)->uc));
+        } else if (c[0] == '%' && k <= len - 3 && Lexer::isHexDigit(c[1]) && Lexer::isHexDigit(c[2])) {
+            u = UChar(Lexer::convertHex(c[1], c[2]));
             c = &u;
             k += 2;