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

Merge pull request #516 from Dmitry-Me/simplifyLoopLogic 

Simplify loop logic
This commit is contained in:
amai2012 2015-02-10 11:31:16 +01:00
parent 53718047f1 dfd19233e9
commit efd2f51cba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/valueflow.cpp
View File

@ -1141,10 +1141,10 @@ static void valueFlowAfterCondition(TokenList *tokenlist, SymbolDatabase* symbol
if (parent->astOperand1() == tok && if (parent->astOperand1() == tok &&
((op == "&&" && Token::Match(tok, "==|>=|<=|!")) || ((op == "&&" && Token::Match(tok, "==|>=|<=|!")) ||
(op == "||" && Token::Match(tok, "%name%|!=")))) { (op == "||" && Token::Match(tok, "%name%|!=")))) {
bool assign = false; for (; parent && parent->str() == op; parent = const_cast<Token*>(parent->astParent())) {
for (; !assign && parent && parent->str() == op; parent = const_cast<Token*>(parent->astParent())) {
std::stack<Token *> tokens; std::stack<Token *> tokens;
tokens.push(const_cast<Token*>(parent->astOperand2())); tokens.push(const_cast<Token*>(parent->astOperand2()));
bool assign = false;
while (!tokens.empty()) { while (!tokens.empty()) {
Token *rhstok = tokens.top(); Token *rhstok = tokens.top();
tokens.pop(); tokens.pop();
@ -1159,6 +1159,8 @@ static void valueFlowAfterCondition(TokenList *tokenlist, SymbolDatabase* symbol
break; break;
} }
} }
if (assign)
break;
while (parent->astParent() && parent == parent->astParent()->astOperand2()) while (parent->astParent() && parent == parent->astParent()->astOperand2())
parent = const_cast<Token*>(parent->astParent()); parent = const_cast<Token*>(parent->astParent());
} }