<!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>[160461] trunk/Tools</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/160461">160461</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-11 15:05:52 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>check-webkit-style can't determine if a comma is part of an initialization list
https://bugs.webkit.org/show_bug.cgi?id=125537
Patch by Myles C. Maxfield <mmaxfield@apple.com> on 2013-12-11
Reviewed by Darin Adler.
The original check to make sure that initialization list lines start with
a comma didn't distinguish between commas that belong to the initialization
list and commas that are part of function calls. Because we don't want to
match parentheses with regular expressions, we should weaken this check to
only check for commas at the end of initialization list lines.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_member_initialization_list):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(WebKitStyleTest.test_member_initialization_list):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpppy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpp_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160460 => 160461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-11 23:00:08 UTC (rev 160460)
+++ trunk/Tools/ChangeLog 2013-12-11 23:05:52 UTC (rev 160461)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ check-webkit-style can't determine if a comma is part of an initialization list
+ https://bugs.webkit.org/show_bug.cgi?id=125537
+
+ Reviewed by Darin Adler.
+
+ The original check to make sure that initialization list lines start with
+ a comma didn't distinguish between commas that belong to the initialization
+ list and commas that are part of function calls. Because we don't want to
+ match parentheses with regular expressions, we should weaken this check to
+ only check for commas at the end of initialization list lines.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_member_initialization_list):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (WebKitStyleTest.test_member_initialization_list):
+
</ins><span class="cx"> 2013-12-11 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to compare layout test results between various configurations of WebKit
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (160460 => 160461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-11 23:00:08 UTC (rev 160460)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-11 23:05:52 UTC (rev 160461)
</span><span class="lines">@@ -2021,7 +2021,7 @@
</span><span class="cx"> if not line.startswith(inner_indentation) and begin_line != line:
</span><span class="cx"> error(line_number, 'whitespace/indent', 4,
</span><span class="cx"> 'Wrong number of spaces before statement. (expected: %d)' % len(inner_indentation))
</span><del>- if search(r'\S\s*,', line):
</del><ins>+ if search(r'\S\s*,\s*$', line):
</ins><span class="cx"> error(line_number, 'whitespace/init', 4,
</span><span class="cx"> 'Comma should be at the beginning of the line in a member initialization list.')
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (160460 => 160461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-11 23:00:08 UTC (rev 160460)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-11 23:05:52 UTC (rev 160461)
</span><span class="lines">@@ -4975,7 +4975,8 @@
</span><span class="cx"> 'Missing spaces around : [whitespace/init] [4]')
</span><span class="cx"> self.assert_multi_line_lint('''\
</span><span class="cx"> MyClass::MyClass(Document* doc)
</span><del>- : MySuperClass() , m_doc(0)
</del><ins>+ : MySuperClass() ,
+ m_doc(0)
</ins><span class="cx"> { }''',
</span><span class="cx"> 'Comma should be at the beginning of the line in a member initialization list.'
</span><span class="cx"> ' [whitespace/init] [4]')
</span><span class="lines">@@ -4989,6 +4990,11 @@
</span><span class="cx"> , public foo {
</span><span class="cx"> };''',
</span><span class="cx"> '')
</span><ins>+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc)
+ : MySuperClass(doc, doc)
+ { }''',
+ '')
</ins><span class="cx"> self.assert_lint('o = foo(b ? bar() : baz());', '')
</span><span class="cx"> self.assert_lint('MYMACRO(a ? b() : c);', '')
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>