Changeset 181669 in webkit

Timestamp:

Mar 17, 2015, 3:57:40 PM (11 years ago)

Author:

dino@apple.com

Message:

check-webkit-style should allow "bool a : 1"
​https://bugs.webkit.org/show_bug.cgi?id=142794

Reviewed by Brent Fulgham.

We should allow member bitfields of the form:

bool m_var : 1;

It seems that Visual Studio 8 was the last compiler that
wasn't happy about not using unsigned here. We already have
about 500 cases (in WebCore) where people were ignoring this rule.

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

(check_language): Allow "bool".

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

(CppStyleTest.test_enum_bitfields):
(CppStyleTest.test_plain_integral_bitfields):

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 @@
+2015-03-17  Dean Jackson  <dino@apple.com>
+
+        check-webkit-style should allow "bool a : 1"
+        https://bugs.webkit.org/show_bug.cgi?id=142794
+
+        Reviewed by Brent Fulgham.
+
+        We should allow member bitfields of the form:
+
+        bool m_var : 1;
+
+        It seems that Visual Studio 8 was the last compiler that
+        wasn't happy about not using unsigned here. We already have
+        about 500 cases (in WebCore) where people were ignoring this rule.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_language): Allow "bool".
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py: Add tests.
+        (CppStyleTest.test_enum_bitfields):
+        (CppStyleTest.test_plain_integral_bitfields):
+
 2015-03-17  Benjamin Poulain  <bpoulain@apple.com>
 

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

@@ -3274 +3274 @@
     if matched:
         # Make sure the type is an enum and not an integral type
-        if not match(r'char|(short(\s+int)?)|int|long(\s+(long|int))|(signed|unsigned)(\s+int)?', matched.group(3)):
+        if not match(r'bool|char|(short(\s+int)?)|int|long(\s+(long|int))|(signed|unsigned)(\s+int)?', matched.group(3)):
             error(line_number, 'runtime/enum_bitfields', 5,
                   'Please declare enum bitfields as unsigned integral types.')

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

@@ -2553 +2553 @@
         self.assert_lint('mutable AnEnum a : 14;', errmsg)
         self.assert_lint('const AnEnum a : 6;', errmsg)
+        self.assert_lint('bool a : 1;', '')
 
     # Integral bitfields must be declared with either signed or unsigned keyword.
@@ -2563 +2564 @@
         self.assert_lint('long int a : 30;', errmsg)
         self.assert_lint('int a = 1 ? 0 : 30;', '')
-
+        self.assert_lint('bool a : 1;', '')
 
 class CleansedLinesTest(unittest.TestCase):