Changeset 161510 in webkit

Timestamp:

Jan 8, 2014 9:48:04 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r161427.
​http://trac.webkit.org/changeset/161427
​https://bugs.webkit.org/show_bug.cgi?id=126645

Emits a stye error on any newly added files (Requested by ap
on #webkit).

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

(check_style):
(CppChecker):

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

(WebKitStyleTest.test_other):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (2 diffs)
• Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-01-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r161427.
+        http://trac.webkit.org/changeset/161427
+        https://bugs.webkit.org/show_bug.cgi?id=126645
+
+        Emits a stye error on any newly added files (Requested by ap
+        on #webkit).
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_style):
+        (CppChecker):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_other):
+
 2014-01-08  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
 

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

@@ -2720 +2720 @@
     check_enum_casing(clean_lines, line_number, enum_state, error)
 
-    # #defined constants should use all uppercase names with words separated by underscores.
-    define_check = match(r'#define\s(?P<name>[\w_]+)(\s.*|\s?)$', line)
-    if define_check:
-        name = define_check.group('name')
-        if not match(r'^[0-9A-Z_]+$', name):
-            error(line_number, 'readability/naming/define/constants', 4,
-                name + " is incorrect. #defined constants should use all uppercase names with words separated by underscores.")
-
 
 _RE_PATTERN_INCLUDE_NEW_STYLE = re.compile(r'#include +"[^/]+\.h"')
@@ -3709 +3701 @@
         'readability/naming',
         'readability/naming/underscores',
-        'readability/naming/define/constants',
         'readability/null',
         'readability/pass_ptr',

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

@@ -5027 +5027 @@
         pass
 
-    def test_define_constants(self):
-        bad_name_error = " is incorrect. #defined constants should use all uppercase names with words separated by underscores.  [readability/naming/define/constants] [4]"
-
-        self.assert_lint('#define lower1case', 'lower1case' + bad_name_error)
-        self.assert_lint('#define UPPER1CASE', '')
-        self.assert_lint('#define mixed1CASE', 'mixed1CASE' + bad_name_error)
-        self.assert_lint('#define lower_1case', 'lower_1case' + bad_name_error)
-        self.assert_lint('#define UPPER_1CASE', '')
-        self.assert_lint('#define mixed_1CASE', 'mixed_1CASE' + bad_name_error)
-        self.assert_lint('#define dlower1case some(bla)', 'dlower1case' + bad_name_error)
-        self.assert_lint('#define DUPPER1CASE dd(foo)', '')
-        self.assert_lint('#define Dmixed1CASE dkjgh[sdf]', 'Dmixed1CASE' + bad_name_error)
-
 
 class CppCheckerTest(unittest.TestCase):