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

Merge pull request #356 from Dmitry-Me/simplifyCodeWithTempVariables 

Use temp variables to simplify code.
This commit is contained in:
Daniel Marjamäki 2014-07-05 00:50:13 +02:00
parent 51396e52aa 4f21b31004
commit 4ee9b3781f
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/checkio.cpp
View File

@ -1552,19 +1552,22 @@ bool CheckIO::ArgumentInfo::isStdContainer(const Token *tok)
}; };
if (tok && tok->variable()) { if (tok && tok->variable()) {
if (tok->variable()->isStlType(stl_container)) { const Variable* variable = tok->variable();
typeToken = tok->variable()->typeStartToken()->tokAt(4); if (variable->isStlType(stl_container)) {
typeToken = variable->typeStartToken()->tokAt(4);
return true; return true;
} else if (tok->variable()->isStlType(stl_string)) { } else if (variable->isStlType(stl_string)) {
typeToken = tok->variable()->typeStartToken(); typeToken = variable->typeStartToken();
return true; return true;
} else if (tok->variable()->type() && !tok->variable()->type()->derivedFrom.empty()) { } else if (variable->type() && !variable->type()->derivedFrom.empty()) {
for (std::size_t i = 0, e = tok->variable()->type()->derivedFrom.size(); i != e; ++i) { const std::vector<Type::BaseInfo>& derivedFrom = variable->type()->derivedFrom;
if (Token::Match(tok->variable()->type()->derivedFrom[i].nameTok, "std :: vector|array|bitset|deque|list|forward_list|map|multimap|multiset|priority_queue|queue|set|stack|hash_map|hash_multimap|hash_set|unordered_map|unordered_multimap|unordered_set|unordered_multiset <")) { for (std::size_t i = 0, e = derivedFrom.size(); i != e; ++i) {
typeToken = tok->variable()->type()->derivedFrom[i].nameTok->tokAt(4); const Token* nameTok = derivedFrom[i].nameTok;
if (Token::Match(nameTok, "std :: vector|array|bitset|deque|list|forward_list|map|multimap|multiset|priority_queue|queue|set|stack|hash_map|hash_multimap|hash_set|unordered_map|unordered_multimap|unordered_set|unordered_multiset <")) {
typeToken = nameTok->tokAt(4);
return true; return true;
} else if (Token::Match(tok->variable()->type()->derivedFrom[i].nameTok, "std :: string|wstring")) { } else if (Token::Match(nameTok, "std :: string|wstring")) {
typeToken = tok->variable()->type()->derivedFrom[i].nameTok; typeToken = nameTok;
return true; return true;
} }
} }