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 #13295 syntaxError with using #6997

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix #13295 syntaxError with using #6997

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
a8efb5c
Update testsimplifyusing.cpp
chrchr-github Nov 12, 2024
23edaee
Update tokenize.cpp
chrchr-github Nov 12, 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
3 changes: 3 additions & 0 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3079,6 +3079,9 @@ bool Tokenizer::simplifyUsing()
if (usingEnd)
tok = usingEnd;

if (Token::Match(start, "class|struct|union|enum"))
start = start->next();

// Unfortunately we have to start searching from the beginning
// of the token stream because templates are instantiated at
// the end of the token stream and it may be used before then.
Expand Down
65 changes: 43 additions & 22 deletions test/testsimplifyusing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class TestSimplifyUsing : public TestFixture {
TEST_CASE(simplifyUsing31);
TEST_CASE(simplifyUsing32);
TEST_CASE(simplifyUsing33);
TEST_CASE(simplifyUsing34);

TEST_CASE(simplifyUsing8970);
TEST_CASE(simplifyUsing8971);
Expand Down Expand Up @@ -231,7 +232,7 @@ class TestSimplifyUsing : public TestFixture {
const char expected[] =
"void f ( ) "
"{ "
"struct yy_buffer_state * state ; "
"yy_buffer_state * state ; "
"}";

ASSERT_EQUALS(expected, tok(code));
Expand Down Expand Up @@ -311,13 +312,13 @@ class TestSimplifyUsing : public TestFixture {
"struct t { int a ; } ; "
"struct U { int a ; } ; "
"struct Unnamed0 { int a ; } ; "
"struct s s ; "
"struct s * ps ; "
"struct t t ; "
"struct t * tp ; "
"struct U u ; "
"struct U * v ; "
"struct Unnamed0 * w ;";
"s s ; "
"s * ps ; "
"t t ; "
"t * tp ; "
"U u ; "
"U * v ; "
"Unnamed0 * w ;";

ASSERT_EQUALS(expected, tok(code));
}
Expand All @@ -342,13 +343,13 @@ class TestSimplifyUsing : public TestFixture {
"union t { int a ; float b ; } ; "
"union U { int a ; float b ; } ; "
"union Unnamed0 { int a ; float b ; } ; "
"union s s ; "
"union s * ps ; "
"union t t ; "
"union t * tp ; "
"union U u ; "
"union U * v ; "
"union Unnamed0 * w ;";
"s s ; "
"s * ps ; "
"t t ; "
"t * tp ; "
"U u ; "
"U * v ; "
"Unnamed0 * w ;";

ASSERT_EQUALS(expected, tok(code));
}
Expand All @@ -361,8 +362,8 @@ class TestSimplifyUsing : public TestFixture {

const char expected[] = "enum abc { a = 0 , b = 1 , c = 2 } ; "
"enum xyz { x = 0 , y = 1 , z = 2 } ; "
"enum abc e1 ; "
"enum xyz e2 ;";
"abc e1 ; "
"xyz e2 ;";

ASSERT_EQUALS(expected, tok(code));
}
Expand Down Expand Up @@ -448,7 +449,7 @@ class TestSimplifyUsing : public TestFixture {
const char expected[] = "struct STRFOO { "
"char freem [ 4096 ] ; "
"} ; "
"struct STRFOO s ;";
"STRFOO s ;";

ASSERT_EQUALS(expected, tok(code));
ASSERT_EQUALS("", errout_str());
Expand All @@ -470,10 +471,10 @@ class TestSimplifyUsing : public TestFixture {
"class S2 : public C1 { } ; "
"class S3 { } ; "
"class S4 : public C1 { } ; "
"class S1 s1 ; "
"class S2 s2 ; "
"class S3 s3 ; "
"class S4 s4 ;";
"S1 s1 ; "
"S2 s2 ; "
"S3 s3 ; "
"S4 s4 ;";

ASSERT_EQUALS(expected, tok(code));
}
Expand Down Expand Up @@ -831,6 +832,26 @@ class TestSimplifyUsing : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void simplifyUsing34() { // #13295
const char code[] = "struct A {\n"
" static const int a = 1;\n"
"};\n"
"using B = struct A;\n"
"void g(int);\n"
"void f() {\n"
" g({ B::a });\n"
"}\n";
const char expected[] = "struct A { "
"static const int a = 1 ; "
"} ; "
"void g ( int ) ; "
"void f ( ) { "
"g ( { A :: a } ) ; "
"}";
ASSERT_EQUALS(expected, tok(code, Platform::Type::Native, /*debugwarnings*/ true));
ASSERT_EQUALS("", errout_str());
}

void simplifyUsing8970() {
const char code[] = "using V = std::vector<int>;\n"
"struct A {\n"
Expand Down
Loading