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

Refactoring; Use range for loop (#1900)

This commit is contained in:
Rikard Falkeborn 2019-06-17 13:17:45 +02:00 committed by amai2012
parent 071fc85a05
commit b1c8d81bcc
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/testvalueflow.cpp
View File

@ -151,9 +151,8 @@ private:
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) { for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
if (tok->str() == "x" && tok->linenr() == linenr) { if (tok->str() == "x" && tok->linenr() == linenr) {
std::list<ValueFlow::Value>::const_iterator it; for (const ValueFlow::Value &v : tok->values()) {
for (it = tok->values().begin(); it != tok->values().end(); ++it) { if (v.isIntValue() && v.intvalue == value)
if (it->isIntValue() && it->intvalue == value)
return true; return true;
} }
} }
@ -170,9 +169,8 @@ private:
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) { for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
if (tok->str() == "x" && tok->linenr() == linenr) { if (tok->str() == "x" && tok->linenr() == linenr) {
std::list<ValueFlow::Value>::const_iterator it; for (const ValueFlow::Value &v : tok->values()) {
for (it = tok->values().begin(); it != tok->values().end(); ++it) { if (v.isFloatValue() && v.floatValue >= value - diff && v.floatValue <= value + diff)
if (it->isFloatValue() && it->floatValue >= value - diff && it->floatValue <= value + diff)
return true; return true;
} }
} }
@ -192,11 +190,10 @@ private:
continue; continue;
std::ostringstream ostr; std::ostringstream ostr;
std::list<ValueFlow::Value>::const_iterator it; for (const ValueFlow::Value &v : tok->values()) {
for (it = tok->values().begin(); it != tok->values().end(); ++it) { for (const ValueFlow::Value::ErrorPathItem &ep : v.errorPath) {
for (ValueFlow::Value::ErrorPath::const_iterator ep = it->errorPath.begin(); ep != it->errorPath.end(); ++ep) { const Token *eptok = ep.first;
const Token *eptok = ep->first; const std::string &msg = ep.second;
const std::string &msg = ep->second;
ostr << eptok->linenr() << ',' << msg << '\n'; ostr << eptok->linenr() << ',' << msg << '\n';
} }
} }
@ -214,9 +211,8 @@ private:
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) { for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
if (tok->str() == "x" && tok->linenr() == linenr) { if (tok->str() == "x" && tok->linenr() == linenr) {
std::list<ValueFlow::Value>::const_iterator it; for (const ValueFlow::Value &v : tok->values()) {
for (it = tok->values().begin(); it != tok->values().end(); ++it) { if (v.valueType == type && Token::simpleMatch(v.tokvalue, value))
if (it->valueType == type && Token::simpleMatch(it->tokvalue, value))
return true; return true;
} }
} }
@ -251,9 +247,8 @@ private:
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) { for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
if (tok->str() == "x" && tok->linenr() == linenr) { if (tok->str() == "x" && tok->linenr() == linenr) {
std::list<ValueFlow::Value>::const_iterator it; for (const ValueFlow::Value &v : tok->values()) {
for (it = tok->values().begin(); it != tok->values().end(); ++it) { if (v.isMovedValue() && v.moveKind == moveKind)
if (it->isMovedValue() && it->moveKind == moveKind)
return true; return true;
} }
} }
@ -270,9 +265,8 @@ private:
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) { for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
if (tok->str() == "x" && tok->linenr() == linenr) { if (tok->str() == "x" && tok->linenr() == linenr) {
std::list<ValueFlow::Value>::const_iterator it; for (const ValueFlow::Value &v : tok->values()) {
for (it = tok->values().begin(); it != tok->values().end(); ++it) { if (v.isIntValue() && v.intvalue == value && v.condition)
if (it->isIntValue() && it->intvalue == value && it->condition)
return true; return true;
} }
} }
@ -2928,9 +2922,8 @@ private:
} }
bool isNotKnownValues(const char code[], const char str[]) { bool isNotKnownValues(const char code[], const char str[]) {
const std::list<ValueFlow::Value> values = tokenValues(code, str); for (const ValueFlow::Value &v : tokenValues(code, str)) {
for (std::list<ValueFlow::Value>::const_iterator it = values.begin(); it != values.end(); ++it) { if (v.isKnown())
if (it->isKnown())
return false; return false;
} }
return true; return true;