Changeset 254140 in webkit

Timestamp:

Jan 7, 2020 11:04:01 AM (4 years ago)

Author:

basuke.suzuki@sony.com

Message:

check-webkit-style: bmalloc doesn't use config.h
​https://bugs.webkit.org/show_bug.cgi?id=205840

Reviewed by Jonathan Bedard.

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

(_IncludeState.check_next_include_order):
(check_include_line):
(check_has_config_header):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-01-07  Basuke Suzuki  <basuke.suzuki@sony.com>
+
+        check-webkit-style: bmalloc doesn't use config.h
+        https://bugs.webkit.org/show_bug.cgi?id=205840
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (_IncludeState.check_next_include_order):
+        (check_include_line):
+        (check_has_config_header):
+
 2020-01-07  youenn fablet  <youenn@apple.com>
 

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

@@ -138 +138 @@
 
 
+_NO_CONFIG_H_PATH_PATTERNS = [
+    '^Source/bmalloc/',
+]
+
 def iteratively_replace_matches_with_char(pattern, char_replacement, s):
     """Returns the string with replacement done.
@@ -295 +299 @@
         return self._visited_soft_link_section
 
-    def check_next_include_order(self, header_type, filename, file_is_header, primary_header_exists):
+    def check_next_include_order(self, header_type, filename, file_is_header, primary_header_exists, has_config_header):
         """Returns a non-empty error message if the next header is out of order.
 
@@ -306 +310 @@
           file_is_header: Whether the file that owns this _IncludeState is itself a header
           primary_header_exists: Whether the primary header file actually exists on disk
+          has_config_header: Whether project uses config.h or not.
 
         Returns:
@@ -335 +340 @@
             if self._section >= self._PRIMARY_SECTION:
                 error_message = after_error_message
-            elif self._section < self._CONFIG_SECTION:
+            elif has_config_header and self._section < self._CONFIG_SECTION:
                 error_message = before_error_message
             self._section = self._PRIMARY_SECTION
@@ -3182 +3187 @@
     header_type = _classify_include(filename, include, is_system, include_state)
     primary_header_exists = _does_primary_header_exist(filename)
+    has_config_header = check_has_config_header(filename)
+
     include_state.header_types[line_number] = header_type
 
@@ -3196 +3203 @@
                                                            filename,
                                                            file_extension == "h",
-                                                           primary_header_exists)
+                                                           primary_header_exists,
+                                                           has_config_header)
 
     # Check to make sure *SoftLink.h headers always appear last and never in a header.
@@ -3210 +3218 @@
             error(line_number, 'build/include_order', 4,
                 'You should add a blank line after implementation file\'s own header.')
-        if is_blank_line(previous_line):
+        if has_config_header and is_blank_line(previous_line):
             error(line_number, 'build/include_order', 4,
                 'You should not add a blank line before implementation file\'s own header.')
@@ -3799 +3807 @@
     file_path = file_path.replace(os.path.sep, '/')
     return file_path in _AUTO_GENERATED_FILES
+
+
+def check_has_config_header(file_path):
+    """Check if the module uses config.h"""
+    file_path = file_path.replace(os.path.sep, '/')
+    for pattern in _NO_CONFIG_H_PATH_PATTERNS:
+        if re.match(pattern, file_path):
+            return False
+    return True
 
 

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

@@ -2948 +2948 @@
     def test_check_next_include_order__no_config(self):
         self.assertEqual('Header file should not contain WebCore config.h.',
-                         self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.h', True, True))
+                         self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.h', True, True, True))
 
     def test_check_next_include_order__no_self(self):
         self.assertEqual('Header file should not contain itself.',
-                         self.include_state.check_next_include_order(cpp_style._PRIMARY_HEADER, 'Foo.h', True, True))
+                         self.include_state.check_next_include_order(cpp_style._PRIMARY_HEADER, 'Foo.h', True, True, True))
         # Test actual code to make sure that header types are correctly assigned.
         self.assert_language_rules_check('Foo.h',
@@ -2964 +2964 @@
     def test_check_next_include_order__likely_then_config(self):
         self.assertEqual('Found header this file implements before WebCore config.h.',
-                         self.include_state.check_next_include_order(cpp_style._PRIMARY_HEADER, 'Foo.cpp', False, True))
+                         self.include_state.check_next_include_order(cpp_style._PRIMARY_HEADER, 'Foo.cpp', False, True, True))
         self.assertEqual('Found WebCore config.h after a header this file implements.',
-                         self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.cpp', False, True))
+                         self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.cpp', False, True, True))
+
+    def test_check_next_include_order__no_config_module(self):
+        self.assertEqual('',
+                         self.include_state.check_next_include_order(cpp_style._PRIMARY_HEADER, 'Foo.cpp', False, True, False))
 
     def test_check_next_include_order__other_then_config(self):
         self.assertEqual('Found other header before WebCore config.h.',
-                         self.include_state.check_next_include_order(cpp_style._OTHER_HEADER, 'Foo.cpp', False, True))
+                         self.include_state.check_next_include_order(cpp_style._OTHER_HEADER, 'Foo.cpp', False, True, True))
         self.assertEqual('Found WebCore config.h after other header.',
-                         self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.cpp', False, True))
+                         self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.cpp', False, True, True))
 
     def test_check_next_include_order__config_then_other_then_likely(self):
-        self.assertEqual('', self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.cpp', False, True))
+        self.assertEqual('', self.include_state.check_next_include_order(cpp_style._CONFIG_HEADER, 'Foo.cpp', False, True, True))
         self.assertEqual('Found other header before a header this file implements.',
-                         self.include_state.check_next_include_order(cpp_style._OTHER_HEADER, 'Foo.cpp', False, True))
+                         self.include_state.check_next_include_order(cpp_style._OTHER_HEADER, 'Foo.cpp', False, True, True))
         self.assertEqual('Found header this file implements after other header.',
-                         self.include_state.check_next_include_order(cpp_style._PRIMARY_HEADER, 'Foo.cpp', False, True))
+                         self.include_state.check_next_include_order(cpp_style._PRIMARY_HEADER, 'Foo.cpp', False, True, True))
 
     def test_check_alphabetical_include_order(self):