Skip to content

Fix #14578 using-declarations not simplified with --std=c++03 #8308

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 3 commits into
base: main
Choose a base branch
from
+15 −2
Open

Fix #14578 using-declarations not simplified with --std=c++03 #8308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dbccad
Fix #14578 using-declarations not simplified with --std=c++03
web-flow Mar 7, 2026
e6cbc1f
Format
web-flow Mar 7, 2026
82cdea1
Merge branch 'danmar:main' into chr_14578
chrchr-github Mar 9, 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
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 @@ -2890,7 +2890,7 @@ static const Token* skipConstVolatileBackwards(const Token* tok) {

bool Tokenizer::simplifyUsing()
{
if (!isCPP() || mSettings.standards.cpp < Standards::CPP11)
if (!isCPP())
return false;

// simplify using N::x; to using x = N::x;
Expand Down
15 changes: 14 additions & 1 deletion test/testsimplifyusing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class TestSimplifyUsing : public TestFixture {
TEST_CASE(simplifyUsing36);
TEST_CASE(simplifyUsing37);
TEST_CASE(simplifyUsing38);
TEST_CASE(simplifyUsing39);

TEST_CASE(simplifyUsing8970);
TEST_CASE(simplifyUsing8971);
Expand Down Expand Up @@ -106,12 +107,14 @@ class TestSimplifyUsing : public TestFixture {
Platform::Type type = Platform::Type::Native;
bool debugwarnings = true;
bool preprocess = false;
Standards::cppstd_t cppstd = Standards::CPPLatest;
};

#define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
template<size_t size>
std::string tok_(const char* file, int line, const char (&code)[size], const TokOptions& options = make_default_obj()) {
const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(options.debugwarnings).platform(options.type).build();
const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(options.debugwarnings)
.platform(options.type).cpp(options.cppstd).build();

if (options.preprocess) {
SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
Expand Down Expand Up @@ -925,6 +928,16 @@ class TestSimplifyUsing : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void simplifyUsing39() {
const char code[] = "using std::wstring;\n" // #14578
"std::wstring ws;";
const char expected[] = "std :: wstring ws ;";
ASSERT_EQUALS(expected, tok(code));
ASSERT_EQUALS("", errout_str());
ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.cppstd = Standards::CPP03)));
ASSERT_EQUALS("", errout_str());
}

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