Changeset 160124 in webkit

Timestamp:

Dec 4, 2013, 2:16:30 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

check-webkit-style detected some ternary statements as initialization lists
​https://bugs.webkit.org/show_bug.cgi?id=125246

Patch by Myles C. Maxfield <​mmaxfield@apple.com> on 2013-12-04
Reviewed by Dean Jackson.

The regular expression that check-webkit-tests uses to detect initialization
lists was too broad, resulting in false positives. This patch makes the
regex more specific

• Scripts/webkitpy/style/checkers/cpp.py:

(check_member_initialization_list):

• Scripts/webkitpy/style/checkers/cpp_unittest.py:

(WebKitStyleTest.test_member_initialization_list):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-12-04  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        check-webkit-style detected some ternary statements as initialization lists
+        https://bugs.webkit.org/show_bug.cgi?id=125246
+
+        Reviewed by Dean Jackson.
+
+        The regular expression that check-webkit-tests uses to detect initialization
+        lists was too broad, resulting in false positives. This patch makes the
+        regex more specific
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_member_initialization_list):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_member_initialization_list):
+
 2013-12-04  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

@@ -1987 +1987 @@
     # 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'^(?P<indentation>\s*)((explicit\s+)?[^\s]+\(.*\)\s?\:|^\s*\:).*[^;]*$', line):
         if search(r'[^:]\:[^\:\s]+', line):
             error(line_number, 'whitespace/init', 4,

trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

@@ -4915 +4915 @@
 
     def test_member_initialization_list(self):
+        self.assert_lint('explicit 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_lint('MyClass::MyClass(Document* doc) : MySuperClass() { }',
         'Should be indented on a separate line, with the colon or comma first on that line.'
@@ -4984 +4987 @@
         };''',
         '')
+        self.assert_lint('o = foo(b ? bar() : baz());', '')
 
     def test_other(self):