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

Refactoring: Reuse function numberOfArguments() for counting arguments

This commit is contained in:
Daniel Marjamäki 2017-09-20 13:28:45 +02:00
parent 2103726d54
commit 3e231a9325
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/astutils.cpp
View File

@ -414,19 +414,11 @@ bool isVariableChangedByFunctionCall(const Token *tok, const Settings *settings,
// Constructor call
if (tok->variable() && tok->variable()->nameToken() == tok) {
// Find constructor..
unsigned int numberOfArguments = Token::simpleMatch(tok->next(), "( )") ? 0 : 1;
for (const Token *tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) {
if (tok2->str() == "(")
tok2 = tok2->link();
else if (tok2->str() == ",")
++numberOfArguments;
else if (tok2->str() == ")")
break;
}
const unsigned int argCount = numberOfArguments(tok);
const ::Scope *typeScope = tok->variable()->typeScope();
if (typeScope) {
for (std::list<Function>::const_iterator it = typeScope->functionList.begin(); it != typeScope->functionList.end(); ++it) {
if (!it->isConstructor() || it->argCount() != numberOfArguments)
if (!it->isConstructor() || it->argCount() != argCount)
continue;
const Variable *arg = it->getArgumentVar(argnr);
if (arg && arg->isReference())