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

Renamed hasReturnFunction to hasNoreturFunction

This commit is contained in:
Daniel Marjamäki 2020-05-23 07:30:05 +02:00
parent 37bc0483a4
commit 5c3474ec5c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/astutils.cpp
View File

@ -1085,7 +1085,7 @@ bool isEscapeFunction(const Token* ftok, const Library* library)
return false; return false;
} }
static bool hasReturnFunction(const Token* tok, const Library* library, const Token** unknownFunc) static bool hasNoreturnFunction(const Token* tok, const Library* library, const Token** unknownFunc)
{ {
if (!tok) if (!tok)
return false; return false;
@ -1108,7 +1108,7 @@ static bool hasReturnFunction(const Token* tok, const Library* library, const To
*unknownFunc = ftok; *unknownFunc = ftok;
return false; return false;
} else if (tok->isConstOp()) { } else if (tok->isConstOp()) {
return hasReturnFunction(tok->astOperand1(), library, unknownFunc) || hasReturnFunction(tok->astOperand2(), library, unknownFunc); return hasNoreturnFunction(tok->astOperand1(), library, unknownFunc) || hasNoreturnFunction(tok->astOperand2(), library, unknownFunc);
} }
return false; return false;
@ -1139,7 +1139,7 @@ bool isReturnScope(const Token* const endToken, const Library* library, const To
if (Token::Match(prev->link()->previous(), "[;{}] {")) if (Token::Match(prev->link()->previous(), "[;{}] {"))
return isReturnScope(prev, library, unknownFunc, functionScope); return isReturnScope(prev, library, unknownFunc, functionScope);
} else if (Token::simpleMatch(prev, ";")) { } else if (Token::simpleMatch(prev, ";")) {
if (prev->tokAt(-2) && hasReturnFunction(prev->tokAt(-2)->astTop(), library, unknownFunc)) if (prev->tokAt(-2) && hasNoreturnFunction(prev->tokAt(-2)->astTop(), library, unknownFunc))
return true; return true;
// Unknown symbol // Unknown symbol
if (Token::Match(prev->tokAt(-2), ";|}|{ %name% ;") && prev->previous()->isIncompleteVar()) { if (Token::Match(prev->tokAt(-2), ";|}|{ %name% ;") && prev->previous()->isIncompleteVar()) {