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

Refactoring valueFlowSubFunction

This commit is contained in:
Daniel Marjamäki 2014-08-06 06:33:06 +02:00
parent 4894d3807d
commit 8bbbb54f94
1 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/valueflow.cpp
View File

@ -1325,17 +1325,34 @@ static void valueFlowForLoop(TokenList *tokenlist, ErrorLogger *errorLogger, con
static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger, const Settings *settings) static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger, const Settings *settings)
{ {
std::list<ValueFlow::Value> argvalues;
for (Token *tok = tokenlist->front(); tok; tok = tok->next()) { for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
if (!Token::Match(tok, "[(,]")) if (!Token::Match(tok, "%var% ("))
continue; continue;
const Function * const currentFunction = tok->function();
if (!currentFunction)
continue;
// Function scope..
const Scope * const functionScope = currentFunction->functionScope;
if (!functionScope)
continue;
unsigned int argnr = 0U;
for (const Token *argtok = tok->tokAt(2); argtok; argtok = argtok->nextArgument()) {
// Get function argument
const Variable * const arg = currentFunction->getArgumentVar(argnr++);
if (!arg)
break;
std::list<ValueFlow::Value> argvalues;
// passing value(s) to function // passing value(s) to function
if (Token::Match(tok, "[(,] %var%|%num%|%str% [,)]") && !tok->next()->values.empty()) if (Token::Match(argtok, "%var%|%num%|%str% [,)]") && !argtok->values.empty())
argvalues = tok->next()->values; argvalues = argtok->values;
else { else {
// bool operator => values 1/0 are passed to function.. // bool operator => values 1/0 are passed to function..
const Token *op = tok->next(); const Token *op = argtok;
while (op && op->astParent() && !Token::Match(op->astParent(), "[(,]")) while (op && op->astParent() && !Token::Match(op->astParent(), "[(,]"))
op = op->astParent(); op = op->astParent();
if (Token::Match(op, "%comp%|%oror%|&&|!")) { if (Token::Match(op, "%comp%|%oror%|&&|!")) {
@ -1350,30 +1367,9 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
} }
} }
const Token * const argumentToken = tok->next(); // Is argument passed by value?
if (!Token::Match(arg->typeStartToken(), "%type% %var% ,|)") &&
// is this a function call? !Token::Match(arg->typeStartToken(), "const| struct| %type% * %var% ,|)"))
const Token *ftok = tok;
while (ftok && ftok->str() != "(")
ftok = ftok->astParent();
if (!ftok || !ftok->astOperand1() || !ftok->astOperand2() || !ftok->astOperand1()->function())
continue;
// Get argument nr
unsigned int argnr = 0;
for (const Token *argtok = ftok->next(); argtok && argtok != argumentToken; argtok = argtok->nextArgument())
++ argnr;
// Get function argument, and check if parameter is passed by value
const Function * const function = ftok->astOperand1()->function();
const Variable * const arg = function ? function->getArgumentVar(argnr) : nullptr;
if (!Token::Match(arg ? arg->typeStartToken() : nullptr, "%type% %var% ,|)") &&
!Token::Match(arg ? arg->typeStartToken() : nullptr, "const| struct| %type% * %var% ,|)"))
continue;
// Function scope..
const Scope * const functionScope = function ? function->functionScope : nullptr;
if (!functionScope)
continue; continue;
// Set value in function scope.. // Set value in function scope..
@ -1389,6 +1385,7 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
} }
} }
} }
}
} }
static bool constval(const Token * tok) static bool constval(const Token * tok)