Skip to content

Commit d0428fe

Browse files
annevkannevk
committed
Update style script to mention m_foo as other alternative to protectedFoo()
https://bugs.webkit.org/show_bug.cgi?id=294024 Reviewed by Tim Nguyen. Also covers checkedFoo(). Canonical link: https://commits.webkit.org/295842@main
1 parent 5f9d542 commit d0428fe

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3649,10 +3649,10 @@ def check_safer_cpp(clean_lines, line_number, error):
36493649
error(line_number, 'safercpp/sqlite3_column_blob', 4, "Use sqliteColumnBlob() instead of sqlite3_column_blob().")
36503650

36513651
if search(r'= [a-zA-Z0-9_.(),\s\->]*protected[a-zA-Z0-9]+\(\)[;\)]', line):
3652-
error(line_number, 'safercpp/protected_getter_for_init', 4, "Use foo() instead of protectedFoo() for variable initialization.")
3652+
error(line_number, 'safercpp/protected_getter_for_init', 4, "Use m_foo or foo() instead of protectedFoo() for variable initialization.")
36533653

36543654
if search(r'= [a-zA-Z0-9_.(),\s\->]*checked[a-zA-Z0-9]+\(\)[;\)]', line):
3655-
error(line_number, 'safercpp/checked_getter_for_init', 4, "Use foo() instead of checkedFoo() for variable initialization.")
3655+
error(line_number, 'safercpp/checked_getter_for_init', 4, "Use m_foo or foo() instead of checkedFoo() for variable initialization.")
36563656

36573657
def check_style(clean_lines, line_number, file_extension, class_state, file_state, enum_state, error):
36583658
"""Checks rules from the 'C++ style rules' section of cppguide.html.

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6382,122 +6382,122 @@ def test_safer_cpp(self):
63826382

63836383
self.assert_lint(
63846384
'auto foo = protectedFoo();',
6385-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6385+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
63866386
'foo.cpp')
63876387

63886388
self.assert_lint(
63896389
'auto foo = checkedFoo();',
6390-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6390+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
63916391
'foo.cpp')
63926392

63936393
self.assert_lint(
63946394
'Ref foo = protectedFoo();',
6395-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6395+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
63966396
'foo.cpp')
63976397

63986398
self.assert_lint(
63996399
'CheckedRef foo = checkedFoo();',
6400-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6400+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64016401
'foo.cpp')
64026402

64036403
self.assert_lint(
64046404
'RefPtr foo = protectedFoo();',
6405-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6405+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64066406
'foo.cpp')
64076407

64086408
self.assert_lint(
64096409
'CheckedPtr foo = checkedFoo();',
6410-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6410+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64116411
'foo.cpp')
64126412

64136413
self.assert_lint(
64146414
'RefPtr bar = foo()->protectedBar();',
6415-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6415+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64166416
'foo.cpp')
64176417

64186418
self.assert_lint(
64196419
'CheckedPtr bar = foo()->checkedBar();',
6420-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6420+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64216421
'foo.cpp')
64226422

64236423
self.assert_lint(
64246424
'RefPtr bar = foo().protectedBar();',
6425-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6425+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64266426
'foo.cpp')
64276427

64286428
self.assert_lint(
64296429
'CheckedPtr bar = foo().checkedBar();',
6430-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6430+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64316431
'foo.cpp')
64326432

64336433
self.assert_lint(
64346434
'RefPtr bar = m_foo->protectedBar();',
6435-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6435+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64366436
'foo.cpp')
64376437

64386438
self.assert_lint(
64396439
'CheckedPtr bar = m_foo->checkedBar();',
6440-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6440+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64416441
'foo.cpp')
64426442

64436443
self.assert_lint(
64446444
'RefPtr bar = foo(1, 2)->protectedBar();',
6445-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6445+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64466446
'foo.cpp')
64476447

64486448
self.assert_lint(
64496449
'CheckedPtr bar = foo(1, 2)->checkedBar();',
6450-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6450+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64516451
'foo.cpp')
64526452

64536453
self.assert_lint(
64546454
'if (RefPtr bar = protectedBar())',
6455-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6455+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64566456
'foo.cpp')
64576457

64586458
self.assert_lint(
64596459
'if (CheckedPtr bar = checkedBar())',
6460-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6460+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64616461
'foo.cpp')
64626462

64636463
self.assert_lint(
64646464
'if (RefPtr bar = foo()->protectedBar())',
6465-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6465+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64666466
'foo.cpp')
64676467

64686468
self.assert_lint(
64696469
'if (CheckedPtr bar = foo()->checkedBar())',
6470-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6470+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64716471
'foo.cpp')
64726472

64736473
self.assert_lint(
64746474
'if (RefPtr bar = protectedBar()) {',
6475-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6475+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64766476
'foo.cpp')
64776477

64786478
self.assert_lint(
64796479
'if (CheckedPtr bar = checkedBar()) {',
6480-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6480+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64816481
'foo.cpp')
64826482

64836483
self.assert_lint(
64846484
'if (RefPtr bar = foo()->protectedBar()) {',
6485-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6485+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64866486
'foo.cpp')
64876487

64886488
self.assert_lint(
64896489
'if (CheckedPtr bar = foo()->checkedBar()) {',
6490-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6490+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
64916491
'foo.cpp')
64926492

64936493
self.assert_lint(
64946494
'if (RefPtr bar = foo().protectedBar()) {',
6495-
'Use foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
6495+
'Use m_foo or foo() instead of protectedFoo() for variable initialization. [safercpp/protected_getter_for_init] [4]',
64966496
'foo.cpp')
64976497

64986498
self.assert_lint(
64996499
'if (CheckedPtr bar = foo().checkedBar()) {',
6500-
'Use foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
6500+
'Use m_foo or foo() instead of checkedFoo() for variable initialization. [safercpp/checked_getter_for_init] [4]',
65016501
'foo.cpp')
65026502

65036503
self.assert_lint('auto foo = protectedFoo()->bar();', '')

0 commit comments

Comments
 (0)