Changeset 200913 in webkit

Timestamp:

May 13, 2016 9:45:42 PM (8 years ago)

Author:

beidson@apple.com

Message:

Extend protector naming code style guideline to cover operator= assignment.
​https://bugs.webkit.org/show_bug.cgi?id=157693

Reviewed by Darin Adler.

Tools:

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

(check_identifier_name_in_declaration):

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

(WebKitStyleTest.test_names):

Websites/webkit.org:

• code-style.md:

Location:

trunk

Files:

• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/style/checkers/cpp.py (modified) (1 diff)
• Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (2 diffs)
• Websites/webkit.org/ChangeLog (modified) (1 diff)
• Websites/webkit.org/code-style.md (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-05-13  Brady Eidson  <beidson@apple.com>
+
+        Extend protector naming code style guideline to cover operator= assignment.
+        https://bugs.webkit.org/show_bug.cgi?id=157693
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_identifier_name_in_declaration):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_names):
+
 2016-05-13  Aakash Jain  <aakash_jain@apple.com>
 

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

@@ -3293 +3293 @@
 
     # Make sure Ref/RefPtrs used as protectors are named correctly, and do this before we start stripping things off the input.
-    ref_regexp = r'^\s*Ref(Ptr)?<([\w_]|::)+> (?P<protector_name>[\w_]+)\((\*|&)*(m_)?(?P<protected_name>[\w_]+)\);'
+    ref_regexp = r'^\s*Ref(Ptr)?<([\w_]|::)+> (?P<protector_name>[\w_]+)(\(| = )(\*|&)*(m_)?(?P<protected_name>[\w_]+)\)?;'
     ref_check = match(ref_regexp, line)
     if ref_check:

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

@@ -5205 +5205 @@
         self.assert_lint('RefPtr<SomeNamespace::Node> protectedThis(this);', '')
         self.assert_lint('RefPtr<SomeClass::InternalClass::Node> protectedThis(this);', '')
+        self.assert_lint('RefPtr<Node> protectedThis = this;', '')
+        self.assert_lint('Ref<Node> protectedThis = *this;', '')
+        self.assert_lint('RefPtr<Node> protectedNode = node;', '')
+        self.assert_lint('RefPtr<Node> protectedNode = &node;', '')
+        self.assert_lint('RefPtr<Node> protector = node;', '')
+        self.assert_lint('RefPtr<Node> protector = &node;', '')
+        self.assert_lint('Ref<Node> protectedNode = node;', '')
+        self.assert_lint('Ref<Node> protectedNode =*node;', '')
+        self.assert_lint('Ref<Node> protector = node;', '')
+        self.assert_lint('Ref<Node> protector = *node;', '')
+
 
         # Invalid protector RefPtr/Ref variable names.
         self.assert_lint('RefPtr<Node> protector(this);', "'protector' is incorrectly named. It should be named 'protectedThis'.  [readability/naming/protected] [4]")
         self.assert_lint('Ref<Node> protector(*this);', "'protector' is incorrectly named. It should be named 'protectedThis'.  [readability/naming/protected] [4]")
+        self.assert_lint('RefPtr<Node> protector = this;', "'protector' is incorrectly named. It should be named 'protectedThis'.  [readability/naming/protected] [4]")
+        self.assert_lint('Ref<Node> protector = *this;', "'protector' is incorrectly named. It should be named 'protectedThis'.  [readability/naming/protected] [4]")
         self.assert_lint('RefPtr<Node> self(this);', "'self' is incorrectly named. It should be named 'protectedThis'.  [readability/naming/protected] [4]")
         self.assert_lint('Ref<Node> self(*this);', "'self' is incorrectly named. It should be named 'protectedThis'.  [readability/naming/protected] [4]")
@@ -5219 +5232 @@
         self.assert_lint('Ref<Node> protectedNode(otherNode);', "'protectedNode' is incorrectly named. It should be named 'protector' or 'protectedOtherNode'.  [readability/naming/protected] [4]")
         self.assert_lint('Ref<Node> protectedNode(*otherNode);', "'protectedNode' is incorrectly named. It should be named 'protector' or 'protectedOtherNode'.  [readability/naming/protected] [4]")
+        self.assert_lint('RefPtr<Node> protectedNode = otherNode;', "'protectedNode' is incorrectly named. It should be named 'protector' or 'protectedOtherNode'.  [readability/naming/protected] [4]")
+        self.assert_lint('RefPtr<Node> protectedNode = &otherNode;', "'protectedNode' is incorrectly named. It should be named 'protector' or 'protectedOtherNode'.  [readability/naming/protected] [4]")
+        self.assert_lint('Ref<Node> protectedNode = otherNode;', "'protectedNode' is incorrectly named. It should be named 'protector' or 'protectedOtherNode'.  [readability/naming/protected] [4]")
+        self.assert_lint('Ref<Node> protectedNode = *otherNode;', "'protectedNode' is incorrectly named. It should be named 'protector' or 'protectedOtherNode'.  [readability/naming/protected] [4]")
         self.assert_lint('RefPtr<Node> nodeRef(node);', "'nodeRef' is incorrectly named. It should be named 'protector' or 'protectedNode'.  [readability/naming/protected] [4]")
         self.assert_lint('Ref<Node> nodeRef(*node);', "'nodeRef' is incorrectly named. It should be named 'protector' or 'protectedNode'.  [readability/naming/protected] [4]")

trunk/Websites/webkit.org/ChangeLog

@@ +1 @@
+2016-05-13  Brady Eidson  <beidson@apple.com>
+
+        Extend protector naming code style guideline to cover operator= assignment.
+        https://bugs.webkit.org/show_bug.cgi?id=157693
+
+        Reviewed by Darin Adler.
+
+        * code-style.md:
+
 2016-05-13  Brady Eidson  <beidson@apple.com>
 

trunk/Websites/webkit.org/code-style.md

@@ -721 +721 @@
 RefPtr<Node> protectedThis(this);
 Ref<Element> protectedThis(*this);
+RefPtr<Widget> protectedThis = this;
 ```
 
@@ -727 +728 @@
 ```cpp
 RefPtr<Node> protector(this);
+Ref<Node> protector = *this;
 RefPtr<Widget> self(this);
 Ref<Element> elementRef(*this);
@@ -737 +739 @@
 ```cpp
 RefPtr<Element> protector(&element);
+RefPtr<Element> protector = &element;
 RefPtr<Node> protectedNode(node);
 RefPtr<Widget> protectedMainWidget(m_mainWidget);
+RefPtr<Loader> protectedFontLoader = m_fontLoader;
 ```
 
@@ -746 +750 @@
 RefPtr<Node> nodeRef(&rootNode);
 Ref<Element> protect(*element);
-RefPtr<Widget> protected(widget);
 RefPtr<Node> protectorNode(node);
+RefPtr<Widget> protected = widget;
 ```