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

Tokenizer: Better handling of duplicate enums. Ticket: #2381

This commit is contained in:
Daniel Marjamäki 2010-12-30 20:55:23 +01:00
parent bfb4d79d63
commit 307178d3c2
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/tokenize.cpp
View File

@ -7386,8 +7386,27 @@ void Tokenizer::simplifyEnum()
}
else if (tok2->str() == "{")
{
// Is the same enum redefined?
const Token *begin = end->link();
if (tok2->fileIndex() == begin->fileIndex() &&
tok2->linenr() == begin->linenr() &&
Token::Match(begin->tokAt(-2), "enum %type% {") &&
Token::Match(tok2->tokAt(-2), "enum %type% {") &&
begin->strAt(-1) == tok2->strAt(-1))
{
// remove duplicate enum
Token * startToken = tok2->tokAt(-3);
tok2 = tok2->link()->next();
Token::eraseTokens(startToken, tok2);
if (!tok2)
break;
}
else
{
// Not a duplicate enum..
++level;
}
}
else if (!pattern.empty() && Token::Match(tok2, pattern.c_str()))
{
simplify = true;
@ -7396,7 +7415,7 @@ void Tokenizer::simplifyEnum()
else if (inScope && !exitThisScope && tok2->str() == enumName->str())
{
if (Token::simpleMatch(tok2->previous(), "::") ||
(tok2->next() && Token::simpleMatch(tok2->next(), "::")))
Token::simpleMatch(tok2->next(), "::"))
{
// Don't replace this enum if it's preceded or followed by "::"
}

10
test/testsimplifytokens.cpp
View File

@ -269,6 +269,7 @@ private:
TEST_CASE(enum14);
TEST_CASE(enum15);
TEST_CASE(enum16); // ticket #1988
TEST_CASE(enum17); // ticket #2381 (duplicate enums)
// remove "std::" on some standard functions
TEST_CASE(removestd);
@ -5892,6 +5893,15 @@ private:
ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
}
void enum17() // ticket #2381
{
// if header is included twice its enums will be duplicated
const char code[] = "enum ab { a=0, b };"
"enum ab { a=0, b };\n";
ASSERT_EQUALS(";", tok(code, false));
ASSERT_EQUALS("", errout.str());
}
void removestd()
{
ASSERT_EQUALS("; strcpy ( a , b ) ;", tok("; std::strcpy(a,b);"));