<!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>[160084] 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/160084">160084</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 03:11:33 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>check-webkit-style should check member initialization indentation.
https://bugs.webkit.org/show_bug.cgi?id=124820
Patch by László Langó <lango@inf.u-szeged.hu> on 2013-12-04
Reviewed by Zoltan Herczeg.
check-webkit-style should check member initialization indentation
belongs to webkit coding style:
http://www.webkit.org/coding/coding-style.html#punctuation-member-init
* Scripts/webkitpy/style/checkers/cpp.py:
(check_member_initialization_list): Add new method to check member
initialization list.
(check_style): Add the call of the new method.
(check_language): Move self initialization checking into the new method.
(CppChecker): Add a new category for initialization list.
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(CppStyleTest.test_runtime_selfinit):
(CppStyleTest.test_deprecated_cast):
(WebKitStyleTest.test_member_initialization_list): Add new testcases for
the new feature.</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 (160083 => 160084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-04 11:08:56 UTC (rev 160083)
+++ trunk/Tools/ChangeLog 2013-12-04 11:11:33 UTC (rev 160084)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-12-04 László Langó <lango@inf.u-szeged.hu>
+
+ check-webkit-style should check member initialization indentation.
+ https://bugs.webkit.org/show_bug.cgi?id=124820
+
+ Reviewed by Zoltan Herczeg.
+
+ check-webkit-style should check member initialization indentation
+ belongs to webkit coding style:
+ http://www.webkit.org/coding/coding-style.html#punctuation-member-init
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_member_initialization_list): Add new method to check member
+ initialization list.
+ (check_style): Add the call of the new method.
+ (check_language): Move self initialization checking into the new method.
+ (CppChecker): Add a new category for initialization list.
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (CppStyleTest.test_runtime_selfinit):
+ (CppStyleTest.test_deprecated_cast):
+ (WebKitStyleTest.test_member_initialization_list): Add new testcases for
+ the new feature.
+
</ins><span class="cx"> 2013-12-04 Tamas Gergely <gertom@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> style-bot should reject Committer additions to committers.py
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (160083 => 160084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-04 11:08:56 UTC (rev 160083)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2013-12-04 11:11:33 UTC (rev 160084)
</span><span class="lines">@@ -1964,6 +1964,57 @@
</span><span class="cx"> 'Semicolon defining empty statement for this loop. Use { } instead.')
</span><span class="cx">
</span><span class="cx">
</span><ins>+def check_member_initialization_list(clean_lines, line_number, error):
+ """ Look for style errors in member initialization list of classes.
+
+ Args:
+ clean_lines: A CleansedLines instance containing the file.
+ line_number: The number of the line to check.
+ error: The function to call with any errors found.
+ """
+
+ raw = clean_lines.raw_lines
+ line = raw[line_number]
+
+ if search(r'\b([A-Za-z0-9_]*_)\(\1\)', line):
+ error(line_number, 'runtime/init', 4,
+ 'You seem to be initializing a member variable with itself.')
+
+ # Check the style of the initializer list.
+ # Each member (and superclass) should be indented on a separate line,
+ # with the colon or comma preceding the member on that line.
+ begin_line = line
+ if search(r'(?P<indentation>\s*)([^\s]\(.*\)\s?\:|^\s*\:).*[^;]*$', line):
+ if search(r'[^:]\:[^\:\s]+', line):
+ error(line_number, 'whitespace/init', 4,
+ 'Missing spaces around :')
+ if search(r'[^\s]\(.*\)\s?\:.*[^;]*$', line):
+ error(line_number, 'whitespace/indent', 4,
+ 'Should be indented on a separate line, with the colon or comma first on that line.')
+ else:
+ begin_line, begin_line_number = get_previous_non_blank_line(clean_lines, line_number)
+
+ matched = search(r'(?P<indentation>\s*).*', begin_line)
+ indentation = matched.group('indentation')
+ inner_indentation = indentation + ' ' * 4
+
+ while(not search(r'{', line)):
+ # Don't check inheritance style
+ if search(r'\S\(.*\)', line):
+ if not line.startswith(inner_indentation) and begin_line != line:
+ error(line_number, 'whitespace/indent', 4,
+ 'Wrong number of spaces before statement. (expected: %d)' % len(inner_indentation))
+ if search(r'\S\s*,', line):
+ error(line_number, 'whitespace/init', 4,
+ 'Comma should be at the beggining of the line in a member initialization list.')
+
+ # To avoid infinite loop, if can't find the end of member initialization list
+ if line_number < len(raw) - 1:
+ line_number = line_number + 1
+ line = raw[line_number]
+ else:
+ break
+
</ins><span class="cx"> def get_previous_non_blank_line(clean_lines, line_number):
</span><span class="cx"> """Return the most recent non-blank line and its line number.
</span><span class="cx">
</span><span class="lines">@@ -2639,6 +2690,7 @@
</span><span class="cx"> check_braces(clean_lines, line_number, error)
</span><span class="cx"> check_exit_statement_simplifications(clean_lines, line_number, error)
</span><span class="cx"> check_spacing(file_extension, clean_lines, line_number, error)
</span><ins>+ check_member_initialization_list(clean_lines, line_number, error)
</ins><span class="cx"> check_check(clean_lines, line_number, error)
</span><span class="cx"> check_for_comparisons_to_zero(clean_lines, line_number, error)
</span><span class="cx"> check_for_null(clean_lines, line_number, file_state, error)
</span><span class="lines">@@ -2947,10 +2999,6 @@
</span><span class="cx"> "hierarchy, use static_cast<> to upcast. Google doesn't support "
</span><span class="cx"> 'RTTI.')
</span><span class="cx">
</span><del>- if search(r'\b([A-Za-z0-9_]*_)\(\1\)', line):
- error(line_number, 'runtime/init', 4,
- 'You seem to be initializing a member variable with itself.')
-
</del><span class="cx"> if file_extension == 'h':
</span><span class="cx"> # FIXME: check that 1-arg constructors are explicit.
</span><span class="cx"> # How to tell it's a constructor?
</span><span class="lines">@@ -3661,6 +3709,7 @@
</span><span class="cx"> 'whitespace/end_of_line',
</span><span class="cx"> 'whitespace/ending_newline',
</span><span class="cx"> 'whitespace/indent',
</span><ins>+ 'whitespace/init',
</ins><span class="cx"> 'whitespace/line_length',
</span><span class="cx"> 'whitespace/newline',
</span><span class="cx"> 'whitespace/operators',
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (160083 => 160084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-04 11:08:56 UTC (rev 160083)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2013-12-04 11:11:33 UTC (rev 160084)
</span><span class="lines">@@ -748,15 +748,27 @@
</span><span class="cx"> '')
</span><span class="cx">
</span><span class="cx"> def test_runtime_selfinit(self):
</span><del>- self.assert_lint(
- 'Foo::Foo(Bar r, Bel l) : r_(r_), l_(l_) { }',
</del><ins>+ self.assert_multi_line_lint(
+ '''\
+ Foo::Foo(Bar r, Bel l)
+ : r_(r_)
+ , l_(l_) { }''',
+ ['You seem to be initializing a member variable with itself.'
+ ' [runtime/init] [4]',
</ins><span class="cx"> 'You seem to be initializing a member variable with itself.'
</span><del>- ' [runtime/init] [4]')
- self.assert_lint(
- 'Foo::Foo(Bar r, Bel l) : r_(r), l_(l) { }',
</del><ins>+ ' [runtime/init] [4]'])
+ self.assert_multi_line_lint(
+ '''\
+ Foo::Foo(Bar r, Bel l)
+ : r_(r)
+ , l_(l) { }''',
</ins><span class="cx"> '')
</span><del>- self.assert_lint(
- 'Foo::Foo(Bar r) : r_(r), l_(r_), ll_(l_) { }',
</del><ins>+ self.assert_multi_line_lint(
+ '''\
+ Foo::Foo(Bar r)
+ : r_(r)
+ , l_(r_)
+ , ll_(l_) { }''',
</ins><span class="cx"> '')
</span><span class="cx">
</span><span class="cx"> def test_runtime_rtti(self):
</span><span class="lines">@@ -818,8 +830,10 @@
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> 'int a = int(); // Constructor, o.k.',
</span><span class="cx"> '')
</span><del>- self.assert_lint(
- 'X::X() : a(int()) { } // default Constructor, o.k.',
</del><ins>+ self.assert_multi_line_lint(
+ '''\
+ X::X()
+ : a(int()) { } // default Constructor, o.k.''',
</ins><span class="cx"> '')
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> 'operator bool(); // Conversion operator, o.k.',
</span><span class="lines">@@ -4897,6 +4911,77 @@
</span><span class="cx"> 'test.h',
</span><span class="cx"> webkit_export_error_rules))
</span><span class="cx">
</span><ins>+ def test_member_initialization_list(self):
+ self.assert_lint('MyClass::MyClass(Document* doc) : MySuperClass() { }',
+ 'Should be indented on a separate line, with the colon or comma first on that line.'
+ ' [whitespace/indent] [4]')
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc) : MySuperClass()
+ { }''',
+ 'Should be indented on a separate line, with the colon or comma first on that line.'
+ ' [whitespace/indent] [4]')
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc)
+ : MySuperClass()
+ { }''',
+ 'Wrong number of spaces before statement. (expected: 12)'
+ ' [whitespace/indent] [4]')
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc) :
+ MySuperClass(),
+ m_doc(0)
+ { }''',
+ ['Should be indented on a separate line, with the colon or comma first on that line.'
+ ' [whitespace/indent] [4]',
+ 'Comma should be at the beggining of the line in a member initialization list.'
+ ' [whitespace/init] [4]'])
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc) :MySuperClass()
+ { }''',
+ ['Missing spaces around : [whitespace/init] [4]',
+ 'Should be indented on a separate line, with the colon or comma first on that line.'
+ ' [whitespace/indent] [4]'])
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc):MySuperClass()
+ { }''',
+ ['Missing spaces around : [whitespace/init] [4]',
+ 'Should be indented on a separate line, with the colon or comma first on that line.'
+ ' [whitespace/indent] [4]'])
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc) : MySuperClass()
+ ,MySuperClass()
+ , m_doc(0)
+ , m_myMember(0)
+ { }''',
+ ['Should be indented on a separate line, with the colon or comma first on that line.'
+ ' [whitespace/indent] [4]',
+ 'Wrong number of spaces before statement. (expected: 12)'
+ ' [whitespace/indent] [4]',
+ 'Wrong number of spaces before statement. (expected: 12)'
+ ' [whitespace/indent] [4]',
+ 'Missing space after , [whitespace/comma] [3]'])
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc)
+ :MySuperClass()
+ { }''',
+ 'Missing spaces around : [whitespace/init] [4]')
+ self.assert_multi_line_lint('''\
+ MyClass::MyClass(Document* doc)
+ : MySuperClass() , m_doc(0)
+ { }''',
+ 'Comma should be at the beggining of the line in a member initialization list.'
+ ' [whitespace/init] [4]')
+ self.assert_multi_line_lint('''\
+ class MyClass : public Goo {
+ };''',
+ '')
+ self.assert_multi_line_lint('''\
+ class MyClass
+ : public Goo
+ , public foo {
+ };''',
+ '')
+
</ins><span class="cx"> def test_other(self):
</span><span class="cx"> # FIXME: Implement this.
</span><span class="cx"> pass
</span></span></pre>
</div>
</div>
</body>
</html>