<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187815] trunk/Source/WTF</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187815">187815</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-08-03 23:27:12 -0700 (Mon, 03 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WTF] Turn tryMakeString(), makeString() into variadic templates
https://bugs.webkit.org/show_bug.cgi?id=147142
Reviewed by Sam Weinig.
Built upon the original work by Anders Carlsson, Mark Rowe and Sam Weinig.
Implement tryMakeString() and makeString() as variadic templates, replacing
the argument count-based overloads.
tryMakeString() now constructs a stack-based tuple of necessary StringTypeAdapter
objects and utilizes the StringAdapterTuple struct template to operate on that
tuple, recursively calling the necessary operations on each element in the tuple.
This effectively mimics the process of previous tryMakeString() implementation,
but makes it scalable to a tuple of elements that are to be concatenated.
StringAppend class template now stores two StringTypeAdapter objects for the
two passed-in string objects, packed in a tuple, calling
StringAdapterTuple<>::createString() directly when concatenating the two objects
into one String.
* wtf/text/StringConcatenate.h:
(WTF::StringTypeAdapter<char>::length):
(WTF::StringTypeAdapter<char>::is8Bit):
(WTF::StringAdapterTuple::sumWithOverflow):
(WTF::StringAdapterTuple::is8Bit):
(WTF::StringAdapterTuple::writeTo):
(WTF::StringAdapterTuple::createString):
(WTF::tryMakeString):
(WTF::makeString):
(WTF::sumWithOverflow): Deleted.
* wtf/text/StringOperators.h:
(WTF::StringAppend::StringAppend):
(WTF::StringAppend::operator String):
(WTF::StringAppend::is8Bit):
(WTF::StringAppend::writeTo):
(WTF::StringAppend::length):
(WTF::StringAppend::string1):
(WTF::StringAppend::string2):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringConcatenateh">trunk/Source/WTF/wtf/text/StringConcatenate.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringOperatorsh">trunk/Source/WTF/wtf/text/StringOperators.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (187814 => 187815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-08-04 06:05:35 UTC (rev 187814)
+++ trunk/Source/WTF/ChangeLog 2015-08-04 06:27:12 UTC (rev 187815)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-08-03 Zan Dobersek <zdobersek@igalia.com>
+
+ [WTF] Turn tryMakeString(), makeString() into variadic templates
+ https://bugs.webkit.org/show_bug.cgi?id=147142
+
+ Reviewed by Sam Weinig.
+
+ Built upon the original work by Anders Carlsson, Mark Rowe and Sam Weinig.
+
+ Implement tryMakeString() and makeString() as variadic templates, replacing
+ the argument count-based overloads.
+
+ tryMakeString() now constructs a stack-based tuple of necessary StringTypeAdapter
+ objects and utilizes the StringAdapterTuple struct template to operate on that
+ tuple, recursively calling the necessary operations on each element in the tuple.
+ This effectively mimics the process of previous tryMakeString() implementation,
+ but makes it scalable to a tuple of elements that are to be concatenated.
+
+ StringAppend class template now stores two StringTypeAdapter objects for the
+ two passed-in string objects, packed in a tuple, calling
+ StringAdapterTuple<>::createString() directly when concatenating the two objects
+ into one String.
+
+ * wtf/text/StringConcatenate.h:
+ (WTF::StringTypeAdapter<char>::length):
+ (WTF::StringTypeAdapter<char>::is8Bit):
+ (WTF::StringAdapterTuple::sumWithOverflow):
+ (WTF::StringAdapterTuple::is8Bit):
+ (WTF::StringAdapterTuple::writeTo):
+ (WTF::StringAdapterTuple::createString):
+ (WTF::tryMakeString):
+ (WTF::makeString):
+ (WTF::sumWithOverflow): Deleted.
+ * wtf/text/StringOperators.h:
+ (WTF::StringAppend::StringAppend):
+ (WTF::StringAppend::operator String):
+ (WTF::StringAppend::is8Bit):
+ (WTF::StringAppend::writeTo):
+ (WTF::StringAppend::length):
+ (WTF::StringAppend::string1):
+ (WTF::StringAppend::string2):
+
</ins><span class="cx"> 2015-08-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to use String::utf8() in the debugger
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringConcatenateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringConcatenate.h (187814 => 187815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringConcatenate.h 2015-08-04 06:05:35 UTC (rev 187814)
+++ trunk/Source/WTF/wtf/text/StringConcatenate.h 2015-08-04 06:27:12 UTC (rev 187815)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned length() { return 1; }
- bool is8Bit() { return true; }
</del><ins>+ unsigned length() const { return 1; }
+ bool is8Bit() const { return true; }
</ins><span class="cx">
</span><span class="cx"> void writeTo(LChar* destination) const
</span><span class="cx"> {
</span><span class="lines">@@ -98,6 +98,74 @@
</span><span class="cx"> UChar m_character;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<size_t stringLiteralLength>
+class StringTypeAdapter<char[stringLiteralLength]> {
+public:
+ StringTypeAdapter(const char (&stringLiteral)[stringLiteralLength])
+ : m_string(reinterpret_cast<const LChar*>(stringLiteral))
+ {
+ }
+
+ unsigned length() const { return stringLiteralLength - 1; }
+ bool is8Bit() const { return true; }
+
+ void writeTo(LChar* destination) const
+ {
+ StringView(m_string, length()).getCharactersWithUpconvert(destination);
+ }
+
+ void writeTo(UChar* destination) const
+ {
+ StringView(m_string, length()).getCharactersWithUpconvert(destination);
+ }
+
+private:
+ const LChar* m_string;
+};
+
+template<size_t stringLiteralLength>
+class StringTypeAdapter<const char[stringLiteralLength]> : public StringTypeAdapter<char[stringLiteralLength]> {
+public:
+ StringTypeAdapter(const char (&stringLiteral)[stringLiteralLength])
+ : StringTypeAdapter<char[stringLiteralLength]>(stringLiteral)
+ {
+ }
+};
+
+template<size_t stringLiteralLength>
+class StringTypeAdapter<UChar[stringLiteralLength]> {
+public:
+ StringTypeAdapter(const UChar (&stringLiteral)[stringLiteralLength])
+ : m_string(reinterpret_cast<const UChar*>(stringLiteral))
+ {
+ }
+
+ unsigned length() const { return stringLiteralLength - 1; }
+ bool is8Bit() const { return false; }
+
+ NO_RETURN_DUE_TO_CRASH void writeTo(LChar*) const
+ {
+ CRASH();
+ }
+
+ void writeTo(UChar* destination) const
+ {
+ StringView(m_string, length()).getCharactersWithUpconvert(destination);
+ }
+
+private:
+ const UChar* m_string;
+};
+
+template<size_t stringLiteralLength>
+class StringTypeAdapter<const UChar[stringLiteralLength]> : public StringTypeAdapter<UChar[stringLiteralLength]> {
+public:
+ StringTypeAdapter(const UChar (&stringLiteral)[stringLiteralLength])
+ : StringTypeAdapter<UChar[stringLiteralLength]>(stringLiteral)
+ {
+ }
+};
+
</ins><span class="cx"> template<>
</span><span class="cx"> class StringTypeAdapter<const LChar*> {
</span><span class="cx"> public:
</span><span class="lines">@@ -247,574 +315,87 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline void sumWithOverflow(unsigned& total, unsigned addend, bool& overflow)
-{
- unsigned oldTotal = total;
- total = oldTotal + addend;
- if (total < oldTotal)
- overflow = true;
-}
-
-template<typename StringType1, typename StringType2>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2)
-{
- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
-
- return WTF::move(resultImpl);
</del><ins>+template<size_t index, typename... Adapters>
+struct StringAdapterTuple {
+ static inline Checked<unsigned, RecordOverflow> sumWithOverflow(const std::tuple<Adapters...>& tuple)
+ {
+ auto& adapter = std::get<sizeof...(Adapters) - index>(tuple);
+ return Checked<unsigned, RecordOverflow>(adapter.length()) + StringAdapterTuple<index - 1, Adapters...>::sumWithOverflow(tuple);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- UChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
-
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3)
-{
- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
- StringTypeAdapter<StringType3> adapter3(string3);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- sumWithOverflow(length, adapter3.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
-
- return WTF::move(resultImpl);
</del><ins>+ static inline bool is8Bit(const std::tuple<Adapters...>& tuple)
+ {
+ auto& adapter = std::get<sizeof...(Adapters) - index>(tuple);
+ return adapter.is8Bit() && StringAdapterTuple<index - 1, Adapters...>::is8Bit(tuple);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- UChar* buffer = 0;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
-
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
-{
- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
- StringTypeAdapter<StringType3> adapter3(string3);
- StringTypeAdapter<StringType4> adapter4(string4);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- sumWithOverflow(length, adapter3.length(), overflow);
- sumWithOverflow(length, adapter4.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
-
- return WTF::move(resultImpl);
</del><ins>+ template<typename T>
+ static inline void writeTo(T* buffer, const std::tuple<Adapters...>& tuple)
+ {
+ auto& adapter = std::get<sizeof...(Adapters) - index>(tuple);
+ adapter.writeTo(buffer);
+ StringAdapterTuple<index - 1, Adapters...>::writeTo(buffer + adapter.length(), tuple);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- UChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
-
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
-{
- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
- StringTypeAdapter<StringType3> adapter3(string3);
- StringTypeAdapter<StringType4> adapter4(string4);
- StringTypeAdapter<StringType5> adapter5(string5);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- sumWithOverflow(length, adapter3.length(), overflow);
- sumWithOverflow(length, adapter4.length(), overflow);
- sumWithOverflow(length, adapter5.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
</del><ins>+ static inline RefPtr<StringImpl> createString(const std::tuple<Adapters...>& adapters)
+ {
+ unsigned length = 0;
+ if (sumWithOverflow(adapters).safeGet(length) == CheckedState::DidOverflow)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
</del><ins>+ if (is8Bit(adapters)) {
+ LChar* buffer;
+ RefPtr<StringImpl> result = StringImpl::tryCreateUninitialized(length, buffer);
+ if (!result)
+ return nullptr;
</ins><span class="cx">
</span><del>- return WTF::move(resultImpl);
- }
</del><ins>+ writeTo(buffer, adapters);
+ return result;
+ }
</ins><span class="cx">
</span><del>- UChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
-
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
-{
- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
- StringTypeAdapter<StringType3> adapter3(string3);
- StringTypeAdapter<StringType4> adapter4(string4);
- StringTypeAdapter<StringType5> adapter5(string5);
- StringTypeAdapter<StringType6> adapter6(string6);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- sumWithOverflow(length, adapter3.length(), overflow);
- sumWithOverflow(length, adapter4.length(), overflow);
- sumWithOverflow(length, adapter5.length(), overflow);
- sumWithOverflow(length, adapter6.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
</del><ins>+ UChar* buffer;
+ RefPtr<StringImpl> result = StringImpl::tryCreateUninitialized(length, buffer);
+ if (!result)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
-
- return WTF::move(resultImpl);
</del><ins>+ writeTo(buffer, adapters);
+ return result;
</ins><span class="cx"> }
</span><ins>+};
</ins><span class="cx">
</span><del>- UChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
</del><ins>+template<typename... Adapters>
+struct StringAdapterTuple<0, Adapters...> {
+ static Checked<unsigned, RecordOverflow> sumWithOverflow(const std::tuple<Adapters...>&) { return 0; }
+ static bool is8Bit(const std::tuple<Adapters...>&) { return true; }
+ template<typename T> static void writeTo(T*, const std::tuple<Adapters...>&) { }
+};
</ins><span class="cx">
</span><del>- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
</del><ins>+template<typename T>
+using AdapterType = StringTypeAdapter<typename std::decay<T>::type>;
</ins><span class="cx">
</span><del>- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7)
</del><ins>+template<typename T1, typename T2, typename... Ts>
+RefPtr<StringImpl> tryMakeString(const T1& string1, const T2& string2, const Ts&... strings)
</ins><span class="cx"> {
</span><del>- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
- StringTypeAdapter<StringType3> adapter3(string3);
- StringTypeAdapter<StringType4> adapter4(string4);
- StringTypeAdapter<StringType5> adapter5(string5);
- StringTypeAdapter<StringType6> adapter6(string6);
- StringTypeAdapter<StringType7> adapter7(string7);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- sumWithOverflow(length, adapter3.length(), overflow);
- sumWithOverflow(length, adapter4.length(), overflow);
- sumWithOverflow(length, adapter5.length(), overflow);
- sumWithOverflow(length, adapter6.length(), overflow);
- sumWithOverflow(length, adapter7.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit() && adapter7.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
- result += adapter6.length();
- adapter7.writeTo(result);
-
- return WTF::move(resultImpl);
- }
-
- UChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
- result += adapter6.length();
- adapter7.writeTo(result);
-
- return WTF::move(resultImpl);
</del><ins>+ auto adapters = std::make_tuple(AdapterType<T1>(string1), AdapterType<T2>(string2), AdapterType<Ts>(strings)...);
+ return StringAdapterTuple<2 + sizeof...(Ts), AdapterType<T1>, AdapterType<T2>, AdapterType<Ts>...>::createString(adapters);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8)
-{
- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
- StringTypeAdapter<StringType3> adapter3(string3);
- StringTypeAdapter<StringType4> adapter4(string4);
- StringTypeAdapter<StringType5> adapter5(string5);
- StringTypeAdapter<StringType6> adapter6(string6);
- StringTypeAdapter<StringType7> adapter7(string7);
- StringTypeAdapter<StringType8> adapter8(string8);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- sumWithOverflow(length, adapter3.length(), overflow);
- sumWithOverflow(length, adapter4.length(), overflow);
- sumWithOverflow(length, adapter5.length(), overflow);
- sumWithOverflow(length, adapter6.length(), overflow);
- sumWithOverflow(length, adapter7.length(), overflow);
- sumWithOverflow(length, adapter8.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit() && adapter7.is8Bit() && adapter8.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
- result += adapter6.length();
- adapter7.writeTo(result);
- result += adapter7.length();
- adapter8.writeTo(result);
-
- return WTF::move(resultImpl);
- }
-
- UChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
- result += adapter6.length();
- adapter7.writeTo(result);
- result += adapter7.length();
- adapter8.writeTo(result);
-
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8, typename StringType9>
-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8, StringType9 string9)
-{
- StringTypeAdapter<StringType1> adapter1(string1);
- StringTypeAdapter<StringType2> adapter2(string2);
- StringTypeAdapter<StringType3> adapter3(string3);
- StringTypeAdapter<StringType4> adapter4(string4);
- StringTypeAdapter<StringType5> adapter5(string5);
- StringTypeAdapter<StringType6> adapter6(string6);
- StringTypeAdapter<StringType7> adapter7(string7);
- StringTypeAdapter<StringType8> adapter8(string8);
- StringTypeAdapter<StringType9> adapter9(string9);
-
- bool overflow = false;
- unsigned length = adapter1.length();
- sumWithOverflow(length, adapter2.length(), overflow);
- sumWithOverflow(length, adapter3.length(), overflow);
- sumWithOverflow(length, adapter4.length(), overflow);
- sumWithOverflow(length, adapter5.length(), overflow);
- sumWithOverflow(length, adapter6.length(), overflow);
- sumWithOverflow(length, adapter7.length(), overflow);
- sumWithOverflow(length, adapter8.length(), overflow);
- sumWithOverflow(length, adapter9.length(), overflow);
- if (overflow)
- return nullptr;
-
- if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit() && adapter7.is8Bit() && adapter8.is8Bit() && adapter9.is8Bit()) {
- LChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- LChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
- result += adapter6.length();
- adapter7.writeTo(result);
- result += adapter7.length();
- adapter8.writeTo(result);
- result += adapter8.length();
- adapter9.writeTo(result);
-
- return WTF::move(resultImpl);
- }
-
- UChar* buffer;
- RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
- if (!resultImpl)
- return nullptr;
-
- UChar* result = buffer;
- adapter1.writeTo(result);
- result += adapter1.length();
- adapter2.writeTo(result);
- result += adapter2.length();
- adapter3.writeTo(result);
- result += adapter3.length();
- adapter4.writeTo(result);
- result += adapter4.length();
- adapter5.writeTo(result);
- result += adapter5.length();
- adapter6.writeTo(result);
- result += adapter6.length();
- adapter7.writeTo(result);
- result += adapter7.length();
- adapter8.writeTo(result);
- result += adapter8.length();
- adapter9.writeTo(result);
-
- return WTF::move(resultImpl);
-}
-
-
</del><span class="cx"> // Convenience only.
</span><del>-template<typename StringType1>
-String makeString(StringType1 string1)
</del><ins>+template<typename T>
+String makeString(T&& string)
</ins><span class="cx"> {
</span><del>- return String(string1);
</del><ins>+ return std::forward<T>(string);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename StringType1, typename StringType2>
-String makeString(StringType1 string1, StringType2 string2)
</del><ins>+template<typename T1, typename T2, typename... Ts>
+String makeString(const T1& string1, const T2& string2, const Ts&... strings)
</ins><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2);
- if (!resultImpl)
</del><ins>+ RefPtr<StringImpl> result = tryMakeString(string1, string2, strings...);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return WTF::move(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename StringType1, typename StringType2, typename StringType3>
-String makeString(StringType1 string1, StringType2 string2, StringType3 string3)
-{
- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3);
- if (!resultImpl)
- CRASH();
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4>
-String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
-{
- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4);
- if (!resultImpl)
- CRASH();
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5>
-String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
-{
- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5);
- if (!resultImpl)
- CRASH();
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6>
-String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
-{
- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6);
- if (!resultImpl)
- CRASH();
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7>
-String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7)
-{
- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7);
- if (!resultImpl)
- CRASH();
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8>
-String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8)
-{
- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8);
- if (!resultImpl)
- CRASH();
- return WTF::move(resultImpl);
-}
-
-template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8, typename StringType9>
-String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8, StringType9 string9)
-{
- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8, string9);
- if (!resultImpl)
- CRASH();
- return WTF::move(resultImpl);
-}
-
</del><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::makeString;
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringOperatorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringOperators.h (187814 => 187815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringOperators.h 2015-08-04 06:05:35 UTC (rev 187814)
+++ trunk/Source/WTF/wtf/text/StringOperators.h 2015-08-04 06:27:12 UTC (rev 187815)
</span><span class="lines">@@ -24,21 +24,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-template<typename StringType1, typename StringType2>
</del><ins>+template<typename T1, typename T2>
</ins><span class="cx"> class StringAppend {
</span><span class="cx"> public:
</span><del>- StringAppend(StringType1 string1, StringType2 string2)
- : m_string1(string1)
- , m_string2(string2)
</del><ins>+ StringAppend(const T1& string1, const T2& string2)
+ : m_tuple(std::make_tuple(AdapterType<T1>(string1), AdapterType<T2>(string2)))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> operator String() const
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(m_string1, m_string2);
</del><ins>+ RefPtr<StringImpl> resultImpl = StringAdapterTuple<2, AdapterType<T1>, AdapterType<T2>>::createString(m_tuple);
</ins><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> operator AtomicString() const
</span><span class="lines">@@ -46,59 +45,52 @@
</span><span class="cx"> return operator String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool is8Bit()
</del><ins>+ bool is8Bit() const
</ins><span class="cx"> {
</span><del>- StringTypeAdapter<StringType1> adapter1(m_string1);
- StringTypeAdapter<StringType2> adapter2(m_string2);
- return adapter1.is8Bit() && adapter2.is8Bit();
</del><ins>+ return string1().is8Bit() && string2().is8Bit();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void writeTo(LChar* destination)
</del><ins>+ void writeTo(LChar* destination) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(is8Bit());
</span><del>- StringTypeAdapter<StringType1> adapter1(m_string1);
- StringTypeAdapter<StringType2> adapter2(m_string2);
- adapter1.writeTo(destination);
- adapter2.writeTo(destination + adapter1.length());
</del><ins>+ string1().writeTo(destination);
+ string2().writeTo(destination + string1().length());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void writeTo(UChar* destination)
</del><ins>+ void writeTo(UChar* destination) const
</ins><span class="cx"> {
</span><del>- StringTypeAdapter<StringType1> adapter1(m_string1);
- StringTypeAdapter<StringType2> adapter2(m_string2);
- adapter1.writeTo(destination);
- adapter2.writeTo(destination + adapter1.length());
</del><ins>+ string1().writeTo(destination);
+ string2().writeTo(destination + string1().length());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned length()
</del><ins>+ unsigned length() const
</ins><span class="cx"> {
</span><del>- StringTypeAdapter<StringType1> adapter1(m_string1);
- StringTypeAdapter<StringType2> adapter2(m_string2);
- return adapter1.length() + adapter2.length();
</del><ins>+ return string1().length() + string2().length();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StringType1 m_string1;
- StringType2 m_string2;
</del><ins>+ std::tuple<AdapterType<T1>, AdapterType<T2>> m_tuple;
+ const AdapterType<T1>& string1() const { return std::get<0>(m_tuple); }
+ const AdapterType<T2>& string2() const { return std::get<1>(m_tuple); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2>
</span><span class="cx"> class StringTypeAdapter<StringAppend<StringType1, StringType2>> {
</span><span class="cx"> public:
</span><del>- StringTypeAdapter<StringAppend<StringType1, StringType2>>(StringAppend<StringType1, StringType2>& buffer)
</del><ins>+ StringTypeAdapter<StringAppend<StringType1, StringType2>>(const StringAppend<StringType1, StringType2>& buffer)
</ins><span class="cx"> : m_buffer(buffer)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned length() { return m_buffer.length(); }
</del><ins>+ unsigned length() const { return m_buffer.length(); }
</ins><span class="cx">
</span><del>- bool is8Bit() { return m_buffer.is8Bit(); }
</del><ins>+ bool is8Bit() const { return m_buffer.is8Bit(); }
</ins><span class="cx">
</span><del>- void writeTo(LChar* destination) { m_buffer.writeTo(destination); }
- void writeTo(UChar* destination) { m_buffer.writeTo(destination); }
</del><ins>+ void writeTo(LChar* destination) const { m_buffer.writeTo(destination); }
+ void writeTo(UChar* destination) const { m_buffer.writeTo(destination); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- StringAppend<StringType1, StringType2>& m_buffer;
</del><ins>+ const StringAppend<StringType1, StringType2>& m_buffer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline StringAppend<const char*, String> operator+(const char* string1, const String& string2)
</span></span></pre>
</div>
</div>
</body>
</html>