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

Refactoring; use early continue

This commit is contained in:
Daniel Marjamäki 2018-06-23 23:26:37 +02:00
parent 655a8b21b6
commit 2beeca3ca2
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
lib/checkother.cpp
View File

@ -1355,58 +1355,59 @@ static std::size_t estimateSize(const Type* type, const Settings* settings, cons
static bool canBeConst(const Variable *var) static bool canBeConst(const Variable *var)
{ {
for (const Token* tok2 = var->scope()->bodyStart; tok2 != var->scope()->bodyEnd; tok2 = tok2->next()) { for (const Token* tok2 = var->scope()->bodyStart; tok2 != var->scope()->bodyEnd; tok2 = tok2->next()) {
if (tok2->varId() == var->declarationId()) { if (tok2->varId() != var->declarationId())
const Token* parent = tok2->astParent(); continue;
if (!parent)
; const Token* parent = tok2->astParent();
else if (parent->str() == "<<" || isLikelyStreamRead(true, parent)) { if (!parent)
if (parent->str() == "<<" && parent->astOperand1() == tok2) ;
return false; else if (parent->str() == "<<" || isLikelyStreamRead(true, parent)) {
if (parent->str() == ">>" && parent->astOperand2() == tok2) if (parent->str() == "<<" && parent->astOperand1() == tok2)
return false;
} else if (parent->str() == "," || parent->str() == "(") { // function argument
const Token* tok3 = tok2->previous();
unsigned int argNr = 0;
while (tok3 && tok3->str() != "(") {
if (tok3->link() && Token::Match(tok3, ")|]|}|>"))
tok3 = tok3->link();
else if (tok3->link())
break;
else if (tok3->str() == ";")
break;
else if (tok3->str() == ",")
argNr++;
tok3 = tok3->previous();
}
if (!tok3 || tok3->str() != "(" || !tok3->astOperand1() || !tok3->astOperand1()->function())
return false;
else {
const Variable* argVar = tok3->astOperand1()->function()->getArgumentVar(argNr);
if (!argVar|| (!argVar->isConst() && argVar->isReference()))
return false;
}
} else if (parent->str() == "&" && !parent->astOperand2()) {
// TODO: check how pointer is used
return false; return false;
} else if (parent->isConstOp()) if (parent->str() == ">>" && parent->astOperand2() == tok2)
;
else if (parent->isAssignmentOp()) {
if (parent->astOperand1() == tok2)
return false;
else if (parent->astOperand1()->str() == "&") {
const Variable* assignedVar = parent->previous()->variable();
if (!assignedVar || !assignedVar->isConst())
return false;
}
} else if (Token::Match(tok2, "%var% . %name% (")) {
const Function* func = tok2->tokAt(2)->function();
if (func && (func->isConst() || func->isStatic()))
;
else
return false;
} else
return false; return false;
} } else if (parent->str() == "," || parent->str() == "(") { // function argument
const Token* tok3 = tok2->previous();
unsigned int argNr = 0;
while (tok3 && tok3->str() != "(") {
if (tok3->link() && Token::Match(tok3, ")|]|}|>"))
tok3 = tok3->link();
else if (tok3->link())
break;
else if (tok3->str() == ";")
break;
else if (tok3->str() == ",")
argNr++;
tok3 = tok3->previous();
}
if (!tok3 || tok3->str() != "(" || !tok3->astOperand1() || !tok3->astOperand1()->function())
return false;
else {
const Variable* argVar = tok3->astOperand1()->function()->getArgumentVar(argNr);
if (!argVar|| (!argVar->isConst() && argVar->isReference()))
return false;
}
} else if (parent->str() == "&" && !parent->astOperand2()) {
// TODO: check how pointer is used
return false;
} else if (parent->isConstOp())
;
else if (parent->isAssignmentOp()) {
if (parent->astOperand1() == tok2)
return false;
else if (parent->astOperand1()->str() == "&") {
const Variable* assignedVar = parent->previous()->variable();
if (!assignedVar || !assignedVar->isConst())
return false;
}
} else if (Token::Match(tok2, "%var% . %name% (")) {
const Function* func = tok2->tokAt(2)->function();
if (func && (func->isConst() || func->isStatic()))
;
else
return false;
} else
return false;
} }
return true; return true;