<!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>[210151] trunk/Source/JavaScriptCore</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/210151">210151</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-12-26 11:00:53 -0800 (Mon, 26 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use variadic templates in JSC Parser to clean up
https://bugs.webkit.org/show_bug.cgi?id=166482
Reviewed by Saam Barati.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::logError):
* parser/Parser.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (210150 => 210151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-26 07:47:56 UTC (rev 210150)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-26 19:00:53 UTC (rev 210151)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Use variadic templates in JSC Parser to clean up
+ https://bugs.webkit.org/show_bug.cgi?id=166482
+
+ Reviewed by Saam Barati.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::logError):
+ * parser/Parser.h:
+
</ins><span class="cx"> 2016-12-25 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Propagate the source origin as much as possible
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (210150 => 210151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-12-26 07:47:56 UTC (rev 210150)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-12-26 19:00:53 UTC (rev 210151)
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> setErrorMessage(stream.toStringWithLatin1Fallback());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template <typename LexerType> template <typename A>
-void Parser<LexerType>::logError(bool shouldPrintToken, const A& value1)
</del><ins>+template <typename LexerType> template <typename... Args>
+void Parser<LexerType>::logError(bool shouldPrintToken, Args&&... args)
</ins><span class="cx"> {
</span><span class="cx"> if (hasError())
</span><span class="cx"> return;
</span><span class="lines">@@ -101,94 +101,10 @@
</span><span class="cx"> printUnexpectedTokenText(stream);
</span><span class="cx"> stream.print(". ");
</span><span class="cx"> }
</span><del>- stream.print(value1, ".");
</del><ins>+ stream.print(std::forward<Args>(args)..., ".");
</ins><span class="cx"> setErrorMessage(stream.toStringWithLatin1Fallback());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template <typename LexerType> template <typename A, typename B>
-void Parser<LexerType>::logError(bool shouldPrintToken, const A& value1, const B& value2)
-{
- if (hasError())
- return;
- StringPrintStream stream;
- if (shouldPrintToken) {
- printUnexpectedTokenText(stream);
- stream.print(". ");
- }
- stream.print(value1, value2, ".");
- setErrorMessage(stream.toStringWithLatin1Fallback());
-}
-
-template <typename LexerType> template <typename A, typename B, typename C>
-void Parser<LexerType>::logError(bool shouldPrintToken, const A& value1, const B& value2, const C& value3)
-{
- if (hasError())
- return;
- StringPrintStream stream;
- if (shouldPrintToken) {
- printUnexpectedTokenText(stream);
- stream.print(". ");
- }
- stream.print(value1, value2, value3, ".");
- setErrorMessage(stream.toStringWithLatin1Fallback());
-}
-
-template <typename LexerType> template <typename A, typename B, typename C, typename D>
-void Parser<LexerType>::logError(bool shouldPrintToken, const A& value1, const B& value2, const C& value3, const D& value4)
-{
- if (hasError())
- return;
- StringPrintStream stream;
- if (shouldPrintToken) {
- printUnexpectedTokenText(stream);
- stream.print(". ");
- }
- stream.print(value1, value2, value3, value4, ".");
- setErrorMessage(stream.toStringWithLatin1Fallback());
-}
-
-template <typename LexerType> template <typename A, typename B, typename C, typename D, typename E>
-void Parser<LexerType>::logError(bool shouldPrintToken, const A& value1, const B& value2, const C& value3, const D& value4, const E& value5)
-{
- if (hasError())
- return;
- StringPrintStream stream;
- if (shouldPrintToken) {
- printUnexpectedTokenText(stream);
- stream.print(". ");
- }
- stream.print(value1, value2, value3, value4, value5, ".");
- setErrorMessage(stream.toStringWithLatin1Fallback());
-}
-
-template <typename LexerType> template <typename A, typename B, typename C, typename D, typename E, typename F>
-void Parser<LexerType>::logError(bool shouldPrintToken, const A& value1, const B& value2, const C& value3, const D& value4, const E& value5, const F& value6)
-{
- if (hasError())
- return;
- StringPrintStream stream;
- if (shouldPrintToken) {
- printUnexpectedTokenText(stream);
- stream.print(". ");
- }
- stream.print(value1, value2, value3, value4, value5, value6, ".");
- setErrorMessage(stream.toStringWithLatin1Fallback());
-}
-
-template <typename LexerType> template <typename A, typename B, typename C, typename D, typename E, typename F, typename G>
-void Parser<LexerType>::logError(bool shouldPrintToken, const A& value1, const B& value2, const C& value3, const D& value4, const E& value5, const F& value6, const G& value7)
-{
- if (hasError())
- return;
- StringPrintStream stream;
- if (shouldPrintToken) {
- printUnexpectedTokenText(stream);
- stream.print(". ");
- }
- stream.print(value1, value2, value3, value4, value5, value6, value7, ".");
- setErrorMessage(stream.toStringWithLatin1Fallback());
-}
-
</del><span class="cx"> template <typename LexerType>
</span><span class="cx"> Parser<LexerType>::Parser(VM* vm, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, JSParserScriptMode scriptMode, SourceParseMode parseMode, SuperBinding superBinding, ConstructorKind defaultConstructorKind, DerivedContextType derivedContextType, bool isEvalContext, EvalContextType evalContextType, DebuggerParseData* debuggerParseData)
</span><span class="cx"> : m_vm(vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (210150 => 210151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2016-12-26 07:47:56 UTC (rev 210150)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2016-12-26 19:00:53 UTC (rev 210151)
</span><span class="lines">@@ -1381,13 +1381,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NEVER_INLINE void logError(bool);
</span><del>- template <typename A> NEVER_INLINE void logError(bool, const A&);
- template <typename A, typename B> NEVER_INLINE void logError(bool, const A&, const B&);
- template <typename A, typename B, typename C> NEVER_INLINE void logError(bool, const A&, const B&, const C&);
- template <typename A, typename B, typename C, typename D> NEVER_INLINE void logError(bool, const A&, const B&, const C&, const D&);
- template <typename A, typename B, typename C, typename D, typename E> NEVER_INLINE void logError(bool, const A&, const B&, const C&, const D&, const E&);
- template <typename A, typename B, typename C, typename D, typename E, typename F> NEVER_INLINE void logError(bool, const A&, const B&, const C&, const D&, const E&, const F&);
- template <typename A, typename B, typename C, typename D, typename E, typename F, typename G> NEVER_INLINE void logError(bool, const A&, const B&, const C&, const D&, const E&, const F&, const G&);
</del><ins>+ template <typename... Args>
+ NEVER_INLINE void logError(bool, Args&&...);
</ins><span class="cx">
</span><span class="cx"> NEVER_INLINE void updateErrorWithNameAndMessage(const char* beforeMessage, const String& name, const char* afterMessage)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>