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

Clarify code with Token::isUnaryOp()

This commit is contained in:
Daniel Marjamäki 2018-07-14 08:04:08 +02:00
parent 4429ee55c3
commit 5b1d96b346
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkcondition.cpp
View File

@ -643,7 +643,7 @@ void CheckCondition::multiCondition2()
break; break;
if (Token::Match(tok->astParent(), "*|.|[")) { if (Token::Match(tok->astParent(), "*|.|[")) {
const Token *parent = tok; const Token *parent = tok;
while (Token::Match(parent->astParent(), ".|[") || (Token::simpleMatch(parent->astParent(), "*") && !parent->astParent()->astOperand2())) while (Token::Match(parent->astParent(), ".|[") || (parent->astParent() && parent->astParent()->isUnaryOp("*")))
parent = parent->astParent(); parent = parent->astParent();
if (Token::Match(parent->astParent(), "%assign%|++|--")) if (Token::Match(parent->astParent(), "%assign%|++|--"))
break; break;
@ -1138,7 +1138,7 @@ void CheckCondition::clarifyCondition()
} else if (!tok2->isName() && !tok2->isNumber() && tok2->str() != ".") } else if (!tok2->isName() && !tok2->isNumber() && tok2->str() != ".")
break; break;
} }
} else if (tok->tokType() == Token::eBitOp && (tok->str() != "&" || tok->astOperand2())) { } else if (tok->tokType() == Token::eBitOp && !tok->isUnaryOp("&")) {
if (tok->astOperand2() && tok->astOperand2()->variable() && tok->astOperand2()->variable()->nameToken() == tok->astOperand2()) if (tok->astOperand2() && tok->astOperand2()->variable() && tok->astOperand2()->variable()->nameToken() == tok->astOperand2())
continue; continue;