Changeset 65286 in webkit for trunk/JavaScriptCore/runtime/UString.cpp

Timestamp:

Aug 12, 2010, 6:05:10 PM (15 years ago)

Author:

[email protected]

Message:

Change UString constructors to match those in WTF::String.
This changes behaviour of UString((char*)0) to create null
strings, akin to UString() rather than UString::empty().
(This matches String). Remove unused constructors from
UString, and add null-terminated UTF-16 constructor, to
match String. Move String's constructor into the .cpp to
match UString.

Reviewed by Sam Weinig

• JavaScriptCore.exp:
• debugger/DebuggerCallFrame.cpp:

(JSC::DebuggerCallFrame::calculatedFunctionName):

• runtime/RegExpKey.h:

(JSC::RegExpKey::RegExpKey):

• runtime/SmallStrings.cpp:

(JSC::SmallStrings::createSingleCharacterString):

• runtime/UString.cpp:

(JSC::UString::UString):

• runtime/UString.h:

(JSC::UString::UString):
(JSC::UString::swap):
(JSC::UString::adopt):
(JSC::UString::operator[]):

• wtf/text/WTFString.h:

(WTF::String::String):
(WTF::String::adopt):
(WTF::String::operator[]):

File:

• trunk/JavaScriptCore/runtime/UString.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/UString.cpp

@@ -57 +57 @@
 COMPILE_ASSERT(sizeof(UString) == sizeof(void*), UString_should_stay_small);
 
-UString::UString(const char* c)
-    : m_impl(StringImpl::create(c))
-{
-}
-
-UString::UString(const char* c, unsigned length)
-    : m_impl(StringImpl::create(c, length))
-{
-}
-
-UString::UString(const UChar* c, unsigned length)
-    : m_impl(StringImpl::create(c, length))
-{
-}
+//    UString::UString(const UChar* characters, unsigned length)
+//        : m_impl(characters ? StringImpl::create(characters, length) : 0)
+//    {
+//    }
+UString::UString(const UChar* characters)
+{
+    if (!characters)
+        return;
+
+    int length = 0;
+    while (characters[length] != UChar(0))
+        ++length;
+
+    m_impl = StringImpl::create(characters, length);
+}
+//    UString::UString(const char* characters)
+//        : m_impl(characters ? StringImpl::create(characters) : 0)
+//    {
+//    }
+//    UString::UString(const char* characters, unsigned length)
+//        : m_impl(characters ? StringImpl::create(characters, length) : 0)
+//    {
+//    }
 
 UString UString::number(int i)
@@ -209 +218 @@
 
     return asciiBuffer;
-}
-
-UChar UString::operator[](unsigned pos) const
-{
-    if (pos >= length())
-        return '\0';
-    return characters()[pos];
 }