Changeset 52075 in webkit for trunk/JavaScriptCore/runtime/JSONObject.cpp

Timestamp:

Dec 13, 2009, 4:27:07 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=32496
Switch remaining cases of string construction to use StringBuilder.
Builds strings using a vector rather than using string append / addition.

Reviewed by Sam Weinig.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Executable.cpp:

(JSC::FunctionExecutable::paramString):

• runtime/FunctionConstructor.cpp:

(JSC::constructFunction):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::encode):
(JSC::decode):
(JSC::globalFuncEscape):
(JSC::globalFuncUnescape):

• runtime/JSONObject.cpp:

(JSC::Stringifier::stringify):
(JSC::Stringifier::indent):

• runtime/JSString.h:
• runtime/LiteralParser.cpp:

(JSC::LiteralParser::Lexer::lexString):

• runtime/NumberPrototype.cpp:

(JSC::integerPartNoExp):
(JSC::numberProtoFuncToFixed):
(JSC::numberProtoFuncToPrecision):

• runtime/Operations.h:

(JSC::jsString):

• runtime/StringPrototype.cpp:

(JSC::substituteBackreferencesSlow):
(JSC::substituteBackreferences):
(JSC::stringProtoFuncConcat):

File:

• trunk/JavaScriptCore/runtime/JSONObject.cpp (modified) (4 diffs)

trunk/JavaScriptCore/runtime/JSONObject.cpp

@@ -33 +33 @@
 #include "LiteralParser.h"
 #include "PropertyNameArray.h"
+#include "StringBuilder.h"
 #include <wtf/MathExtras.h>
 
@@ -71 +72 @@
 
 private:
-    class StringBuilder : public Vector<UChar> {
-    public:
-        using Vector<UChar>::append;
-
-        inline void append(const char* str)
-        {
-            size_t len = strlen(str);
-            reserveCapacity(size() + len);
-            for (size_t i = 0; i < len; i++)
-                Vector<UChar>::append(str[i]);
-        }
-
-        inline void append(const UString& str)
-        {
-            append(str.data(), str.size());
-        }
-    };
-
     class Holder {
     public:
@@ -286 +269 @@
         return jsNull();
 
-    result.shrinkToFit();
-    size_t length = result.size();
-    return jsString(m_exec, UString(result.releaseBuffer(), length, false));
+    return jsString(m_exec, result.release());
 }
 
@@ -478 +459 @@
     int newSize = m_indent.size() + m_gap.size();
     if (newSize > m_repeatedGap.size())
-        m_repeatedGap.append(m_gap);
+        m_repeatedGap = makeString(m_repeatedGap, m_gap);
     ASSERT(newSize <= m_repeatedGap.size());
     m_indent = m_repeatedGap.substr(0, newSize);