Skip to content

Fix #12588 FP unusedFunction with forward-declared enum #6232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 2 commits into from
Apr 4, 2024
Merged

Fix #12588 FP unusedFunction with forward-declared enum #6232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7ffe0c
Update tokenize.cpp
chrchr-github Apr 4, 2024
86665bc
Update testsimplifytokens.cpp
chrchr-github Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8870,9 +8870,9 @@ void Tokenizer::simplifyStructDecl()
const Token * const type = tok->next();
Token *next = tok->tokAt(2);

while (next && next->str() != "{")
while (next && !Token::Match(next, "[{;]"))
next = next->next();
if (!next)
if (!next || next->str() == ";")
continue;
Token* after = next->link();
if (!after)
Expand Down
23 changes: 23 additions & 0 deletions test/testsimplifytokens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class TestSimplifyTokens : public TestFixture {
TEST_CASE(simplifyStructDecl6); // ticket #3732
TEST_CASE(simplifyStructDecl7); // ticket #476 (static anonymous struct array)
TEST_CASE(simplifyStructDecl8); // ticket #7698
TEST_CASE(simplifyStructDecl9);

// register int var; => int var;
// inline int foo() {} => int foo() {}
Expand Down Expand Up @@ -1249,6 +1250,28 @@ class TestSimplifyTokens : public TestFixture {
ASSERT_EQUALS("enum class J : short { x , y , z } ; enum J j ; j = x ;", tok("enum class J : short { x, y, z } j{x};"));
}

void simplifyStructDecl9() {
const char* code = "enum E : int;\n" // #12588
"void f() {}\n"
"namespace {\n"
" struct S {\n"
" explicit S(int i) : m(i) {}\n"
" int m;\n"
" };\n"
"}\n"
"void g() { S s(0); }\n";
const char* exp = "enum E : int ; "
"void f ( ) { } "
"namespace { "
"struct S { "
"explicit S ( int i ) : m ( i ) { } "
"int m ; "
"} ; "
"} "
"void g ( ) { S s ( 0 ) ; }";
ASSERT_EQUALS(exp, tok(code));
}

void removeUnwantedKeywords() {
ASSERT_EQUALS("int var ;", tok("register int var ;"));
ASSERT_EQUALS("short var ;", tok("register short int var ;"));
Expand Down