Changeset 69953 in webkit

Timestamp:

Oct 18, 2010 4:57:36 AM (14 years ago)

Author:

levin@chromium.org

Message:

2010-10-18 David Levin <​levin@chromium.org>

Reviewed by Oliver Hunt.

check-webkit-style needs to ignore underscores in opcode names and vm_throw
​https://bugs.webkit.org/show_bug.cgi?id=47789

• Scripts/webkitpy/style/checker.py: Added the exception for the assembler directory.
• Scripts/webkitpy/style/checkers/cpp.py: Added special cased names.
• Scripts/webkitpy/style/checkers/cpp_unittest.py: Added unit tests for the special cases.

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-18  David Levin  <levin@chromium.org>
+
+        Reviewed by Oliver Hunt.
+
+        check-webkit-style needs to ignore underscores in opcode names and vm_throw
+        https://bugs.webkit.org/show_bug.cgi?id=47789
+
+        * Scripts/webkitpy/style/checker.py: Added the exception for the assembler directory.
+        * Scripts/webkitpy/style/checkers/cpp.py: Added special cased names.
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py: Added unit tests for the special cases.
+
 2010-10-18  MORITA Hajime  <morrita@google.com>
 

trunk/WebKitTools/Scripts/webkitpy/style/checker.py

@@ -143 +143 @@
       "/ForwardingHeaders/"],
      ["-build/header_guard"]),
+    ([# assembler has lots of opcodes that use underscores, so
+      # we on't check for underscores in that directory.
+      "/JavaScriptCore/assembler/"],
+     ["-readability/naming"]),
 
     # For third-party Python code, keep only the following checks--

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

@@ -2513 +2513 @@
         if modified_identifier.find('_') >= 0:
             # Various exceptions to the rule: JavaScript op codes functions, const_iterator.
-            if (not (filename.find('JavaScriptCore') >= 0 and modified_identifier.find('_op_') >= 0)
+            if (not (filename.find('JavaScriptCore') >= 0 and modified_identifier.find('op_') >= 0)
                 and not modified_identifier.startswith('tst_')
                 and not modified_identifier.startswith('webkit_dom_object_')
@@ -2522 +2522 @@
                 and not modified_identifier.startswith('cairo_')
                 and not modified_identifier.find('::qt_') >= 0
-                and not modified_identifier == "const_iterator"):
+                and not modified_identifier == "const_iterator"
+                and not modified_identifier == "vm_throw"):
                 error(line_number, 'readability/naming', 4, identifier + " is incorrectly named. Don't use underscores in your identifier names.")
 

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

@@ -3691 +3691 @@
         # There is an exception for op code functions but only in the JavaScriptCore directory.
         self.assert_lint('void this_op_code(int var1, int var2)', '', 'JavaScriptCore/foo.cpp')
+        self.assert_lint('void op_code(int var1, int var2)', '', 'JavaScriptCore/foo.cpp')
         self.assert_lint('void this_op_code(int var1, int var2)', 'this_op_code' + name_underscore_error_message)
 
@@ -3716 +3717 @@
         # const_iterator is allowed as well.
         self.assert_lint('typedef VectorType::const_iterator const_iterator;', '')
+
+        # vm_throw is allowed as well.
+        self.assert_lint('int vm_throw;', '')
 
         # Bitfields.