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

Refactor: Use visitAstNodes in checkstring

This commit is contained in:
Rikard Falkeborn 2020-07-09 23:08:04 +02:00
parent 2ace2b006a
commit 82fe6193fa
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/checkstring.cpp
View File

@ -355,37 +355,32 @@ void CheckString::overlappingStrcmp()
continue; continue;
std::list<const Token *> equals0; std::list<const Token *> equals0;
std::list<const Token *> notEquals0; std::list<const Token *> notEquals0;
std::stack<const Token *> tokens; visitAstNodes(tok, [&](const Token * t) {
tokens.push(tok);
while (!tokens.empty()) {
const Token * const t = tokens.top();
tokens.pop();
if (!t) if (!t)
continue; return ChildrenToVisit::none;
if (t->str() == "||") { if (t->str() == "||") {
tokens.push(t->astOperand1()); return ChildrenToVisit::op1_and_op2;
tokens.push(t->astOperand2());
continue;
} }
if (t->str() == "==") { if (t->str() == "==") {
if (Token::simpleMatch(t->astOperand1(), "(") && Token::simpleMatch(t->astOperand2(), "0")) if (Token::simpleMatch(t->astOperand1(), "(") && Token::simpleMatch(t->astOperand2(), "0"))
equals0.push_back(t->astOperand1()); equals0.push_back(t->astOperand1());
else if (Token::simpleMatch(t->astOperand2(), "(") && Token::simpleMatch(t->astOperand1(), "0")) else if (Token::simpleMatch(t->astOperand2(), "(") && Token::simpleMatch(t->astOperand1(), "0"))
equals0.push_back(t->astOperand2()); equals0.push_back(t->astOperand2());
continue; return ChildrenToVisit::none;
} }
if (t->str() == "!=") { if (t->str() == "!=") {
if (Token::simpleMatch(t->astOperand1(), "(") && Token::simpleMatch(t->astOperand2(), "0")) if (Token::simpleMatch(t->astOperand1(), "(") && Token::simpleMatch(t->astOperand2(), "0"))
notEquals0.push_back(t->astOperand1()); notEquals0.push_back(t->astOperand1());
else if (Token::simpleMatch(t->astOperand2(), "(") && Token::simpleMatch(t->astOperand1(), "0")) else if (Token::simpleMatch(t->astOperand2(), "(") && Token::simpleMatch(t->astOperand1(), "0"))
notEquals0.push_back(t->astOperand2()); notEquals0.push_back(t->astOperand2());
continue; return ChildrenToVisit::none;
} }
if (t->str() == "!" && Token::simpleMatch(t->astOperand1(), "(")) if (t->str() == "!" && Token::simpleMatch(t->astOperand1(), "("))
equals0.push_back(t->astOperand1()); equals0.push_back(t->astOperand1());
else if (t->str() == "(") else if (t->str() == "(")
notEquals0.push_back(t); notEquals0.push_back(t);
} return ChildrenToVisit::none;
});
for (const Token *eq0 : equals0) { for (const Token *eq0 : equals0) {
for (const Token * ne0 : notEquals0) { for (const Token * ne0 : notEquals0) {