Skip to content

fix #14106: Using Anonymous enum as a return type for a function creates variable #7789

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
merged 5 commits into from
Sep 30, 2025
+27 −2
Merged

fix #14106: Using Anonymous enum as a return type for a function creates variable #7789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7da9ff7
add test
ludviggunne Sep 2, 2025
4af3a04
fix #14106
ludviggunne Sep 2, 2025
03bd671
add tests involving pointers
ludviggunne Sep 5, 2025
aeea641
enforce c language in test
ludviggunne Sep 5, 2025
14fc7ca
handle pointers in isAnonymousEnum
ludviggunne Sep 5, 2025
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
5 changes: 3 additions & 2 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9108,7 +9108,7 @@ static bool isAnonymousEnum(const Token* tok)
while (Token::Match(end, "%name%|::"))
end = end->next();
}
return end && Token::Match(end->link(), "} (| %type%| )| [,;[({=]");
return end && Token::Match(end->link(), "} (| %type%| )| [*,;[({=]");
}

void Tokenizer::simplifyStructDecl()
Expand Down Expand Up @@ -9209,7 +9209,8 @@ void Tokenizer::simplifyStructDecl()
}

// check for initialization
if (Token::Match(after, "%any% (|{")) {
bool isFuncDecl = Token::Match(after, "%name% (") && Token::simpleMatch(after->linkAt(1), ") {");
if (Token::Match(after, "%any% (|{") && !isFuncDecl) {
after->insertToken("=");
after = after->next();
const bool isEnum = start->str() == "enum";
Expand Down
24 changes: 24 additions & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ class TestTokenizer : public TestFixture {
TEST_CASE(vardecl29); // #9282
TEST_CASE(vardecl30);
TEST_CASE(vardecl31); // function pointer init
TEST_CASE(vardecl32);
TEST_CASE(vardecl33);
TEST_CASE(vardecl34);
TEST_CASE(vardecl_stl_1);
TEST_CASE(vardecl_stl_2);
TEST_CASE(vardecl_stl_3);
Expand Down Expand Up @@ -2766,6 +2769,27 @@ class TestTokenizer : public TestFixture {
}
}

void vardecl32() {
{
const char code[] = "static enum { E } f() { return E; }";
ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 f ( ) { return E ; }", tokenizeAndStringify(code, true, Platform::Type::Native, false));
}
}

void vardecl33() {
{
const char code[] = "static enum { E } *f() { return NULL; }";
ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 * f ( ) { return NULL ; }", tokenizeAndStringify(code, true, Platform::Type::Native, false));
}
}

void vardecl34() {
{
const char code[] = "static enum { E } const *f() { return NULL; }";
ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 const * f ( ) { return NULL ; }", tokenizeAndStringify(code, true, Platform::Type::Native, false));
}
}

void volatile_variables() {
{
const char code[] = "volatile int a=0;\n"
Expand Down