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

Merge pull request #639 from Dmitry-Me/reduceVariablesScope 

Reduce variables scope
This commit is contained in:
PKEuS 2015-08-12 08:30:54 +02:00
parent 002b606a9c 50fb9cea66
commit 33538cffa0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/valueflow.cpp
View File

@ -1354,9 +1354,6 @@ static bool valueFlowForward(Token * const startToken,
// increment/decrement // increment/decrement
if (Token::Match(tok2->previous(), "++|-- %name%") || Token::Match(tok2, "%name% ++|--")) { if (Token::Match(tok2->previous(), "++|-- %name%") || Token::Match(tok2, "%name% ++|--")) {
const bool pre = Token::Match(tok2->previous(), "++|--");
Token * const op = pre ? tok2->previous() : tok2->next();
const bool inc = (op->str() == "++");
std::list<ValueFlow::Value>::iterator it; std::list<ValueFlow::Value>::iterator it;
// Erase values that are not int values.. // Erase values that are not int values..
for (it = values.begin(); it != values.end();) { for (it = values.begin(); it != values.end();) {
@ -1370,6 +1367,9 @@ static bool valueFlowForward(Token * const startToken,
bailout(tokenlist, errorLogger, tok2, "increment/decrement of " + tok2->str()); bailout(tokenlist, errorLogger, tok2, "increment/decrement of " + tok2->str());
return false; return false;
} }
const bool pre = Token::Match(tok2->previous(), "++|--");
Token * const op = pre ? tok2->previous() : tok2->next();
const bool inc = (op->str() == "++");
// Perform increment/decrement.. // Perform increment/decrement..
for (it = values.begin(); it != values.end(); ++it) { for (it = values.begin(); it != values.end(); ++it) {
if (!pre) if (!pre)