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

Refactoring, skipEnumBody

This commit is contained in:
Daniel Marjamäki 2017-07-29 12:13:32 +02:00
parent b54bed4a0a
commit a78fd23732
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/tokenize.cpp
View File

@ -60,14 +60,24 @@ namespace {
const bool isEnum; const bool isEnum;
const unsigned int startVarid; const unsigned int startVarid;
}; };
}
/** Return whether tok is the "{" that starts an enumerator list */ /** Return whether tok is the "{" that starts an enumerator list */
bool isEnumStart(const Token* tok) static bool isEnumStart(const Token* tok)
{ {
if (!tok || tok->str() != "{") if (!tok || tok->str() != "{")
return false; return false;
return (tok->strAt(-1) == "enum") || (tok->strAt(-2) == "enum"); return (tok->strAt(-1) == "enum") || (tok->strAt(-2) == "enum");
} }
template<typename T>
static void skipEnumBody(T **tok)
{
T *defStart = *tok;
while (Token::Match(defStart, "%name%|::|:"))
defStart = defStart->next();
if (defStart && defStart->str() == "{")
*tok = defStart->link()->next();
} }
const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &endsWith) const const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &endsWith) const
@ -7935,11 +7945,7 @@ void Tokenizer::simplifyComma()
// skip enums // skip enums
if (Token::Match(tok, "enum class|struct| %name%| :|{")) { if (Token::Match(tok, "enum class|struct| %name%| :|{")) {
Token *defStart = tok->next(); skipEnumBody(&tok);
while (Token::Match(defStart, "%name%|::|:"))
defStart = defStart->next();
if (defStart && defStart->str() == "{")
tok = defStart->link()->next();
} }
if (!tok) if (!tok)
syntaxError(nullptr); // invalid code like in #4195 syntaxError(nullptr); // invalid code like in #4195
@ -9113,11 +9119,7 @@ void Tokenizer::simplifyNamespaceStd()
for (const Token* tok = Token::findsimplematch(list.front(), "using namespace std ;"); tok; tok = tok->next()) { for (const Token* tok = Token::findsimplematch(list.front(), "using namespace std ;"); tok; tok = tok->next()) {
bool insert = false; bool insert = false;
if (Token::Match(tok, "enum class|struct| %name%| :|{")) { // Don't replace within enum definitions if (Token::Match(tok, "enum class|struct| %name%| :|{")) { // Don't replace within enum definitions
Token *defStart = tok->next(); skipEnumBody(&tok);
while (Token::Match(defStart, "%name%|::|:"))
defStart = defStart->next();
if (defStart && defStart->str() == "{")
tok = defStart->link();
} }
if (!Token::Match(tok->previous(), ".|::")) { if (!Token::Match(tok->previous(), ".|::")) {
if (Token::Match(tok, "%name% (") && !Token::Match(tok->linkAt(1)->next(), "%name%|{") && stdFunctions.find(tok->str()) != stdFunctions.end()) if (Token::Match(tok, "%name% (") && !Token::Match(tok->linkAt(1)->next(), "%name%|{") && stdFunctions.find(tok->str()) != stdFunctions.end())