Changeset 54531 in webkit for trunk/JavaScriptCore/runtime/UString.h

Timestamp:

Feb 8, 2010, 11:40:57 PM (15 years ago)

Author:

[email protected]

Message:

Make String.replace throw an exception on out-of-memory, rather than
returning a null (err, empty-ish) string. Move String::replaceRange
and String::spliceSubstringsWithSeparators out to StringPrototype -
these were fairly specific use anyway, and we can better integrate
throwing the JS expcetion this way.

Reviewed by Oliver Hunt

Also removes redundant assignment operator from UString.

• JavaScriptCore.exp:
• runtime/StringPrototype.cpp:

(JSC::StringRange::StringRange):
(JSC::jsSpliceSubstringsWithSeparators):
(JSC::jsReplaceRange):
(JSC::stringProtoFuncReplace):

• runtime/UString.cpp:
• runtime/UString.h:

File:

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

trunk/JavaScriptCore/runtime/UString.h

@@ -118 +118 @@
         static UString from(double);
 
-        struct Range {
-        public:
-            Range(int pos, int len)
-                : position(pos)
-                , length(len)
-            {
-            }
-
-            Range()
-            {
-            }
-
-            int position;
-            int length;
-        };
-
-        UString spliceSubstringsWithSeparators(const Range* substringRanges, int rangeCount, const UString* separators, int separatorCount) const;
-
-        UString replaceRange(int rangeStart, int RangeEnd, const UString& replacement) const;
-
         bool getCString(CStringBuffer&) const;
 
@@ -153 +133 @@
          */
         CString UTF8String(bool strict = false) const;
-
-        UString& operator=(const char*c);
 
         const UChar* data() const { return m_rep->data(); }