Skip to content

fixes #352 - internally default to latest standard if none is provided #356

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
merged 1 commit into from
Sep 10, 2025
Merged

fixes #352 - internally default to latest standard if none is provided #356

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
2 changes: 1 addition & 1 deletion simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,7 +2554,7 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
static bool isCpp17OrLater(const simplecpp::DUI &dui)
{
const std::string std_ver = simplecpp::getCppStdString(dui.std);
return !std_ver.empty() && (std_ver >= "201703L");
return std_ver.empty() || (std_ver >= "201703L");
}

static bool isGnu(const simplecpp::DUI &dui)
Expand Down
53 changes: 41 additions & 12 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,11 +1562,13 @@ static void has_include_1()
"#endif";
simplecpp::DUI dui;
dui.includePaths.push_back(testSourceDir);
dui.std = "c++17";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
dui.std = "c++14";
ASSERT_EQUALS("", preprocess(code, dui));
ASSERT_EQUALS("", preprocess(code));
dui.std = "c++17";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
dui.std = "c++20";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
}

static void has_include_2()
Expand All @@ -1580,9 +1582,13 @@ static void has_include_2()
"#endif";
simplecpp::DUI dui;
dui.includePaths.push_back(testSourceDir);
ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
dui.std = "c++14";
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "c++17";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
ASSERT_EQUALS("", preprocess(code));
dui.std = "c++20";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
}

static void has_include_3()
Expand All @@ -1595,13 +1601,24 @@ static void has_include_3()
" #endif\n"
"#endif";
simplecpp::DUI dui;
dui.std = "c++17";

// Test file not found...
ASSERT_EQUALS("\n\n\n\nB", preprocess(code, dui)); // we default to latest standard internally
dui.std = "c++14";
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "c++17";
ASSERT_EQUALS("\n\n\n\nB", preprocess(code, dui));

// Unless -I is set (preferably, we should differentiate -I and -isystem...)
dui.includePaths.push_back(testSourceDir + "/testsuite");
dui.std = "";
ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
dui.std = "c++14";
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "c++17";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
dui.std = "c++20";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
ASSERT_EQUALS("", preprocess(code));
}

static void has_include_4()
Expand All @@ -1614,10 +1631,14 @@ static void has_include_4()
" #endif\n"
"#endif";
simplecpp::DUI dui;
dui.includePaths.push_back(testSourceDir); // we default to latest standard internally
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
dui.std = "c++14";
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "c++17";
dui.includePaths.push_back(testSourceDir);
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
ASSERT_EQUALS("", preprocess(code));
dui.std = "c++20";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
}

static void has_include_5()
Expand All @@ -1630,10 +1651,14 @@ static void has_include_5()
" #endif\n"
"#endif";
simplecpp::DUI dui;
dui.std = "c++17";
ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
dui.includePaths.push_back(testSourceDir);
dui.std = "c++14";
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "c++17";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
dui.std = "c++20";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
ASSERT_EQUALS("", preprocess(code));
}

static void has_include_6()
Expand All @@ -1646,10 +1671,12 @@ static void has_include_6()
" #endif\n"
"#endif";
simplecpp::DUI dui;
dui.std = "gnu99";
dui.includePaths.push_back(testSourceDir);
ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
dui.std = "c++99";
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "gnu99";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
ASSERT_EQUALS("", preprocess(code));
}

static void strict_ansi_1()
Expand Down Expand Up @@ -2983,6 +3010,7 @@ static void stdcVersionDefine()
" __STDC_VERSION__\n"
"#endif\n";
simplecpp::DUI dui;
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "c11";
ASSERT_EQUALS("\n201112L", preprocess(code, dui));
}
Expand All @@ -2993,6 +3021,7 @@ static void cpluscplusDefine()
" __cplusplus\n"
"#endif\n";
simplecpp::DUI dui;
ASSERT_EQUALS("", preprocess(code, dui));
dui.std = "c++11";
ASSERT_EQUALS("\n201103L", preprocess(code, dui));
}
Expand Down