Changeset 100499 in webkit

Timestamp:

Nov 16, 2011 1:51:15 PM (12 years ago)

Author:

levin@chromium.org

Message:

check-webkit-style should recognize functions even if they have OVERRIDE after them.
​https://bugs.webkit.org/show_bug.cgi?id=72515

Reviewed by Adam Barth.

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

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) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-16  David Levin  <levin@chromium.org>
+
+        check-webkit-style should recognize functions even if they have OVERRIDE after them.
+        https://bugs.webkit.org/show_bug.cgi?id=72515
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+
 2011-11-16  Tony Chang  <tony@chromium.org>
 

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

@@ -2144 +2144 @@
         # We also allow '#' for #endif and '=' for array initialization.
         previous_line = get_previous_non_blank_line(clean_lines, line_number)[0]
-        if ((not search(r'[;:}{)=]\s*$|\)\s*const\s*$', previous_line)
+        if ((not search(r'[;:}{)=]\s*$|\)\s*((const|OVERRIDE)\s*)*\s*$', previous_line)
              or search(r'\b(if|for|foreach|while|switch|else)\b', previous_line))
             and previous_line.find('#') < 0):
             error(line_number, 'whitespace/braces', 4,
                   'This { should be at the end of the previous line')
-    elif (search(r'\)\s*(const\s*)?{\s*$', line)
+    elif (search(r'\)\s*(((const|OVERRIDE)\s*)*\s*)?{\s*$', line)
           and line.count('(') == line.count(')')
           and not search(r'\b(if|for|foreach|while|switch)\b', line)

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

@@ -1531 +1531 @@
             'Place brace on its own line for function definitions.  [whitespace/braces] [4]')
         self.assert_multi_line_lint(
+            'int foo() const OVERRIDE {',
+            'Place brace on its own line for function definitions.  [whitespace/braces] [4]')
+        self.assert_multi_line_lint(
+            'int foo() OVERRIDE {',
+            'Place brace on its own line for function definitions.  [whitespace/braces] [4]')
+        self.assert_multi_line_lint(
             'int foo() const\n'
+            '{\n'
+            '}\n',
+            '')
+        self.assert_multi_line_lint(
+            'int foo() OVERRIDE\n'
             '{\n'
             '}\n',