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

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -95 +95 @@
 }
 
-void Lexer::setCode(int startingLineNumber, const KJS::UChar *c, unsigned int len)
+void Lexer::setCode(int startingLineNumber, const UChar* c, unsigned int len)
 {
   yylineno = 1 + startingLineNumber;
@@ -112 +112 @@
 
   // read first characters
-  current = (length > 0) ? code[0].uc : -1;
-  next1 = (length > 1) ? code[1].uc : -1;
-  next2 = (length > 2) ? code[2].uc : -1;
-  next3 = (length > 3) ? code[3].uc : -1;
+  current = (length > 0) ? code[0] : -1;
+  next1 = (length > 1) ? code[1] : -1;
+  next2 = (length > 2) ? code[2] : -1;
+  next3 = (length > 3) ? code[3] : -1;
 }
 
@@ -127 +127 @@
     next1 = next2;
     next2 = next3;
-    next3 = (pos + 3 < length) ? code[pos + 3].uc : -1;
+    next3 = (pos + 3 < length) ? code[pos + 3] : -1;
   }
 }
@@ -428 +428 @@
         break;
       }
-      token = convertUnicode(current, next1, next2, next3).uc;
+      token = convertUnicode(current, next1, next2, next3);
       shift(3);
       if (!isIdentStart(token)) {
@@ -442 +442 @@
         break;
       }
-      token = convertUnicode(current, next1, next2, next3).uc;
+      token = convertUnicode(current, next1, next2, next3);
       shift(3);
       if (!isIdentPart(token)) {
@@ -793 +793 @@
 }
 
-KJS::UChar Lexer::convertUnicode(int c1, int c2, int c3, int c4)
-{
-  return KJS::UChar((convertHex(c1) << 4) + convertHex(c2),
-               (convertHex(c3) << 4) + convertHex(c4));
+UChar Lexer::convertUnicode(int c1, int c2, int c3, int c4)
+{
+    unsigned char highByte = (convertHex(c1) << 4) + convertHex(c2);
+    unsigned char lowByte = (convertHex(c3) << 4) + convertHex(c4);
+    return (highByte << 8 | lowByte);
 }
 
@@ -813 +814 @@
 }
 
-void Lexer::record16(KJS::UChar c)
+void Lexer::record16(UChar c)
 {
     m_buffer16.append(c);
@@ -881 +882 @@
 }
 
-Identifier* Lexer::makeIdentifier(const Vector<KJS::UChar>& buffer)
+Identifier* Lexer::makeIdentifier(const Vector<UChar>& buffer)
 {
     KJS::Identifier* identifier = new KJS::Identifier(buffer.data(), buffer.size());
@@ -888 +889 @@
 }
  
-UString* Lexer::makeUString(const Vector<KJS::UChar>& buffer)
+UString* Lexer::makeUString(const Vector<UChar>& buffer)
 {
     UString* string = new UString(buffer);