Changeset 65286 in webkit for trunk/JavaScriptCore/runtime

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[]):

Location:

trunk/JavaScriptCore/runtime

Files:

• RegExpKey.h (modified) (1 diff)
• SmallStrings.cpp (modified) (1 diff)
• UString.cpp (modified) (2 diffs)
• UString.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/RegExpKey.h

@@ -59 +59 @@
     }
 
+    RegExpKey(int flags, const RefPtr<StringImpl>& pattern)
+        : flagsValue(flags)
+        , pattern(pattern)
+    {
+    }
+
     RegExpKey(const UString& flags, const UString& pattern)
         : pattern(pattern.impl())

trunk/JavaScriptCore/runtime/SmallStrings.cpp

@@ -130 +130 @@
         m_storage = adoptPtr(new SmallStringsStorage);
     ASSERT(!m_singleCharacterStrings[character]);
-    m_singleCharacterStrings[character] = new (globalData) JSString(globalData, m_storage->rep(character), JSString::HasOtherOwner);
+    m_singleCharacterStrings[character] = new (globalData) JSString(globalData, PassRefPtr<StringImpl>(m_storage->rep(character)), JSString::HasOtherOwner);
 }
 

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];
 }
 

trunk/JavaScriptCore/runtime/UString.h

@@ -44 +44 @@
 class UString {
 public:
-    UString() {}
-    UString(const char*); // Constructor for null-terminated string.
-    UString(const char*, unsigned length);
-    UString(const UChar*, unsigned length);
-    UString(const Vector<UChar>& buffer);
-
-    UString(const UString& s)
-        : m_impl(s.m_impl)
-    {
-    }
-
-    // Special constructor for cases where we overwrite an object in place.
-    UString(PlacementNewAdoptType)
-        : m_impl(PlacementNewAdopt)
-    {
-    }
+    // Construct a null string, distinguishable from an empty string.
+    UString() { }
+
+    // Construct a string with UTF-16 data.
+    UString(const UChar* characters, unsigned length)
+        : m_impl(characters ? StringImpl::create(characters, length) : 0)
+    {
+    }
+
+    // Construct a string with UTF-16 data, from a null-terminated source.
+    UString(const UChar*);
+
+    // Construct a string with latin1 data.
+    UString(const char* characters)
+        : m_impl(characters ? StringImpl::create(characters) : 0)
+    {
+    }
+
+    // Construct a string with latin1 data, from a null-terminated source.
+    UString(const char* characters, unsigned length)
+        : m_impl(characters ? StringImpl::create(characters, length) : 0)
+    {
+    }
+
+    // Construct a string referencing an existing StringImpl.
+    UString(StringImpl* impl) : m_impl(impl) { }
+    UString(PassRefPtr<StringImpl> impl) : m_impl(impl) { }
+    UString(RefPtr<StringImpl> impl) : m_impl(impl) { }
+
+    void swap(UString& o) { m_impl.swap(o.m_impl); }
 
     template<size_t inlineCapacity>
-    static PassRefPtr<StringImpl> adopt(Vector<UChar, inlineCapacity>& vector)
-    {
-        return StringImpl::adopt(vector);
-    }
+    static UString adopt(Vector<UChar, inlineCapacity>& vector) { return StringImpl::adopt(vector); }
 
     static UString number(int);
@@ -101 +112 @@
     }
 
-    UChar operator[](unsigned pos) const;
+    UChar operator[](unsigned index) const
+    {
+        if (!m_impl || index >= m_impl->length())
+            return 0;
+        return m_impl->characters()[index];
+    }
 
     double toDouble(bool tolerateTrailingJunk, bool tolerateEmptyString) const;
@@ -125 +141 @@
 
     StringImpl* impl() const { return m_impl.get(); }
-
-    UString(PassRefPtr<StringImpl> r)
-        : m_impl(r)
-    {
-    }
 
     size_t cost() const