Skip to content

Fix #14424 FP constStatement when using declaration matches variable name #8150

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

Open
chrchr-github wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −0
Open

Fix #14424 FP constStatement when using declaration matches variable name #8150

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
8244e7b
Update tokenize.cpp
chrchr-github Jan 23, 2026
334d088
Update testsimplifyusing.cpp
chrchr-github Jan 23, 2026
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 @@ -2689,6 +2689,9 @@ namespace {
return false;
}

if (tok1->tokAt(-1)->tokType() == Token::eType || tok1->tokAt(-1)->tokType() == Token::eName)
return false;

if (Token::Match(tok1->tokAt(-1), "class|struct|union|enum|namespace")) {
// fixme
return false;
Expand Down
11 changes: 11 additions & 0 deletions test/testsimplifyusing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class TestSimplifyUsing : public TestFixture {
TEST_CASE(simplifyUsing35);
TEST_CASE(simplifyUsing36);
TEST_CASE(simplifyUsing37);
TEST_CASE(simplifyUsing38);

TEST_CASE(simplifyUsing8970);
TEST_CASE(simplifyUsing8971);
Expand Down Expand Up @@ -908,6 +909,16 @@ class TestSimplifyUsing : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void simplifyUsing38() {
const char code[] = "using std::begin;\n" // #14424
"using std::end;\n"
"Unknown begin;\n"
"int end;\n";
const char expected[] = "Unknown begin ; int end ;";
ASSERT_EQUALS(expected, tok(code));
ASSERT_EQUALS("", errout_str());
}

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