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

convert CheckStl::if_find() to use the symbol database

This commit is contained in:
Robert Reif 2011-08-14 10:46:35 -04:00
parent ad45ba718c
commit 9a70ec87a8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkstl.cpp
View File

@ -746,6 +746,9 @@ void CheckStl::if_find()
{ {
if (!_settings->isEnabled("style")) if (!_settings->isEnabled("style"))
return; return;
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{ {
if (Token::Match(tok, "if ( !| %var% . find ( %any% ) )")) if (Token::Match(tok, "if ( !| %var% . find ( %any% ) )"))
@ -756,10 +759,11 @@ void CheckStl::if_find()
tok = tok->next(); tok = tok->next();
const unsigned int varid = tok->varId(); const unsigned int varid = tok->varId();
if (varid > 0) const Variable *var = symbolDatabase->getVariableFromVarId(varid);
if (var)
{ {
// Is the variable a std::string or STL container? // Is the variable a std::string or STL container?
const Token * decl = Token::findmatch(_tokenizer->tokens(), "%varid%", varid); const Token * decl = var->nameToken();
while (decl && !Token::Match(decl, "[;{}(,]")) while (decl && !Token::Match(decl, "[;{}(,]"))
decl = decl->previous(); decl = decl->previous();