Changeset 52075 in webkit for trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.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/JSGlobalObjectFunctions.cpp (modified) (7 diffs)

trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -28 +28 @@
 #include "CallFrame.h"
 #include "GlobalEvalFunction.h"
+#include "Interpreter.h"
 #include "JSGlobalObject.h"
+#include "JSString.h"
+#include "Lexer.h"
 #include "LiteralParser.h"
-#include "JSString.h"
-#include "Interpreter.h"
+#include "Nodes.h"
 #include "Parser.h"
+#include "StringBuilder.h"
 #include "dtoa.h"
-#include "Lexer.h"
-#include "Nodes.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -56 +57 @@
         return throwError(exec, URIError, "String contained an illegal UTF-16 sequence.");
 
-    UString result = "";
+    StringBuilder builder;
     const char* p = cstr.c_str();
     for (size_t k = 0; k < cstr.size(); k++, p++) {
         char c = *p;
         if (c && strchr(doNotEscape, c))
-            result.append(c);
+            builder.append(c);
         else {
             char tmp[4];
-            sprintf(tmp, "%%%02X", static_cast<unsigned char>(c));
-            result += tmp;
-        }
-    }
-    return jsString(exec, result);
+            snprintf(tmp, 4, "%%%02X", static_cast<unsigned char>(c));
+            builder.append((const char*)tmp);
+        }
+    }
+    return jsString(exec, builder.release());
 }
 
 static JSValue decode(ExecState* exec, const ArgList& args, const char* doNotUnescape, bool strict)
 {
-    UString result = "";
+    StringBuilder builder;
     UString str = args.at(0).toString(exec);
     int k = 0;
@@ -107 +108 @@
                         else if (character >= 0x10000) {
                             // Convert to surrogate pair.
-                            result.append(static_cast<UChar>(0xD800 | ((character - 0x10000) >> 10)));
+                            builder.append(static_cast<UChar>(0xD800 | ((character - 0x10000) >> 10)));
                             u = static_cast<UChar>(0xDC00 | ((character - 0x10000) & 0x3FF));
                         } else
@@ -132 +133 @@
         }
         k++;
-        result.append(c);
-    }
-    return jsString(exec, result);
+        builder.append(c);
+    }
+    return jsString(exec, builder.release());
 }
 
@@ -377 +378 @@
         "*+-./@_";
 
-    UString result = "";
+    StringBuilder builder;
     UString s;
     UString str = args.at(0).toString(exec);
@@ -394 +395 @@
             s = UString(tmp);
         }
-        result += s;
-    }
-
-    return jsString(exec, result);
+        builder.append(s);
+    }
+
+    return jsString(exec, builder.release());
 }
 
 JSValue JSC_HOST_CALL globalFuncUnescape(ExecState* exec, JSObject*, JSValue, const ArgList& args)
 {
-    UString result = "";
+    StringBuilder builder;
     UString str = args.at(0).toString(exec);
     int k = 0;
@@ -421 +422 @@
         }
         k++;
-        result.append(*c);
-    }
-
-    return jsString(exec, result);
+        builder.append(*c);
+    }
+
+    return jsString(exec, builder.release());
 }