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

Move useStlAlgorithm to normal checking (#1741)

This commit is contained in:
Paul Fultz II 2019-03-15 00:15:56 -05:00 committed by Daniel Marjamäki
parent a1ade2dd7d
commit 3615eac347
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/checkstl.cpp
View File

@ -1877,7 +1877,7 @@ static const Token *singleAssignInScope(const Token *start, unsigned int varid,
return nullptr; return nullptr;
if (isVariableChanged(assignTok->next(), endStatement, varid, false, nullptr, true)) if (isVariableChanged(assignTok->next(), endStatement, varid, false, nullptr, true))
return nullptr; return nullptr;
input = Token::findmatch(assignTok->next(), "%varid%", endStatement, varid); input = Token::findmatch(assignTok->next(), "%varid%", endStatement, varid) || !Token::Match(start->next(), "%var% =");
return assignTok; return assignTok;
} }
@ -1957,8 +1957,7 @@ static bool addByOne(const Token *tok, unsigned int varid)
static bool accumulateBoolLiteral(const Token *tok, unsigned int varid) static bool accumulateBoolLiteral(const Token *tok, unsigned int varid)
{ {
// TODO: Missing %oreq% if (Token::Match(tok, "%assign% %bool% ;") &&
if (Token::Match(tok, "=|&= %bool% ;") &&
tok->tokAt(1)->hasKnownIntValue()) { tok->tokAt(1)->hasKnownIntValue()) {
return true; return true;
} }
@ -1971,8 +1970,8 @@ static bool accumulateBoolLiteral(const Token *tok, unsigned int varid)
static bool accumulateBool(const Token *tok, unsigned int varid) static bool accumulateBool(const Token *tok, unsigned int varid)
{ {
// TODO: Missing %oreq% // Missing %oreq% so we have to check both manually
if (Token::simpleMatch(tok, "&=")) { if (Token::simpleMatch(tok, "&=") || Token::simpleMatch(tok, "|=")) {
return true; return true;
} }
if (Token::Match(tok, "= %varid% %oror%|%or%|&&|&", varid)) { if (Token::Match(tok, "= %varid% %oror%|%or%|&&|&", varid)) {

2
lib/checkstl.h
View File

@ -71,6 +71,7 @@ public:
checkStl.redundantCondition(); checkStl.redundantCondition();
checkStl.string_c_str(); checkStl.string_c_str();
checkStl.uselessCalls(); checkStl.uselessCalls();
checkStl.useStlAlgorithm();
} }
/** Simplified checks. The token list is simplified. */ /** Simplified checks. The token list is simplified. */
@ -88,7 +89,6 @@ public:
// Style check // Style check
checkStl.size(); checkStl.size();
checkStl.useStlAlgorithm();
} }
/** Accessing container out of bounds using ValueFlow */ /** Accessing container out of bounds using ValueFlow */