Changeset 69663 in webkit for trunk/JavaScriptCore/runtime/JSStringBuilder.h

Timestamp:

Oct 13, 2010, 7:44:14 AM (15 years ago)

Author:

Nikolas Zimmermann

Message:

2010-10-13 Nikolas Zimmermann <​[email protected]>

Reviewed by Dirk Schulze.

Add wtf/text/StringConcatenate
​https://bugs.webkit.org/show_bug.cgi?id=47584

Move runtime/StringConcatenate.h to wtf/text, make it work for Strings too.
Add a special runtime/UStringConcatenate.h class that inherits from StringConcatenate, and extends it for use with UString.
Exactly the same design that has been followed while refactoring StringBuilder.

The UString variants can all be removed as soon as WTF::String & JSC::UString converge.

• GNUmakefile.am: Add wtf/text/StringConcatenate.h and runtime/UStringConcatenate.h.
• JavaScriptCore.gypi: Ditto.
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Ditto.
• JavaScriptCore.vcproj/WTF/WTF.vcproj: Ditto.
• JavaScriptCore.xcodeproj/project.pbxproj: Ditto.
• bytecode/CodeBlock.cpp: s/makeString/makeUString/ (JSC::escapeQuotes): (JSC::valueToSourceString): (JSC::constantName): (JSC::idName): (JSC::CodeBlock::registerName): (JSC::regexpToSourceString): (JSC::regexpName):
• bytecompiler/NodesCodegen.cpp: Ditto. (JSC::substitute):
• profiler/Profiler.cpp: Ditto. (JSC::Profiler::createCallIdentifier):
• runtime/ExceptionHelpers.cpp: Ditto. (JSC::createUndefinedVariableError): (JSC::createErrorMessage): (JSC::createInvalidParamError):
• runtime/FunctionConstructor.cpp: Ditto. (JSC::constructFunction):
• runtime/FunctionPrototype.cpp: Ditto. (JSC::insertSemicolonIfNeeded):
• runtime/JSONObject.cpp: Ditto. (JSC::Stringifier::indent):
• runtime/JSStringBuilder.h: (JSC::jsMakeNontrivialString):
• runtime/RegExpConstructor.cpp: Ditto. (JSC::constructRegExp):
• runtime/RegExpObject.cpp: Ditto. (JSC::RegExpObject::match):
• runtime/RegExpPrototype.cpp: Ditto. (JSC::regExpProtoFuncCompile):
• runtime/StringConcatenate.h: Removed.
• runtime/UStringConcatenate.h: Added. Only contains the StringTypeAdapter<JSC::UString> code and the makeUString variants, the rest lives in wtf/text/StringConcatenate.h (JSC::makeUString):
• wtf/text/StringConcatenate.h: Copied from runtime/StringConcatenate.h. (WTF::makeString):

File:

• trunk/JavaScriptCore/runtime/JSStringBuilder.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/JSStringBuilder.h

@@ -29 +29 @@
 #include "ExceptionHelpers.h"
 #include "JSString.h"
-#include "StringConcatenate.h"
+#include "UStringConcatenate.h"
 #include "Vector.h"
 
@@ -88 +88 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2)
 {
-    PassRefPtr<StringImpl> result = tryMakeString(string1, string2);
+    PassRefPtr<StringImpl> result = WTF::tryMakeString(string1, string2);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -97 +97 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3)
 {
-    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3);
+    PassRefPtr<StringImpl> result = WTF::tryMakeString(string1, string2, string3);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -106 +106 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
 {
-    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3, string4);
+    PassRefPtr<StringImpl> result = WTF::tryMakeString(string1, string2, string3, string4);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -115 +115 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
 {
-    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3, string4, string5);
+    PassRefPtr<StringImpl> result = WTF::tryMakeString(string1, string2, string3, string4, string5);
     if (!result)
         return throwOutOfMemoryError(exec);
@@ -124 +124 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
 {
-    PassRefPtr<StringImpl> result = tryMakeString(string1, string2, string3, string4, string5, string6);
+    PassRefPtr<StringImpl> result = WTF::tryMakeString(string1, string2, string3, string4, string5, string6);
     if (!result)
         return throwOutOfMemoryError(exec);