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

Refactorization in valueflow.cpp: Removed redundant loop, rearranged code.

This commit is contained in:
PKEuS 2014-08-17 20:32:17 +02:00
parent d44d6ad94a
commit df080ab5c3
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/valueflow.cpp
View File

@ -471,25 +471,19 @@ static void valueFlowBeforeCondition(TokenList *tokenlist, ErrorLogger *errorLog
// extra logic for unsigned variables 'i>=1' => possible value can also be 0 // extra logic for unsigned variables 'i>=1' => possible value can also be 0
ValueFlow::Value val(tok, num); ValueFlow::Value val(tok, num);
val.varId = varid; val.varId = varid;
if (Token::Match(tok, "<|>")) {
if (num != 0)
continue;
if (!var->typeStartToken()->isUnsigned())
continue;
}
ValueFlow::Value val2; ValueFlow::Value val2;
if (num==1U && Token::Match(tok,"<=|>=")) { if (num==1U && Token::Match(tok,"<=|>=")) {
bool isunsigned = false; if (var->typeStartToken()->isUnsigned()) {
for (const Token* type = var->typeStartToken(); type && type->varId() == 0U; type = type->next())
isunsigned |= type->isUnsigned();
if (isunsigned) {
val2 = ValueFlow::Value(tok,0); val2 = ValueFlow::Value(tok,0);
val2.varId = varid; val2.varId = varid;
} }
} }
if (Token::Match(tok,"<|>")) {
if (num!=0)
continue;
bool isunsigned = false;
for (const Token* type = var->typeStartToken(); type && type->varId() == 0U; type = type->next())
isunsigned |= type->isUnsigned();
if (!isunsigned)
continue;
}
for (Token *tok2 = tok->previous(); ; tok2 = tok2->previous()) { for (Token *tok2 = tok->previous(); ; tok2 = tok2->previous()) {
if (!tok2) { if (!tok2) {
if (settings->debugwarnings) { if (settings->debugwarnings) {