walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix the ability to recognize return types when simplifying attributes. (#3637) 

* Fix the ability to recognize return types when simplifying attributes.

When parsing attributes to remove them, we have to allow for
the case where the return type of the function that follows
the attribute has a namespaced C++ type, like foo::bar .
That means that :: has to be recognized as a valid token.
Fix this in simplifyAttribute, and add tests for this as well.
This commit is contained in:
Chris Lalancette 2021-12-22 13:02:38 -05:00 committed by GitHub
parent 4d5ad5e42e
commit df1d6cf026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tokenize.cpp
View File

@ -10974,8 +10974,14 @@ void Tokenizer::simplifyAttribute()
Token *functok = nullptr; Token *functok = nullptr;
if (Token::Match(after, "%name%|*")) { if (Token::Match(after, "%name%|*")) {
Token *ftok = after; Token *ftok = after;
while (Token::Match(ftok, "%name%|* !!(")) while (Token::Match(ftok, "%name%|::|<|* !!(")) {
if (ftok->str() == "<") {
ftok = ftok->findClosingBracket();
if (!ftok)
break;
}
ftok = ftok->next(); ftok = ftok->next();
}
if (Token::Match(ftok, "%name% (")) if (Token::Match(ftok, "%name% ("))
functok = ftok; functok = ftok;
} else if (Token::Match(after, "[;{=:]")) { } else if (Token::Match(after, "[;{=:]")) {

13
test/testsimplifytokens.cpp
View File

@ -241,6 +241,9 @@ private:
// remove calling convention __cdecl, __stdcall, ... // remove calling convention __cdecl, __stdcall, ...
TEST_CASE(simplifyCallingConvention); TEST_CASE(simplifyCallingConvention);
// remove __attribute, __attribute__
TEST_CASE(simplifyAttribute);
TEST_CASE(simplifyFunctorCall); TEST_CASE(simplifyFunctorCall);
TEST_CASE(simplifyFunctionPointer); // ticket #5339 (simplify function pointer after comma) TEST_CASE(simplifyFunctionPointer); // ticket #5339 (simplify function pointer after comma)
@ -4942,6 +4945,16 @@ private:
ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", true, Settings::Unix32)); ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", true, Settings::Unix32));
} }
void simplifyAttribute() {
ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) int f();", true));
ASSERT_EQUALS("int f ( ) ;", tok("__attribute__((visibility(\"default\"))) int f();", true));
ASSERT_EQUALS("int f ( ) ;", tok("__attribute ((visibility(\"default\"))) int f();", true));
ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) __attribute__ ((warn_unused_result)) int f();", true));
ASSERT_EQUALS("blah :: blah f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) blah::blah f();", true));
ASSERT_EQUALS("template < T > Result < T > f ( ) ;", tok("template<T> __attribute__ ((warn_unused_result)) Result<T> f();", true));
ASSERT_EQUALS("template < T , U > Result < T , U > f ( ) ;", tok("template<T, U> __attribute__ ((warn_unused_result)) Result<T, U> f();", true));
}
void simplifyFunctorCall() { void simplifyFunctorCall() {
ASSERT_EQUALS("IncrementFunctor ( ) ( a ) ;", tok("IncrementFunctor()(a);", true)); ASSERT_EQUALS("IncrementFunctor ( ) ( a ) ;", tok("IncrementFunctor()(a);", true));
} }