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

Fixed #6291 and #6293: Support :: in front of function name in checkUnusedFunctions 

Simplified code in CheckUnusedFunctions
This commit is contained in:
PKEuS 2014-12-09 22:04:51 +01:00
parent e9bc3b7acf
commit 493ab541ab
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/checkunusedfunctions.cpp
View File

@ -165,31 +165,24 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
const Token *funcname = nullptr;
if (tok->scope()->isExecutable() && Token::Match(tok->next(), "%var% (")) {
if (tok->scope()->isExecutable() && Token::Match(tok, "%var% (")) {
funcname = tok;
} else if (tok->scope()->isExecutable() && Token::Match(tok, "%var% <") && Token::simpleMatch(tok->linkAt(1), "> (")) {
funcname = tok;
} else if (Token::Match(tok, "[;{}.,()[=+-/|!?:]")) {
funcname = tok->next();
}
else if (tok->scope()->isExecutable() && Token::Match(tok->next(), "%var% <") && Token::simpleMatch(tok->linkAt(2), "> (")) {
funcname = tok->next();
}
else if (Token::Match(tok, "[;{}.,()[=+-/|!?:] &| %var% [(),;]:}]")) {
funcname = tok->next();
if (funcname->str() == "&")
if (funcname && funcname->str() == "&")
funcname = funcname->next();
}
else if (Token::Match(tok, "[;{}.,()[=+-/|!?:] &| %var% :: %var%")) {
funcname = tok->next();
if (funcname->str() == "&")
if (funcname && funcname->str() == "::")
funcname = funcname->next();
while (Token::Match(funcname,"%var% :: %var%"))
while (Token::Match(funcname, "%var% :: %var%"))
funcname = funcname->tokAt(2);
if (!Token::Match(funcname, "%var% [(),;:}]"))
if (!Token::Match(funcname, "%var% [(),;]:}]"))
continue;
}
else
if (!funcname)
continue;
// funcname ( => Assert that the end parentheses isn't followed by {

43
test/testunusedfunctions.cpp
View File

@ -121,34 +121,51 @@ private:
}
void functionpointer() {
check("void foo() { }\n"
"int main() {\n"
" f(&foo);\n"
" return 0\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void foo() { }\n"
"int main() {\n"
" f(&::foo);\n"
" return 0\n"
"}");
ASSERT_EQUALS("", errout.str());
check("namespace abc {\n"
"void foo() { }\n"
" void foo() { }\n"
"};\n"
"\n"
"int main()\n"
"{\n"
"int main() {\n"
" f(&abc::foo);\n"
" return 0\n"
"}");
ASSERT_EQUALS("", errout.str());
check("namespace abc {\n"
"void foo() { }\n"
" void foo() { }\n"
"};\n"
"\n"
"int main()\n"
"{\n"
"int main() {\n"
" f = &abc::foo;\n"
" return 0\n"
"}");
ASSERT_EQUALS("", errout.str());
check("namespace abc {\n" // #3875
"void foo() { }\n"
check("namespace abc {\n"
" void foo() { }\n"
"};\n"
"\n"
"int main()\n"
"{\n"
"int main() {\n"
" f = &::abc::foo;\n"
" return 0\n"
"}");
ASSERT_EQUALS("", errout.str());
check("namespace abc {\n" // #3875
" void foo() { }\n"
"};\n"
"int main() {\n"
" f(abc::foo);\n"
" return 0\n"
"}");