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

Merge pull request #465 from Dmitry-Me/removeRedundantActions2 

Omit unneeded operations
This commit is contained in:
PKEuS 2014-11-18 19:02:48 +01:00
parent e12d280e90 34bd612ea9
commit b76619e0c1
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/checkstl.cpp
View File

@ -799,18 +799,17 @@ void CheckStl::if_find()
if (Token::Match(tok, "%var% . find (")) { if (Token::Match(tok, "%var% . find (")) {
const Variable *var = tok->variable(); const Variable *var = tok->variable();
if (var) { if (var) {
const bool isString = var->isStlStringType() && !var->isArrayOrPointer();
if (if_findCompare(tok->linkAt(3), isString))
continue;
// Is the variable a std::string or STL container? // Is the variable a std::string or STL container?
const Token * decl = var->typeStartToken(); const Token * decl = var->typeStartToken();
const unsigned int varid = tok->varId(); const unsigned int varid = tok->varId();
bool str = var->isStlStringType() && !var->isArrayOrPointer();
if (if_findCompare(tok->linkAt(3), str))
continue;
// stl container // stl container
if (Token::Match(decl, "std :: %var% < %type% > &| %varid%", varid) && warning) if (warning && Token::Match(decl, "std :: %var% < %type% > &| %varid%", varid))
if_findError(tok, false); if_findError(tok, false);
else if (str && performance) else if (performance && isString)
if_findError(tok, true); if_findError(tok, true);
} }
} }
@ -832,46 +831,46 @@ void CheckStl::if_find()
const Variable *var = tok->variable(); const Variable *var = tok->variable();
if (var) { if (var) {
// Is the variable a std::string or STL container?
const Token * decl = var->typeStartToken();
const unsigned int varid = tok->varId();
//pretty bad limitation.. but it is there in order to avoid //pretty bad limitation.. but it is there in order to avoid
//own implementations of 'find' or any container //own implementations of 'find' or any container
if (!var->isStlType()) if (!var->isStlType())
continue; continue;
// Is the variable a std::string or STL container?
const Token * decl = var->typeStartToken();
const unsigned int varid = tok->varId();
decl = decl->tokAt(2); decl = decl->tokAt(2);
if (Token::Match(decl, "%var% <")) { if (Token::Match(decl, "%var% <")) {
decl = decl->tokAt(2); decl = decl->tokAt(2);
//stl-like //stl-like
if (Token::Match(decl, "std :: %var% < %type% > > &| %varid%", varid) && warning) if (warning && Token::Match(decl, "std :: %var% < %type% > > &| %varid%", varid))
if_findError(tok, false); if_findError(tok, false);
//not stl-like, then let's hope it's a pointer or an array //not stl-like, then let's hope it's a pointer or an array
else if (Token::Match(decl, "%type% >")) { else if (Token::Match(decl, "%type% >")) {
decl = decl->tokAt(2); decl = decl->tokAt(2);
if ((Token::Match(decl, "* &| %varid%", varid) || if (warning && (Token::Match(decl, "* &| %varid%", varid) ||
Token::Match(decl, "&| %varid% [ ]| %any% ]| ", varid)) && warning) Token::Match(decl, "&| %varid% [ ]| %any% ]| ", varid)))
if_findError(tok, false); if_findError(tok, false);
} }
else if (Token::Match(decl, "std :: string|wstring > &| %varid%", varid) && performance) else if (performance && Token::Match(decl, "std :: string|wstring > &| %varid%", varid))
if_findError(tok, true); if_findError(tok, true);
} }
else if (var->isStlStringType()) { else if (performance && var->isStlStringType()) {
decl = decl->next(); decl = decl->next();
if ((Token::Match(decl, "* &| %varid%", varid) || if (Token::Match(decl, "* &| %varid%", varid) ||
Token::Match(decl, "&| %varid% [ ]| %any% ]| ", varid)) && performance) Token::Match(decl, "&| %varid% [ ]| %any% ]| ", varid))
if_findError(tok, true); if_findError(tok, true);
} }
} }
} }
else if (Token::Match(tok, "std :: find|find_if (")) { else if (warning && Token::Match(tok, "std :: find|find_if (")) {
// check that result is checked properly // check that result is checked properly
if (!if_findCompare(tok->linkAt(3), false) && warning) { if (!if_findCompare(tok->linkAt(3), false)) {
if_findError(tok, false); if_findError(tok, false);
} }
} }