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

ValueFlow: Improved simplification inside for-loops

This commit is contained in:
Daniel Marjamäki 2014-03-25 21:40:36 +01:00
parent 87daf5783e
commit 8eeda150cf
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/valueflow.cpp
View File

@ -791,7 +791,9 @@ static void valueFlowForLoopSimplify(Token * const bodyStart, const unsigned int
// Is variable modified inside for loop // Is variable modified inside for loop
bool modified = false; bool modified = false;
for (const Token *tok = bodyStart->next(); tok != bodyEnd; tok = tok->next()) { for (const Token *tok = bodyStart->next(); tok != bodyEnd; tok = tok->next()) {
if (Token::Match(tok, "%varid% =", varid)) { if (tok->varId() == varid &&
(Token::Match(tok, "%varid% =|++|--", varid) ||
Token::Match(tok->previous(), "++|-- %varid%", varid))) {
modified = true; modified = true;
break; break;
} }
@ -825,9 +827,23 @@ static void valueFlowForLoopSimplify(Token * const bodyStart, const unsigned int
} }
else if (Token::Match(tok2, ") {") && Token::findmatch(tok2->link(), "%varid%", tok2, varid)) { else if (Token::Match(tok2, ") {") && Token::findmatch(tok2->link(), "%varid%", tok2, varid)) {
if (Token::findmatch(tok2, "continue|break|return", tok2->linkAt(1), varid)) {
if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return");
break;
}
if (settings->debugwarnings) if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "For loop variable stopping on {"); bailout(tokenlist, errorLogger, tok2, "For loop variable skipping conditional scope");
break; tok2 = tok2->next()->link();
if (Token::Match(tok2, "} else {")) {
if (Token::findmatch(tok2, "continue|break|return", tok2->linkAt(2), varid)) {
if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return");
break;
}
tok2 = tok2->linkAt(2);
}
} }
} }
} }