Changeset 61660 in webkit


Ignore:
Timestamp:
Jun 22, 2010 11:30:15 PM (14 years ago)
Author:
hamaji@chromium.org
Message:

2010-06-22 Sam Magnuson <smagnuson@netflix.com>

Reviewed by Shinichiro Hamaji.

Follow proper convention for variable declaration spacing.
https://bugs.webkit.org/show_bug.cgi?id=40724

Modified test so that 'int a;' is not allowed.

  • Scripts/webkitpy/style/checkers/cpp.py:
  • Scripts/webkitpy/style/checkers/cpp_unittest.py:
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r61644 r61660  
     12010-06-22  Sam Magnuson  <smagnuson@netflix.com>
     2
     3        Reviewed by Shinichiro Hamaji.
     4
     5        Follow proper convention for variable declaration spacing.
     6        https://bugs.webkit.org/show_bug.cgi?id=40724
     7
     8        Modified test so that 'int   a;' is not allowed.
     9
     10        * Scripts/webkitpy/style/checkers/cpp.py:
     11        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
     12
    1132010-06-22  Eric Seidel  <eric@webkit.org>
    214
  • trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py

    r60293 r61660  
    13691369        error(line_number, 'whitespace/comma', 3,
    13701370              'Missing space after ,')
     1371
     1372    matched = search(r'^\s*(?P<token1>[a-zA-Z0-9_\*&]+)\s\s+(?P<token2>[a-zA-Z0-9_\*&]+)', line)
     1373    if matched:
     1374        error(line_number, 'whitespace/declaration', 3,
     1375              'Extra space between %s and %s' % (matched.group('token1'), matched.group('token2')))
    13711376
    13721377    if file_extension == 'cpp':
  • trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py

    r60293 r61660  
    15431543        self.assert_lint('f(a, /* name */b);', '')
    15441544
     1545    def test_declaration(self):
     1546        self.assert_lint('int a;', '')
     1547        self.assert_lint('int   a;', 'Extra space between int and a  [whitespace/declaration] [3]')
     1548        self.assert_lint('int*  a;', 'Extra space between int* and a  [whitespace/declaration] [3]')
     1549        self.assert_lint('else if { }', '')
     1550        self.assert_lint('else   if { }', 'Extra space between else and if  [whitespace/declaration] [3]')
     1551
    15451552    def test_pointer_reference_marker_location(self):
    15461553        self.assert_lint('int* b;', '', 'foo.cpp')
Note: See TracChangeset for help on using the changeset viewer.