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

Refactorized CheckStl::redundantCondition(): 

- Use symboldatabase
- Support erase() method
This commit is contained in:
Philipp Kloke 2014-04-12 22:24:31 +02:00
parent 8cb3b13e56
commit 776ad32a0b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/checkstl.cpp
View File

@ -981,17 +981,23 @@ void CheckStl::sizeError(const Token *tok)
"guaranteed to take constant time."); "guaranteed to take constant time.");
} }
static inline const Token *findRedundantCondition(const Token *start)
{
return Token::findmatch(start, "if ( %var% . find ( %any% ) != %var% . end|rend|cend|crend ( ) ) { %var% . remove ( %any% ) ;");
}
void CheckStl::redundantCondition() void CheckStl::redundantCondition()
{ {
const Token *tok = findRedundantCondition(_tokenizer->tokens()); const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
while (tok) {
for (std::list<Scope>::const_iterator i = symbolDatabase->scopeList.begin(); i != symbolDatabase->scopeList.end(); ++i) {
if (i->type != Scope::eIf && i->type != Scope::eElseIf)
continue;
const Token* tok = i->classDef->tokAt(2);
if (i->type == Scope::eElseIf)
tok = tok->next();
if (!Token::Match(tok, "%var% . find ( %any% ) != %var% . end|rend|cend|crend ( ) ) { %var% . remove|erase ( %any% ) ;"))
continue;
// Get tokens for the fields %var% and %any% // Get tokens for the fields %var% and %any%
const Token *var1 = tok->tokAt(2); const Token *var1 = tok;
const Token *any1 = var1->tokAt(4); const Token *any1 = var1->tokAt(4);
const Token *var2 = any1->tokAt(3); const Token *var2 = any1->tokAt(3);
const Token *var3 = var2->tokAt(7); const Token *var3 = var2->tokAt(7);
@ -1003,8 +1009,6 @@ void CheckStl::redundantCondition()
any1->str() == any2->str()) { any1->str() == any2->str()) {
redundantIfRemoveError(tok); redundantIfRemoveError(tok);
} }
tok = findRedundantCondition(tok->next());
} }
} }