Attachment 357838 Details for Bug 192931 – Patch

[patch] Patch

bug-192931-20181220113541.patch (text/plain), 4.12 KB, created by Chris Dumez on 2018-12-20 11:35:44 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-12-20 11:35:44 PST

Size: 4.12 KB

patch

obsolete

>Subversion Revision: 239428
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1ead344e3bf9420f09c9db706e46060e7aad47a4..b197892c2b414d9241d9e01535aaef61125ad164 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-12-20  Chris Dumez  <cdumez@apple.com>
>+
>+        Add style script rule to check for uses of std::optional<>
>+        https://bugs.webkit.org/show_bug.cgi?id=192931
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/style/checkers/cpp.py:
>+        (check_wtf_optional):
>+        (check_style):
>+
> 2018-12-20  Chris Dumez  <cdumez@apple.com>
> 
>         Use Optional::valueOr() instead of Optional::value_or()
>diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp.py b/Tools/Scripts/webkitpy/style/checkers/cpp.py
>index eca69fd53a34d0f308dade36cd544bad2a2d1fca..8cd2c052682e3ce37d4270e8019dfbd64773ec1c 100644
>--- a/Tools/Scripts/webkitpy/style/checkers/cpp.py
>+++ b/Tools/Scripts/webkitpy/style/checkers/cpp.py
>@@ -2378,6 +2378,26 @@ def check_wtf_move(clean_lines, line_number, file_state, error):
>     error(line_number, 'runtime/wtf_move', 4, "Use 'WTFMove()' instead of 'std::move()'.")
> 
> 
>+def check_wtf_optional(clean_lines, line_number, file_state, error):
>+    """Looks for use of 'std::optional<>' which should be replaced with 'WTF::Optional<>'.
>+
>+    Args:
>+      clean_lines: A CleansedLines instance containing the file.
>+      line_number: The number of the line to check.
>+      file_state: A _FileState instance which maintains information about
>+                  the state of things in the file.
>+      error: The function to call with any errors found.
>+    """
>+
>+    line = clean_lines.elided[line_number]  # Get rid of comments and strings.
>+
>+    using_std_optional = search(r'\boptional\s*\<', line)
>+    if not using_std_optional:
>+        return
>+
>+    error(line_number, 'runtime/wtf_optional', 4, "Use 'WTF::Optional<>' instead of 'std::optional<>'.")
>+
>+
> def check_ctype_functions(clean_lines, line_number, file_state, error):
>     """Looks for use of the standard functions in ctype.h and suggest they be replaced
>        by use of equivilent ones in <wtf/ASCIICType.h>?.
>@@ -2915,6 +2935,7 @@ def check_style(clean_lines, line_number, file_extension, class_state, file_stat
>     check_using_namespace(clean_lines, line_number, file_extension, error)
>     check_max_min_macros(clean_lines, line_number, file_state, error)
>     check_wtf_move(clean_lines, line_number, file_state, error)
>+    check_wtf_optional(clean_lines, line_number, file_state, error)
>     check_ctype_functions(clean_lines, line_number, file_state, error)
>     check_switch_indentation(clean_lines, line_number, error)
>     check_braces(clean_lines, line_number, file_state, error)
>@@ -4038,6 +4059,7 @@ class CppChecker(object):
>         'runtime/threadsafe_fn',
>         'runtime/unsigned',
>         'runtime/virtual',
>+        'runtime/wtf_optional',
>         'runtime/wtf_move',
>         'security/assertion',
>         'security/printf',
>diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
>index b299ead7f80792ec7927923312327ced2d500940..318d1c3e7ad18d214d9e50202d309b20f39cde29 100644
>--- a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
>+++ b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
>@@ -5081,6 +5081,29 @@ class WebKitStyleTest(CppStyleTestBase):
>             "  [runtime/wtf_move] [4]",
>             'foo.mm')
> 
>+    def test_wtf_optional(self):
>+        self.assert_lint(
>+             'Optional<int> a;',
>+             '',
>+             'foo.cpp')
>+
>+        self.assert_lint(
>+             'WTF::Optional<int> a;',
>+             '',
>+             'foo.cpp')
>+
>+        self.assert_lint(
>+            'std::optional<int> a;',
>+            "Use 'WTF::Optional<>' instead of 'std::optional<>'."
>+            "  [runtime/wtf_optional] [4]",
>+            'foo.cpp')
>+
>+        self.assert_lint(
>+            'optional<int> a;',
>+            "Use 'WTF::Optional<>' instead of 'std::optional<>'."
>+            "  [runtime/wtf_optional] [4]",
>+            'foo.cpp')
>+
>     def test_ctype_fucntion(self):
>         self.assert_lint(
>             'int i = isascii(8);',

Actions: View | Formatted Diff | Diff

Attachments on bug 192931: 357814 | 357818 | 357838