Skip to content

Fix #12625 internalError with function typedefs #6431

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
May 23, 2024
Merged

Fix #12625 internalError with function typedefs #6431

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
2ce07d0
Update tokenize.cpp
chrchr-github May 23, 2024
ae192a6
Update testsimplifytypedef.cpp
chrchr-github May 23, 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
2 changes: 1 addition & 1 deletion lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ const Token *Tokenizer::processFunc(const Token *tok2, bool inOperator) const
tok2 = tok2->next();

while (Token::Match(tok2, "*|&") &&
!Token::Match(tok2->next(), ")|>"))
!Token::Match(tok2->next(), "[)>,]"))
tok2 = tok2->next();

// skip over namespace
Expand Down
7 changes: 7 additions & 0 deletions test/testsimplifytypedef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class TestSimplifyTypedef : public TestFixture {
TEST_CASE(cfunction1);
TEST_CASE(cfunction2);
TEST_CASE(cfunction3);
TEST_CASE(cfunction4);
TEST_CASE(cfp1);
TEST_CASE(cfp2);
TEST_CASE(cfp4);
Expand Down Expand Up @@ -415,6 +416,12 @@ class TestSimplifyTypedef : public TestFixture {
ASSERT_EQUALS("[file.c:2]: (portability) It is unspecified behavior to const qualify a function type.\n", errout_str());
}

void cfunction4() {
const char code[] = "typedef int (func_t) (int);\n" // #12625
"int f(int*, func_t*, int);\n";
ASSERT_EQUALS("int f ( int * , int ( * ) ( int ) , int ) ;", simplifyTypedefC(code));
}

void cfp1() {
const char code[] = "typedef void (*fp)(void * p);\n"
"fp x;";
Expand Down