[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 303422470b7af1781137217dde1832826f2be8a1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 15:28:19 2010 +0000

    2010-02-23  Leandro Pereira  <leandro at profusion.mobi>
    
            Reviewed by NOBODY.
    
            Fix false positives for 'delete *pointer' statements.
            http://webkit.org/b/35235
    
            * WebKitTools/Scripts/webkitpy/style/processors/cpp.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 536204b..47c8696 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-23  Leandro Pereira  <leandro at profusion.mobi>
+
+        Reviewed by NOBODY.
+
+        Fix false positives for 'delete *pointer' statements.
+        http://webkit.org/b/35235
+
+        * WebKitTools/Scripts/webkitpy/style/processors/cpp.py:
+
 2010-02-23  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/style/processors/cpp.py b/WebKitTools/Scripts/webkitpy/style/processors/cpp.py
index f83ae6a..17bf84a 100644
--- a/WebKitTools/Scripts/webkitpy/style/processors/cpp.py
+++ b/WebKitTools/Scripts/webkitpy/style/processors/cpp.py
@@ -1367,7 +1367,7 @@ def check_spacing(file_extension, clean_lines, line_number, error):
 
     if file_extension == 'cpp':
         # C++ should have the & or * beside the type not the variable name.
-        matched = match(r'\s*\w+(?<!\breturn)\s+(?P<pointer_operator>\*|\&)\w+', line)
+        matched = match(r'\s*\w+(?<!\breturn|\bdelete)\s+(?P<pointer_operator>\*|\&)\w+', line)
         if matched:
             error(line_number, 'whitespace/declaration', 3,
                   'Declaration has space between type name and %s in %s' % (matched.group('pointer_operator'), matched.group(0).strip()))
diff --git a/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py b/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py
index c786b8e..4398d2e 100644
--- a/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py
@@ -1547,6 +1547,7 @@ class CppStyleTest(CppStyleTestBase):
                          'Declaration has space between type name and * in int *b  [whitespace/declaration] [3]',
                          'foo.cpp')
         self.assert_lint('return *b;', '', 'foo.cpp')
+        self.assert_lint('delete *b;', '', 'foo.cpp')
         self.assert_lint('int *b;', '', 'foo.c')
         self.assert_lint('int* b;',
                          'Declaration has space between * and variable name in int* b  [whitespace/declaration] [3]',

-- 
WebKit Debian packaging