Changeset 55656 in webkit

Timestamp:

Mar 7, 2010 10:55:55 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-03-07 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Eric Seidel.

check-webkit-style: false positive for empty loop
​https://bugs.webkit.org/show_bug.cgi?id=35717

• Scripts/webkitpy/style/processors/cpp.py:
• Scripts/webkitpy/style/processors/cpp_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/processors/cpp.py (modified) (1 diff)
• Scripts/webkitpy/style/processors/cpp_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-07  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        check-webkit-style: false positive for empty loop
+        https://bugs.webkit.org/show_bug.cgi?id=35717
+
+        * Scripts/webkitpy/style/processors/cpp.py:
+        * Scripts/webkitpy/style/processors/cpp_unittest.py:
+
 2010-03-07  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/style/processors/cpp.py

@@ -1653 +1653 @@
         # one line control statement was previous.
         previous_line = clean_lines.elided[line_number - 2]
-        if (previous_line.find('{') > 0
+        if (previous_line.find('{') > 0 and previous_line.find('}') < 0
             and search(r'\b(if|for|foreach|while|else)\b', previous_line)):
             error(line_number, 'whitespace/braces', 4,

trunk/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py

@@ -3065 +3065 @@
             ['More than one command on the same line in if  [whitespace/parens] [4]',
              'One line control clauses should not use braces.  [whitespace/braces] [4]'])
+        self.assert_multi_line_lint(
+            'void func()\n'
+            '{\n'
+            '    while (condition) { }\n'
+            '    return 0;\n'
+            '}\n',
+            '')
+        self.assert_multi_line_lint(
+            'void func()\n'
+            '{\n'
+            '    for (i = 0; i < 42; i++) { foobar(); }\n'
+            '    return 0;\n'
+            '}\n',
+            'More than one command on the same line in for  [whitespace/parens] [4]')
 
         # 3. An else if statement should be written as an if statement