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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2018-10-21 20:28:46 +02:00
parent edde0eedaa
commit 64fbffc90d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/astutils.cpp
View File

@ -599,9 +599,9 @@ bool isConstExpression(const Token *tok, const Library& library, bool pure, bool
} }
if (tok->tokType() == Token::eIncDecOp) if (tok->tokType() == Token::eIncDecOp)
return false; return false;
if(tok->isAssignmentOp()) if (tok->isAssignmentOp())
return false; return false;
if(isLikelyStreamRead(cpp, tok)) if (isLikelyStreamRead(cpp, tok))
return false; return false;
// bailout when we see ({..}) // bailout when we see ({..})
if (tok->str() == "{") if (tok->str() == "{")

14
lib/checkcondition.cpp
View File

@ -1237,20 +1237,20 @@ void CheckCondition::clarifyConditionError(const Token *tok, bool assign, bool b
static bool isConstVarExpression(const Token * tok) static bool isConstVarExpression(const Token * tok)
{ {
if(!tok) if (!tok)
return false; return false;
if(Token::Match(tok, "%cop%")) { if (Token::Match(tok, "%cop%")) {
if(tok->astOperand1() && !isConstVarExpression(tok->astOperand1())) if (tok->astOperand1() && !isConstVarExpression(tok->astOperand1()))
return false; return false;
if(tok->astOperand2() && !isConstVarExpression(tok->astOperand2())) if (tok->astOperand2() && !isConstVarExpression(tok->astOperand2()))
return false; return false;
return true; return true;
} }
if(Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL")) if (Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL"))
return true; return true;
if(tok->isEnumerator()) if (tok->isEnumerator())
return true; return true;
if(tok->variable()) if (tok->variable())
return tok->variable()->isConst(); return tok->variable()->isConst();
return false; return false;
} }

4
lib/checkother.cpp
View File

@ -2068,8 +2068,8 @@ void CheckOther::checkDuplicateExpression()
else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings->library, true, mTokenizer->isCPP())) { else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings->library, true, mTokenizer->isCPP())) {
const Token *ast1 = tok->astOperand1(); const Token *ast1 = tok->astOperand1();
while (ast1 && tok->str() == ast1->str()) { while (ast1 && tok->str() == ast1->str()) {
if (isSameExpression(mTokenizer->isCPP(), true, ast1->astOperand1(), tok->astOperand2(), mSettings->library, true, true, &errorPath) && if (isSameExpression(mTokenizer->isCPP(), true, ast1->astOperand1(), tok->astOperand2(), mSettings->library, true, true, &errorPath) &&
isWithoutSideEffects(mTokenizer->isCPP(), ast1->astOperand1()) && isWithoutSideEffects(mTokenizer->isCPP(), ast1->astOperand1()) &&
isWithoutSideEffects(mTokenizer->isCPP(), ast1->astOperand2())) isWithoutSideEffects(mTokenizer->isCPP(), ast1->astOperand2()))
// Probably the message should be changed to 'duplicate expressions X in condition or something like that'. // Probably the message should be changed to 'duplicate expressions X in condition or something like that'.
duplicateExpressionError(ast1->astOperand1(), tok->astOperand2(), tok, errorPath); duplicateExpressionError(ast1->astOperand1(), tok->astOperand2(), tok, errorPath);