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

Tokenizer: Remove startOfFunction() and use isFunctionHead() instead.

This commit is contained in:
Daniel Marjamäki 2016-01-03 19:06:11 +01:00
parent d3093a6ca5
commit 7e585d37bc
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/tokenize.cpp
View File

@ -2236,33 +2236,6 @@ static Token *skipTernaryOp(Token *tok)
return tok; return tok;
} }
Token * Tokenizer::startOfFunction(Token * tok) const
{
tok = tok->next();
while (tok && tok->str() != "{") {
if (isCPP() && Token::Match(tok, "const|volatile|override")) {
tok = tok->next();
} else if (isCPP() && tok->str() == "noexcept") {
tok = tok->next();
if (tok && tok->str() == "(") {
tok = tok->link()->next();
}
} else if (isCPP() && tok->str() == "throw" && tok->next() && tok->next()->str() == "(") {
tok = tok->next()->link()->next();
}
// unknown macros ") MACRO {" and ") MACRO(...) {"
else if (tok->isUpperCaseName()) {
tok = tok->next();
if (tok && tok->str() == "(") {
tok = tok->link()->next();
}
} else
return nullptr;
}
return tok;
}
const Token * Tokenizer::startOfExecutableScope(const Token * tok) const Token * Tokenizer::startOfExecutableScope(const Token * tok)
{ {
if (tok && tok->str() == ")") { if (tok && tok->str() == ")") {
@ -2990,7 +2963,7 @@ void Tokenizer::setVarId()
tok2 = tok2->linkAt(1); tok2 = tok2->linkAt(1);
// If this is a function implementation.. add it to funclist // If this is a function implementation.. add it to funclist
Token * start = startOfFunction(tok2); Token * start = const_cast<Token *>(isFunctionHead(tok2, "{"));
if (start) { if (start) {
setVarIdClassFunction(classname, start, start->link(), thisClassVars, structMembers, &_varId); setVarIdClassFunction(classname, start, start->link(), thisClassVars, structMembers, &_varId);
} }

1
lib/tokenize.h
View File

@ -829,7 +829,6 @@ private:
/** Disable assignment operator, no implementation */ /** Disable assignment operator, no implementation */
Tokenizer &operator=(const Tokenizer &); Tokenizer &operator=(const Tokenizer &);
Token * startOfFunction(Token * tok) const;
static Token * startOfExecutableScope(Token * tok) { static Token * startOfExecutableScope(Token * tok) {
return const_cast<Token*>(startOfExecutableScope(const_cast<const Token *>(tok))); return const_cast<Token*>(startOfExecutableScope(const_cast<const Token *>(tok)));
} }