Changeset 88256 in webkit

Timestamp:

Jun 7, 2011 12:55:04 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-07 Dmitry Lomov <​dslomov@google.com>

Reviewed by David Levin.

​https://bugs.webkit.org/show_bug.cgi?id=62215
Allow comparisons with 0 in LIKELY and UNLIKELY macros.

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

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 @@
+2011-06-07  Dmitry Lomov  <dslomov@google.com>
+
+        Reviewed by David Levin.
+
+        https://bugs.webkit.org/show_bug.cgi?id=62215
+        Allow comparisons with 0 in LIKELY and UNLIKELY macros.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+
 2011-06-07  Nico Weber  <thakis@chromium.org>
 

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

@@ -2342 +2342 @@
     # Include NULL here so that users don't have to convert NULL to 0 first and then get this error.
     if search(r'[=!]=\s*(NULL|0|true|false)\W', line) or search(r'\W(NULL|0|true|false)\s*[=!]=', line):
-        error(line_number, 'readability/comparison_to_zero', 5,
-              'Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons.')
+        if not search('LIKELY', line) and not search('UNLIKELY', line):
+            error(line_number, 'readability/comparison_to_zero', 5,
+                  'Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons.')
 
 

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

@@ -4138 +4138 @@
             'if (othertrue == fontType)',
             '')
+        self.assert_lint(
+            'if (LIKELY(foo == 0))',
+            '')
+        self.assert_lint(
+            'if (UNLIKELY(foo == 0))',
+            '')
+        self.assert_lint(
+            'if (LIKELY(foo == NULL))',
+            'Use 0 instead of NULL.  [readability/null] [5]')
+        self.assert_lint(
+            'if (UNLIKELY(foo == NULL))',
+            'Use 0 instead of NULL.  [readability/null] [5]')
+
 
     def test_using_std(self):