Skip to content

Commit 877594c

Browse files
firewavefirewave
committed
fixed misc-confusable-identifiers clang-tidy warnings
1 parent e07b027 commit 877594c

2 files changed

Lines changed: 101 additions & 101 deletions

File tree

‎test/testsimplifytemplate.cpp‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4683,43 +4683,43 @@ class TestSimplifyTemplate : public TestFixture {
46834683
}
46844684

46854685
void template_enum() {
4686-
const char code1[] = "template <class T>\n"
4687-
"struct Unconst {\n"
4688-
" typedef T type;\n"
4689-
"};\n"
4690-
"template <class T>\n"
4691-
"struct Unconst<const T> {\n"
4692-
" typedef T type;\n"
4693-
"};\n"
4694-
"template <class T>\n"
4695-
"struct Unconst<const T&> {\n"
4696-
" typedef T& type;\n"
4697-
"};\n"
4698-
"template <class T>\n"
4699-
"struct Unconst<T* const> {\n"
4700-
" typedef T* type;\n"
4701-
"};\n"
4702-
"template <class T1, class T2>\n"
4703-
"struct type_equal {\n"
4704-
" enum { value = 0 };\n"
4705-
"};\n"
4706-
"template <class T>\n"
4707-
"struct type_equal<T, T> {\n"
4708-
" enum { value = 1 };\n"
4709-
"};\n"
4710-
"template<class T>\n"
4711-
"struct template_is_const\n"
4712-
"{\n"
4713-
" enum {value = !type_equal<T, typename Unconst<T>::type>::value };\n"
4714-
"};";
4715-
const char exp1[] = "template < class T > struct Unconst { } ; "
4716-
"template < class T > struct Unconst < const T > { } ; "
4717-
"template < class T > struct Unconst < const T & > { } ; "
4718-
"template < class T > struct Unconst < T * const > { } ; "
4719-
"template < class T1 , class T2 > struct type_equal { enum Anonymous0 { value = 0 } ; } ; "
4720-
"template < class T > struct type_equal < T , T > { enum Anonymous1 { value = 1 } ; } ; "
4721-
"template < class T > struct template_is_const { enum Anonymous2 { value = ! type_equal < T , Unconst < T > :: type > :: value } ; } ;";
4722-
ASSERT_EQUALS(exp1, tok(code1));
4686+
const char code[] = "template <class T>\n"
4687+
"struct Unconst {\n"
4688+
" typedef T type;\n"
4689+
"};\n"
4690+
"template <class T>\n"
4691+
"struct Unconst<const T> {\n"
4692+
" typedef T type;\n"
4693+
"};\n"
4694+
"template <class T>\n"
4695+
"struct Unconst<const T&> {\n"
4696+
" typedef T& type;\n"
4697+
"};\n"
4698+
"template <class T>\n"
4699+
"struct Unconst<T* const> {\n"
4700+
" typedef T* type;\n"
4701+
"};\n"
4702+
"template <class T1, class T2>\n"
4703+
"struct type_equal {\n"
4704+
" enum { value = 0 };\n"
4705+
"};\n"
4706+
"template <class T>\n"
4707+
"struct type_equal<T, T> {\n"
4708+
" enum { value = 1 };\n"
4709+
"};\n"
4710+
"template<class T>\n"
4711+
"struct template_is_const\n"
4712+
"{\n"
4713+
" enum {value = !type_equal<T, typename Unconst<T>::type>::value };\n"
4714+
"};";
4715+
const char exp[] = "template < class T > struct Unconst { } ; "
4716+
"template < class T > struct Unconst < const T > { } ; "
4717+
"template < class T > struct Unconst < const T & > { } ; "
4718+
"template < class T > struct Unconst < T * const > { } ; "
4719+
"template < class T1 , class T2 > struct type_equal { enum Anonymous0 { value = 0 } ; } ; "
4720+
"template < class T > struct type_equal < T , T > { enum Anonymous1 { value = 1 } ; } ; "
4721+
"template < class T > struct template_is_const { enum Anonymous2 { value = ! type_equal < T , Unconst < T > :: type > :: value } ; } ;";
4722+
ASSERT_EQUALS(exp, tok(code));
47234723
}
47244724

47254725
void template_default_parameter() {

‎test/testvarid.cpp‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3307,31 +3307,31 @@ class TestVarID : public TestFixture {
33073307
}
33083308

33093309
void varid_trailing_return1() { // #8889
3310-
const char code1[] = "struct Fred {\n"
3311-
" auto foo(const Fred & other) -> Fred &;\n"
3312-
" auto bar(const Fred & other) -> Fred & {\n"
3313-
" return *this;\n"
3314-
" }\n"
3315-
"};\n"
3316-
"auto Fred::foo(const Fred & other) -> Fred & {\n"
3317-
" return *this;\n"
3318-
"}";
3319-
const char exp1[] = "1: struct Fred {\n"
3320-
"2: auto foo ( const Fred & other@1 ) . Fred & ;\n"
3321-
"3: auto bar ( const Fred & other@2 ) . Fred & {\n"
3322-
"4: return * this ;\n"
3323-
"5: }\n"
3324-
"6: } ;\n"
3325-
"7: auto Fred :: foo ( const Fred & other@3 ) . Fred & {\n"
3326-
"8: return * this ;\n"
3327-
"9: }\n";
3328-
ASSERT_EQUALS(exp1, tokenize(code1));
3310+
const char code[] = "struct Fred {\n"
3311+
" auto foo(const Fred & other) -> Fred &;\n"
3312+
" auto bar(const Fred & other) -> Fred & {\n"
3313+
" return *this;\n"
3314+
" }\n"
3315+
"};\n"
3316+
"auto Fred::foo(const Fred & other) -> Fred & {\n"
3317+
" return *this;\n"
3318+
"}";
3319+
const char exp[] = "1: struct Fred {\n"
3320+
"2: auto foo ( const Fred & other@1 ) . Fred & ;\n"
3321+
"3: auto bar ( const Fred & other@2 ) . Fred & {\n"
3322+
"4: return * this ;\n"
3323+
"5: }\n"
3324+
"6: } ;\n"
3325+
"7: auto Fred :: foo ( const Fred & other@3 ) . Fred & {\n"
3326+
"8: return * this ;\n"
3327+
"9: }\n";
3328+
ASSERT_EQUALS(exp, tokenize(code));
33293329
}
33303330

33313331
void varid_trailing_return2() { // #9066
3332-
const char code1[] = "auto func(int arg) -> bar::quux {}";
3333-
const char exp1[] = "1: auto func ( int arg@1 ) . bar :: quux { }\n";
3334-
ASSERT_EQUALS(exp1, tokenize(code1));
3332+
const char code[] = "auto func(int arg) -> bar::quux {}";
3333+
const char exp[] = "1: auto func ( int arg@1 ) . bar :: quux { }\n";
3334+
ASSERT_EQUALS(exp, tokenize(code));
33353335
}
33363336

33373337
void varid_trailing_return3() { // #11423
@@ -3347,15 +3347,15 @@ class TestVarID : public TestFixture {
33473347
}
33483348

33493349
void varid_parameter_pack() { // #9383
3350-
const char code1[] = "template <typename... Rest>\n"
3351-
"void func(Rest... parameters) {\n"
3352-
" foo(parameters...);\n"
3353-
"}\n";
3354-
const char exp1[] = "1: template < typename ... Rest >\n"
3355-
"2: void func ( Rest ... parameters@1 ) {\n"
3356-
"3: foo ( parameters@1 ... ) ;\n"
3357-
"4: }\n";
3358-
ASSERT_EQUALS(exp1, tokenize(code1));
3350+
const char code[] = "template <typename... Rest>\n"
3351+
"void func(Rest... parameters) {\n"
3352+
" foo(parameters...);\n"
3353+
"}\n";
3354+
const char exp[] = "1: template < typename ... Rest >\n"
3355+
"2: void func ( Rest ... parameters@1 ) {\n"
3356+
"3: foo ( parameters@1 ... ) ;\n"
3357+
"4: }\n";
3358+
ASSERT_EQUALS(exp, tokenize(code));
33593359
}
33603360

33613361
void varid_for_auto_cpp17() {
@@ -3365,23 +3365,23 @@ class TestVarID : public TestFixture {
33653365
" }\n"
33663366
" x+y+z;\n"
33673367
"}";
3368-
const char exp1[] = "1: void f ( ) {\n"
3369-
"2: for ( auto [ x@1 , y@2 , z@3 ] : xyz ) {\n"
3370-
"3: x@1 + y@2 + z@3 ;\n"
3371-
"4: }\n"
3372-
"5: x + y + z ;\n"
3373-
"6: }\n";
3374-
ASSERT_EQUALS(exp1, tokenize(code));
3368+
const char exp[] = "1: void f ( ) {\n"
3369+
"2: for ( auto [ x@1 , y@2 , z@3 ] : xyz ) {\n"
3370+
"3: x@1 + y@2 + z@3 ;\n"
3371+
"4: }\n"
3372+
"5: x + y + z ;\n"
3373+
"6: }\n";
3374+
ASSERT_EQUALS(exp, tokenize(code));
33753375
}
33763376

33773377
void varid_not() { // #9689 'not x'
3378-
const char code1[] = "void foo(int x) const {\n"
3379-
" if (not x) {}\n"
3380-
"}";
3381-
const char exp1[] = "1: void foo ( int x@1 ) const {\n"
3382-
"2: if ( ! x@1 ) { }\n"
3383-
"3: }\n";
3384-
ASSERT_EQUALS(exp1, tokenize(code1));
3378+
const char code[] = "void foo(int x) const {\n"
3379+
" if (not x) {}\n"
3380+
"}";
3381+
const char exp[] = "1: void foo ( int x@1 ) const {\n"
3382+
"2: if ( ! x@1 ) { }\n"
3383+
"3: }\n";
3384+
ASSERT_EQUALS(exp, tokenize(code));
33853385
}
33863386

33873387
void varid_declInIfCondition() {
@@ -3441,26 +3441,26 @@ class TestVarID : public TestFixture {
34413441
}
34423442

34433443
void varid_globalScope() {
3444-
const char code1[] = "int a[5];\n"
3445-
"namespace Z { struct B { int a[5]; } b; }\n"
3446-
"void f() {\n"
3447-
" int a[5];\n"
3448-
" memset(a, 123, 5);\n"
3449-
" memset(::a, 123, 5);\n"
3450-
" memset(Z::b.a, 123, 5);\n"
3451-
" memset(::Z::b.a, 123, 5);\n"
3452-
"}";
3444+
const char code[] = "int a[5];\n"
3445+
"namespace Z { struct B { int a[5]; } b; }\n"
3446+
"void f() {\n"
3447+
" int a[5];\n"
3448+
" memset(a, 123, 5);\n"
3449+
" memset(::a, 123, 5);\n"
3450+
" memset(Z::b.a, 123, 5);\n"
3451+
" memset(::Z::b.a, 123, 5);\n"
3452+
"}";
34533453

3454-
const char exp1[] = "1: int a@1 [ 5 ] ;\n"
3455-
"2: namespace Z { struct B { int a@2 [ 5 ] ; } ; struct B b@3 ; }\n"
3456-
"3: void f ( ) {\n"
3457-
"4: int a@4 [ 5 ] ;\n"
3458-
"5: memset ( a@4 , 123 , 5 ) ;\n"
3459-
"6: memset ( :: a@1 , 123 , 5 ) ;\n"
3460-
"7: memset ( Z :: b@3 . a , 123 , 5 ) ;\n"
3461-
"8: memset ( :: Z :: b@3 . a , 123 , 5 ) ;\n"
3462-
"9: }\n";
3463-
ASSERT_EQUALS(exp1, tokenize(code1));
3454+
const char exp[] = "1: int a@1 [ 5 ] ;\n"
3455+
"2: namespace Z { struct B { int a@2 [ 5 ] ; } ; struct B b@3 ; }\n"
3456+
"3: void f ( ) {\n"
3457+
"4: int a@4 [ 5 ] ;\n"
3458+
"5: memset ( a@4 , 123 , 5 ) ;\n"
3459+
"6: memset ( :: a@1 , 123 , 5 ) ;\n"
3460+
"7: memset ( Z :: b@3 . a , 123 , 5 ) ;\n"
3461+
"8: memset ( :: Z :: b@3 . a , 123 , 5 ) ;\n"
3462+
"9: }\n";
3463+
ASSERT_EQUALS(exp, tokenize(code));
34643464
}
34653465

34663466
void varid_function_pointer_args() {

0 commit comments

Comments
 (0)