Changeset 160706 in webkit

Timestamp:

Dec 17, 2013 8:18:21 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Fix for C++ should have the & or * beside the type not the variable name check.
​https://bugs.webkit.org/show_bug.cgi?id=125846

Patch by Gergo Balogh <​geryxyz@inf.u-szeged.hu> on 2013-12-17
Reviewed by Darin Adler.

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

(check_spacing):

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

(CppStyleTest.test_pointer_reference_marker_location):

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 @@
+2013-12-17  Gergo Balogh  <geryxyz@inf.u-szeged.hu>
+
+        Fix for C++ should have the & or * beside the type not the variable name check.
+        https://bugs.webkit.org/show_bug.cgi?id=125846
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_spacing):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (CppStyleTest.test_pointer_reference_marker_location):
+
 2013-12-16  Rob Buis  <rob.buis@samsung.com>
 

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

@@ -1925 +1925 @@
     if file_extension == 'cpp':
         # C++ should have the & or * beside the type not the variable name.
-        matched = match(r'\s*\w+(?<!\breturn|\bdelete)\s+(?P<pointer_operator>\*|\&)\w+', line)
+        matched = match(r'\s*([\w\s]+)(?<!\breturn|\bdelete)\s+(?P<pointer_operator>\*|\&)\s*\w+', line)
         if matched:
             error(line_number, 'whitespace/declaration', 3,

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

@@ -2067 +2067 @@
                          'Declaration has space between type name and * in int *b  [whitespace/declaration] [3]',
                          'foo.cpp')
+        self.assert_lint('int * b;',
+                         'Declaration has space between type name and * in int * b  [whitespace/declaration] [3]',
+                         'foo.cpp')
         self.assert_lint('return *b;', '', 'foo.cpp')
         self.assert_lint('delete *b;', '', 'foo.cpp')