Skip to content
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

Jump to bottom

Fix #12647 Repeated typedef not handled #6

Closed
wants to merge 1 commit into from
Closed

Fix #12647 Repeated typedef not handled #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,8 @@ void Tokenizer::simplifyTypedef()

if (indentlevel == 0 && tok->str() == "typedef") {
TypedefSimplifier ts(tok);
if (!ts.fail() && numberOfTypedefs[ts.name()] == 1) {
if (!ts.fail() && numberOfTypedefs[ts.name()] == 1 &&
(numberOfTypedefs.find(ts.getTypedefToken()->strAt(1)) == numberOfTypedefs.end() || ts.getTypedefToken()->strAt(2) == "(")) {
if (mSettings.severity.isEnabled(Severity::portability) && ts.isInvalidConstFunctionType(typedefs))
reportError(tok->next(), Severity::portability, "invalidConstFunctionType",
"It is unspecified behavior to const qualify a function type.");
Expand Down
13 changes: 12 additions & 1 deletion test/testsimplifytypedef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ class TestSimplifyTypedef : public TestFixture {
TEST_CASE(simplifyTypedef150);
TEST_CASE(simplifyTypedef151);
TEST_CASE(simplifyTypedef152);
TEST_CASE(simplifyTypedef153);

TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685
Expand Down Expand Up @@ -1226,7 +1227,7 @@ class TestSimplifyTypedef : public TestFixture {
"LPCSTR ccp;";

const char expected[] =
"char c ; "
"; char c ; "
"char * cp ; "
"const char * ccp ;";

Expand Down Expand Up @@ -3563,6 +3564,16 @@ class TestSimplifyTypedef : public TestFixture {
ASSERT_EQUALS(exp, tok(code));
}

void simplifyTypedef153() {
const char* code{}, *exp{}; // #12647
code = "typedef unsigned long X;\n"
"typedef unsigned long X;\n"
"typedef X Y;\n"
"Y y;\n";
exp = "long y ;";
ASSERT_EQUALS(exp, tok(code));
}

void simplifyTypedefFunction1() {
{
const char code[] = "typedef void (*my_func)();\n"
Expand Down
Loading