<!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>[160773] 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/160773">160773</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-18 10:07:01 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Should not have identifiers with underscores in them, especially not leading underscores.
https://bugs.webkit.org/show_bug.cgi?id=125847
Patch by Gergo Balogh <geryxyz@inf.u-szeged.hu> on 2013-12-18
Reviewed by Darin Adler.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_identifier_name_in_declaration):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(CppStyleTest.test_runtime_selfinit):
(WebKitStyleTest.test_names):</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 (160772 => 160773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-18 18:06:13 UTC (rev 160772)
+++ trunk/Tools/ChangeLog 2013-12-18 18:07:01 UTC (rev 160773)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2013-12-18 Gergo Balogh <geryxyz@inf.u-szeged.hu>
</span><span class="cx">
</span><ins>+ Should not have identifiers with underscores in them, especially not leading underscores.
+ https://bugs.webkit.org/show_bug.cgi?id=125847
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_identifier_name_in_declaration):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (CppStyleTest.test_runtime_selfinit):
+ (WebKitStyleTest.test_names):
+
+2013-12-18 Gergo Balogh <geryxyz@inf.u-szeged.hu>
+
</ins><span class="cx"> False webkit-check-style warnings on *.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125915
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (160772 => 160773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-18 18:06:13 UTC (rev 160772)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-18 18:07:01 UTC (rev 160773)
</span><span class="lines">@@ -3219,12 +3219,15 @@
</span><span class="cx"> character_after_identifier_regexp = r'(?P<character_after_identifier>[[;()=,])(?!=)'
</span><span class="cx"> declaration_without_type_regexp = r'\s*' + identifier_regexp + r'\s*' + maybe_bitfield_regexp + character_after_identifier_regexp
</span><span class="cx"> declaration_with_type_regexp = r'\s*' + type_regexp + r'\s' + declaration_without_type_regexp
</span><ins>+ constructor_regexp = r'\s*([\w_]*::)*(?P<pre_part>[\w_]+)::(?P<post_part>[\w_]+)[(]'
</ins><span class="cx"> is_function_arguments = False
</span><span class="cx"> number_of_identifiers = 0
</span><span class="cx"> while True:
</span><span class="cx"> # If we are seeing the first identifier or arguments of a
</span><span class="cx"> # function, there should be a type name before an identifier.
</span><del>- if not number_of_identifiers or is_function_arguments:
</del><ins>+ constructor_check = match(constructor_regexp, line)
+ is_constructor = constructor_check and constructor_check.group('pre_part') == constructor_check.group('post_part')
+ if not is_constructor and (not number_of_identifiers or is_function_arguments):
</ins><span class="cx"> declaration_regexp = declaration_with_type_regexp
</span><span class="cx"> else:
</span><span class="cx"> declaration_regexp = declaration_without_type_regexp
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (160772 => 160773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-18 18:06:13 UTC (rev 160772)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-18 18:07:01 UTC (rev 160773)
</span><span class="lines">@@ -751,25 +751,25 @@
</span><span class="cx"> def test_runtime_selfinit(self):
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><del>- Foo::Foo(Bar r, Bel l)
- : r_(r_)
- , l_(l_) { }''',
</del><ins>+ Foo::Foo(Bar raa, Bel laa)
+ : raa_(raa_)
+ , laa_(laa_) { }''',
</ins><span class="cx"> ['You seem to be initializing a member variable with itself.'
</span><span class="cx"> ' [runtime/init] [4]',
</span><span class="cx"> 'You seem to be initializing a member variable with itself.'
</span><span class="cx"> ' [runtime/init] [4]'])
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><del>- Foo::Foo(Bar r, Bel l)
- : r_(r)
- , l_(l) { }''',
</del><ins>+ Foo::Foo(Bar raa, Bel laa)
+ : raa_(raa)
+ , laa_(laa) { }''',
</ins><span class="cx"> '')
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><del>- Foo::Foo(Bar r)
- : r_(r)
- , l_(r_)
- , ll_(l_) { }''',
</del><ins>+ Foo::Foo(Bar raa)
+ : raa_(raa)
+ , laa_(raa_)
+ , llaa_(laa_) { }''',
</ins><span class="cx"> '')
</span><span class="cx">
</span><span class="cx"> def test_runtime_rtti(self):
</span><span class="lines">@@ -4677,6 +4677,14 @@
</span><span class="cx"> '_length' + name_underscore_error_message)
</span><span class="cx"> self.assert_lint('unsigned long long _length;',
</span><span class="cx"> '_length' + name_underscore_error_message)
</span><ins>+ self.assert_lint(' ::blaspace::Options::Options(double defaultLongTimeout)',
+ '')
+ self.assert_lint(' ::blaspace::Options::Options(double _default_long_timeout)',
+ '_default_long_timeout' + name_underscore_error_message)
+ self.assert_lint(' blaspace::Options::Options(double _default_long_timeout)',
+ '_default_long_timeout' + name_underscore_error_message)
+ self.assert_lint(' Options::Options(double _default_long_timeout)',
+ '_default_long_timeout' + name_underscore_error_message)
</ins><span class="cx">
</span><span class="cx"> # Allow underscores in Objective C files.
</span><span class="cx"> self.assert_lint('unsigned long long _length;',
</span></span></pre>
</div>
</div>
</body>
</html>