<!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>[164384] 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/164384">164384</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-19 13:02:58 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make PrintStream::print() a variadic template
https://bugs.webkit.org/show_bug.cgi?id=126388
Patch by Zan Dobersek <zdobersek@igalia.com> on 2014-02-19
Reviewed by Brent Fulgham.
PrintStream::print() can be converted into a variadic template, printing the value
of the first parameter and recursively calling itself until the single parameter version
is used for printing the last value.
* wtf/DataLog.h:
(WTF::dataLog): Convert the function to a variadic template as well.
* wtf/PrintStream.h:
(WTF::PrintStream::print):
* wtf/StringPrintStream.h:
(WTF::toCString): Ditto.
(WTF::toString): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfDataLogh">trunk/Source/WTF/wtf/DataLog.h</a></li>
<li><a href="#trunkSourceWTFwtfPrintStreamh">trunk/Source/WTF/wtf/PrintStream.h</a></li>
<li><a href="#trunkSourceWTFwtfStringPrintStreamh">trunk/Source/WTF/wtf/StringPrintStream.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (164383 => 164384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-19 20:49:38 UTC (rev 164383)
+++ trunk/Source/WTF/ChangeLog 2014-02-19 21:02:58 UTC (rev 164384)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-02-19 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Make PrintStream::print() a variadic template
+ https://bugs.webkit.org/show_bug.cgi?id=126388
+
+ Reviewed by Brent Fulgham.
+
+ PrintStream::print() can be converted into a variadic template, printing the value
+ of the first parameter and recursively calling itself until the single parameter version
+ is used for printing the last value.
+
+ * wtf/DataLog.h:
+ (WTF::dataLog): Convert the function to a variadic template as well.
+ * wtf/PrintStream.h:
+ (WTF::PrintStream::print):
+ * wtf/StringPrintStream.h:
+ (WTF::toCString): Ditto.
+ (WTF::toString): Ditto.
+
+2014-02-19 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Use std::swap() in HashTable::swap()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128995
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfDataLogh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/DataLog.h (164383 => 164384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DataLog.h 2014-02-19 20:49:38 UTC (rev 164383)
+++ trunk/Source/WTF/wtf/DataLog.h 2014-02-19 21:02:58 UTC (rev 164384)
</span><span class="lines">@@ -40,96 +40,12 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE void dataLogF(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
</span><span class="cx"> WTF_EXPORT_PRIVATE void dataLogFString(const char*);
</span><span class="cx">
</span><del>-template<typename T>
-void dataLog(const T& value)
</del><ins>+template<typename... Types>
+void dataLog(const Types&... values)
</ins><span class="cx"> {
</span><del>- dataFile().print(value);
</del><ins>+ dataFile().print(values...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T1, typename T2>
-void dataLog(const T1& value1, const T2& value2)
-{
- dataFile().print(value1, value2);
-}
-
-template<typename T1, typename T2, typename T3>
-void dataLog(const T1& value1, const T2& value2, const T3& value3)
-{
- dataFile().print(value1, value2, value3);
-}
-
-template<typename T1, typename T2, typename T3, typename T4>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4)
-{
- dataFile().print(value1, value2, value3, value4);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5)
-{
- dataFile().print(value1, value2, value3, value4, value5);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8, value9);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8, value9, value10);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12, const T13& value13)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12, const T13& value13, const T14& value14)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14);
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15>
-void dataLog(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12, const T13& value13, const T14& value14, const T15& value15)
-{
- dataFile().print(value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15);
-}
-
</del><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::dataLog;
</span></span></pre></div>
<a id="trunkSourceWTFwtfPrintStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PrintStream.h (164383 => 164384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PrintStream.h 2014-02-19 20:49:38 UTC (rev 164383)
+++ trunk/Source/WTF/wtf/PrintStream.h 2014-02-19 21:02:58 UTC (rev 164384)
</span><span class="lines">@@ -51,201 +51,19 @@
</span><span class="cx"> // Typically a no-op for many subclasses of PrintStream, this is a hint that
</span><span class="cx"> // the implementation should flush its buffers if it had not done so already.
</span><span class="cx"> virtual void flush();
</span><del>-
</del><ins>+
</ins><span class="cx"> template<typename T>
</span><span class="cx"> void print(const T& value)
</span><span class="cx"> {
</span><span class="cx"> printInternal(*this, value);
</span><span class="cx"> }
</span><del>-
- template<typename T1, typename T2>
- void print(const T1& value1, const T2& value2)
</del><ins>+
+ template<typename T, typename... Types>
+ void print(const T& value, const Types&... remainingValues)
</ins><span class="cx"> {
</span><del>- print(value1);
- print(value2);
</del><ins>+ printInternal(*this, value);
+ print(remainingValues...);
</ins><span class="cx"> }
</span><del>-
- template<typename T1, typename T2, typename T3>
- void print(const T1& value1, const T2& value2, const T3& value3)
- {
- print(value1);
- print(value2);
- print(value3);
- }
-
- template<typename T1, typename T2, typename T3, typename T4>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- print(value9);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- print(value9);
- print(value10);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- print(value9);
- print(value10);
- print(value11);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- print(value9);
- print(value10);
- print(value11);
- print(value12);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12, const T13& value13)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- print(value9);
- print(value10);
- print(value11);
- print(value12);
- print(value13);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12, const T13& value13, const T14& value14)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- print(value9);
- print(value10);
- print(value11);
- print(value12);
- print(value13);
- print(value14);
- }
-
- template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12, typename T13, typename T14, typename T15>
- void print(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6, const T7& value7, const T8& value8, const T9& value9, const T10& value10, const T11& value11, const T12& value12, const T13& value13, const T14& value14, const T15& value15)
- {
- print(value1);
- print(value2);
- print(value3);
- print(value4);
- print(value5);
- print(value6);
- print(value7);
- print(value8);
- print(value9);
- print(value10);
- print(value11);
- print(value12);
- print(value13);
- print(value14);
- print(value15);
- }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void printInternal(PrintStream&, const char*);
</span></span></pre></div>
<a id="trunkSourceWTFwtfStringPrintStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StringPrintStream.h (164383 => 164384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StringPrintStream.h 2014-02-19 20:49:38 UTC (rev 164383)
+++ trunk/Source/WTF/wtf/StringPrintStream.h 2014-02-19 21:02:58 UTC (rev 164384)
</span><span class="lines">@@ -53,57 +53,20 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Stringify any type T that has a WTF::printInternal(PrintStream&, const T&)
</span><del>-template<typename T>
-CString toCString(const T& value)
-{
- StringPrintStream stream;
- stream.print(value);
- return stream.toCString();
-}
-template<typename T1, typename T2>
-CString toCString(const T1& value1, const T2& value2)
-{
- StringPrintStream stream;
- stream.print(value1, value2);
- return stream.toCString();
-}
-template<typename T1, typename T2, typename T3>
-CString toCString(const T1& value1, const T2& value2, const T3& value3)
-{
- StringPrintStream stream;
- stream.print(value1, value2, value3);
- return stream.toCString();
-}
</del><span class="cx">
</span><del>-template<typename T1, typename T2, typename T3, typename T4>
-CString toCString(const T1& value1, const T2& value2, const T3& value3, const T4& value4)
</del><ins>+template<typename... Types>
+CString toCString(const Types&... values)
</ins><span class="cx"> {
</span><span class="cx"> StringPrintStream stream;
</span><del>- stream.print(value1, value2, value3, value4);
</del><ins>+ stream.print(values...);
</ins><span class="cx"> return stream.toCString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T1, typename T2, typename T3, typename T4, typename T5>
-CString toCString(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5)
</del><ins>+template<typename... Types>
+String toString(const Types&... values)
</ins><span class="cx"> {
</span><span class="cx"> StringPrintStream stream;
</span><del>- stream.print(value1, value2, value3, value4, value5);
- return stream.toCString();
-}
-
-template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-CString toCString(const T1& value1, const T2& value2, const T3& value3, const T4& value4, const T5& value5, const T6& value6)
-{
- StringPrintStream stream;
- stream.print(value1, value2, value3, value4, value5, value6);
- return stream.toCString();
-}
-
-template<typename T>
-String toString(const T& value)
-{
- StringPrintStream stream;
- stream.print(value);
</del><ins>+ stream.print(values...);
</ins><span class="cx"> return stream.toString();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>