Changeset 162365 in webkit

Timestamp:

Jan 20, 2014 11:39:15 AM (10 years ago)

Author:

Darin Adler

Message:

Update style checker and tests to deal with override instead of OVERRIDE
​https://bugs.webkit.org/show_bug.cgi?id=127175

Reviewed by Anders Carlsson.

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

(check_braces): Use override instead of OVERRIDE.

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

(CppStyleTest.test_brace_at_begin_of_line): Ditto.

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 @@
+2014-01-20  Darin Adler  <darin@apple.com>
+
+        Update style checker and tests to deal with override instead of OVERRIDE
+        https://bugs.webkit.org/show_bug.cgi?id=127175
+
+        Reviewed by Anders Carlsson.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_braces): Use override instead of OVERRIDE.
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (CppStyleTest.test_brace_at_begin_of_line): Ditto.
+
 2014-01-20  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -2364 +2364 @@
         # 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|OVERRIDE)\s*)?(->\s*\S+)?\s*$', previous_line)
+        if ((not search(r'[;:}{)=]\s*$|\)\s*((const|override)\s*)?(->\s*\S+)?\s*$', previous_line)
              or search(r'\b(if|for|foreach|while|switch|else|NS_ENUM)\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|OVERRIDE)\s*)*\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|NS_ENUM)\b', line)

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

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