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

Fixed #1564 (CppCheck does not recognise redundant IF)

This commit is contained in:
Zachary Blair 2010-04-22 01:21:54 -07:00
parent 90541386da
commit 680a470741
3 changed files with 81 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/checkother.cpp
View File

@ -89,7 +89,6 @@ void CheckOther::warningRedundantCode()
if (! Token::simpleMatch(tok, "if ("))
continue;
std::string varname;
const Token *tok2 = tok->tokAt(2);
/*
@ -100,18 +99,11 @@ void CheckOther::warningRedundantCode()
* if (Foo::var)
*
**/
while (Token::Match(tok2, "%var% .|::"))
{
varname.append(tok2->str());
varname.append(tok2->next()->str());
tok2 = tok2->tokAt(2);
}
std::string varname = concatNames(&tok2);
if (!Token::Match(tok2, "%var% ) {"))
continue;
varname.append(tok2->str());
tok2 = tok2->tokAt(3);
/*
@ -147,15 +139,8 @@ void CheckOther::warningRedundantCode()
}
}
std::string varname2;
while (Token::Match(tok2, "%var% ::|."))
{
varname2.append(tok2->str());
varname2.append(tok2->next()->str());
tok2 = tok2->tokAt(2);
}
std::string varname2 = concatNames(&tok2);
varname2.append(tok2->str());
if (Token::Match(tok2, "%var%") && varname == varname2)
tok2 = tok2->next();
else
@ -173,13 +158,27 @@ void CheckOther::warningRedundantCode()
}
}
if (!Token::Match(tok2, "; } !!else"))
/*
* Possible constructions:
*
* - if (%var%) { delete %var%; }
* - if (%var%) { delete %var%; %var% = 0; }
*
**/
if (Token::Match(tok2, "; } !!else"))
{
continue;
}
redundantIfDelete0Error(tok);
}
else if (Token::Match(tok2, "; %var%"))
{
tok2 = tok2->next();
std::string varname3 = concatNames(&tok2);
if (Token::Match(tok2, "%var% = 0 ; } !!else") && varname2 == varname3)
{
redundantIfDelete0Error(tok);
}
}
}

20
lib/checkother.h
View File

@ -287,6 +287,26 @@ private:
* -# dereference pointer
*/
void nullPointerConditionalAssignment();
/**
* @brief Used in warningRedundantCode()
* Iterates through the %var% tokens in a fully qualified name and concatenates them.
*/
std::string concatNames(const Token **tok) const
{
std::string varname;
while (Token::Match(*tok, "%var% ::|."))
{
varname.append((*tok)->str());
varname.append((*tok)->next()->str());
*tok = (*tok)->tokAt(2);
}
if (Token::Match(*tok, "%var%"))
varname.append((*tok)->str());
return varname;
}
};
/// @}
//---------------------------------------------------------------------------

42
test/testother.cpp
View File

@ -237,7 +237,7 @@ private:
" if (p)\n"
" {\n"
" delete p;\n"
" p = 0;\n"
" z = 0;\n"
" }\n"
"}\n");
ASSERT_EQUALS("", errout.str());
@ -258,6 +258,16 @@ private:
"}\n");
ASSERT_EQUALS("", errout.str());
check("void foo()\n"
"{\n"
" if (0 != g->p)\n"
" {\n"
" delete g->p;\n"
" g->z = 0;\n"
" }\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("void foo()\n"
"{\n"
" if (0 != this->g->a)\n"
@ -277,6 +287,16 @@ private:
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition. It is safe to deallocate a NULL pointer\n", errout.str());
check("void foo()\n"
"{\n"
" if (p)\n"
" {\n"
" delete p;\n"
" p = 0;\n"
" }\n"
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition. It is safe to deallocate a NULL pointer\n", errout.str());
check("void foo()\n"
"{\n"
" if (p)\n"
@ -291,6 +311,16 @@ private:
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition. It is safe to deallocate a NULL pointer\n", errout.str());
check("void foo()\n"
"{\n"
" if (p != NULL)\n"
" {\n"
" delete p;\n"
" p = NULL;\n"
" }\n"
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition. It is safe to deallocate a NULL pointer\n", errout.str());
check("void foo()\n"
"{\n"
" if (p)\n"
@ -319,6 +349,16 @@ private:
" delete Foo::instance;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition. It is safe to deallocate a NULL pointer\n", errout.str());
check("void Foo::deleteInstance()\n"
"{\n"
" if (Foo::instance != NULL)\n"
" {\n"
" delete Foo::instance;\n"
" Foo::instance = NULL;\n"
" }\n"
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition. It is safe to deallocate a NULL pointer\n", errout.str());
}
void unreachable1()