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

fix using type aliases in out of class destructors (#2250)

This commit is contained in:
IOBYTE 2019-10-08 13:30:41 -04:00 committed by Daniel Marjamäki
parent 1abf70a7cb
commit c98732dd8b
3 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/tokenize.cpp
View File

@ -1723,8 +1723,11 @@ namespace {
} }
if (tok1->strAt(-1) == ">") if (tok1->strAt(-1) == ">")
tok1 = tok1->previous()->findOpeningBracket(); tok1 = tok1->previous()->findOpeningBracket();
if (tok1 && Token::Match(tok1->tokAt(-3), "%name% :: %name%")) { if (tok1 && (Token::Match(tok1->tokAt(-3), "%name% :: %name%") ||
Token::Match(tok1->tokAt(-4), "%name% :: ~ %name%"))) {
tok1 = tok1->tokAt(-2); tok1 = tok1->tokAt(-2);
if (tok1->str() == "~")
tok1 = tok1->previous();
std::string scope = tok1->strAt(-1); std::string scope = tok1->strAt(-1);
while (Token::Match(tok1->tokAt(-2), ":: %name%")) { while (Token::Match(tok1->tokAt(-2), ":: %name%")) {
scope = tok1->strAt(-3) + " :: " + scope; scope = tok1->strAt(-3) + " :: " + scope;
@ -1874,8 +1877,28 @@ namespace {
return false; return false;
} }
std::string memberFunctionScope(const Token *tok)
{
std::string qualification;
const Token *qualTok = tok->strAt(-2) == "~" ? tok->tokAt(-4) : tok->tokAt(-3);
while (Token::Match(qualTok, "%type% ::")) {
if (!qualification.empty())
qualification = " :: " + qualification;
qualification = qualTok->str() + qualification;
qualTok = qualTok->tokAt(-2);
}
return qualification;
}
} // namespace } // namespace
bool Tokenizer::isMemberFunction(const Token *openParen) const
{
return (Token::Match(openParen->tokAt(-2), ":: %name% (") ||
Token::Match(openParen->tokAt(-3), ":: ~ %name% (")) &&
isFunctionHead(openParen, "{|:");
}
bool Tokenizer::simplifyUsing() bool Tokenizer::simplifyUsing()
{ {
bool substitute = false; bool substitute = false;
@ -2007,20 +2030,11 @@ bool Tokenizer::simplifyUsing()
continue; continue;
} }
// check for member function // check for member function and adjust scope
if (Token::Match(tok1->tokAt(-2), ":: %name% (") && isFunctionHead(tok1, "{|:")) { if (isMemberFunction(tok1)) {
std::string qualification;
const Token *qualTok = tok1->tokAt(-3);
while (Token::Match(qualTok, "%type% ::")) {
if (!qualification.empty())
qualification = " :: " + qualification;
qualification = qualTok->str() + qualification;
qualTok = qualTok->tokAt(-2);
}
if (!scope1.empty()) if (!scope1.empty())
scope1 += " :: "; scope1 += " :: ";
scope1 += qualification; scope1 += memberFunctionScope(tok1);
} }
if (!usingMatch(nameToken, scope, &tok1, scope1, scopeList1)) if (!usingMatch(nameToken, scope, &tok1, scope1, scopeList1))

4
lib/tokenize.h
View File

@ -374,6 +374,10 @@ public:
*/ */
void simplifyTypedef(); void simplifyTypedef();
/**
*/
bool isMemberFunction(const Token *openParen) const;
/** /**
*/ */
bool simplifyUsing(); bool simplifyUsing();

30
test/testsimplifyusing.cpp
View File

@ -555,33 +555,49 @@ private:
{ {
const char code[] = "class A {\n" const char code[] = "class A {\n"
"public:\n" "public:\n"
" using Foo = Bar;\n" " using Foo = int;\n"
" A(Foo foo);\n"
" ~A();\n"
" void func(Foo foo);\n" " void func(Foo foo);\n"
"};\n" "};\n"
"A::A(Foo) { }\n"
"A::~A() { Foo foo; }\n"
"void A::func(Foo) { }"; "void A::func(Foo) { }";
const char exp[] = "class A { " const char exp[] = "class A { "
"public: " "public: "
"void func ( Bar foo ) ; " "A ( int foo ) ; "
"~ A ( ) ; "
"void func ( int foo ) ; "
"} ; " "} ; "
"void A :: func ( Bar ) { }"; "A :: A ( int ) { } "
"A :: ~ A ( ) { int foo ; } "
"void A :: func ( int ) { }";
ASSERT_EQUALS(exp, tok(code, false)); ASSERT_EQUALS(exp, tok(code, false));
} }
{ {
const char code[] = "class A {\n" const char code[] = "class A {\n"
"public:\n" "public:\n"
" struct B {\n" " struct B {\n"
" using Foo = Bar;\n" " using Foo = int;\n"
" void func(Foo foo);\n" " B(Foo foo);\n"
" ~B();\n"
" void func(Foo foo);\n"
" };\n" " };\n"
"};\n" "};\n"
"A::B::B(Foo) { }\n"
"A::B::~B() { Foo foo; }\n"
"void A::B::func(Foo) { }"; "void A::B::func(Foo) { }";
const char exp[] = "class A { " const char exp[] = "class A { "
"public: " "public: "
"struct B { " "struct B { "
"void func ( Bar foo ) ; " "B ( int foo ) ; "
"~ B ( ) ; "
"void func ( int foo ) ; "
"} ; " "} ; "
"} ; " "} ; "
"void A :: B :: func ( Bar ) { }"; "A :: B :: B ( int ) { } "
"A :: B :: ~ B ( ) { int foo ; } "
"void A :: B :: func ( int ) { }";
ASSERT_EQUALS(exp, tok(code, false)); ASSERT_EQUALS(exp, tok(code, false));
} }
} }