Skip to content

fix #459: Set __STRICT_ANSI__=1 for non-gnu standards #460

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
danmar merged 2 commits into from
Jul 7, 2025
Merged

fix #459: Set __STRICT_ANSI__=1 for non-gnu standards #460

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
ee3966f
add tests
ludviggunne Jul 3, 2025
7dde25f
fix #459
ludviggunne Jul 3, 2025
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
7 changes: 7 additions & 0 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3480,11 +3480,14 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL

const bool hasInclude = isCpp17OrLater(dui) || isGnu(dui);
MacroMap macros;
bool strictAnsiDefined = false;
for (std::list<std::string>::const_iterator it = dui.defines.begin(); it != dui.defines.end(); ++it) {
const std::string &macrostr = *it;
const std::string::size_type eq = macrostr.find('=');
const std::string::size_type par = macrostr.find('(');
const std::string macroname = macrostr.substr(0, std::min(eq,par));
if (macroname == "__STRICT_ANSI__")
strictAnsiDefined = true;
if (dui.undefined.find(macroname) != dui.undefined.end())
continue;
const std::string lhs(macrostr.substr(0,eq));
Expand All @@ -3493,6 +3496,10 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
}

const bool strictAnsiUndefined = dui.undefined.find("__STRICT_ANSI__") != dui.undefined.cend();
if (!isGnu(dui) && !strictAnsiDefined && !strictAnsiUndefined)
macros.insert(std::pair<TokenString, Macro>("__STRICT_ANSI__", Macro("__STRICT_ANSI__", "1", dummy)));

macros.insert(std::make_pair("__FILE__", Macro("__FILE__", "__FILE__", dummy)));
macros.insert(std::make_pair("__LINE__", Macro("__LINE__", "__LINE__", dummy)));
macros.insert(std::make_pair("__COUNTER__", Macro("__COUNTER__", "__COUNTER__", dummy)));
Expand Down
47 changes: 47 additions & 0 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,6 +1617,48 @@ static void has_include_6()
ASSERT_EQUALS("", preprocess(code));
}

static void strict_ansi_1()
{
const char code[] = "#if __STRICT_ANSI__\n"
" A\n"
"#endif";
simplecpp::DUI dui;
dui.std = "gnu99";
ASSERT_EQUALS("", preprocess(code, dui));
}

static void strict_ansi_2()
{
const char code[] = "#if __STRICT_ANSI__\n"
" A\n"
"#endif";
simplecpp::DUI dui;
dui.std = "c99";
ASSERT_EQUALS("\nA", preprocess(code, dui));
}

static void strict_ansi_3()
{
const char code[] = "#if __STRICT_ANSI__\n"
" A\n"
"#endif";
simplecpp::DUI dui;
dui.std = "c99";
dui.undefined.insert("__STRICT_ANSI__");
ASSERT_EQUALS("", preprocess(code, dui));
}

static void strict_ansi_4()
{
const char code[] = "#if __STRICT_ANSI__\n"
" A\n"
"#endif";
simplecpp::DUI dui;
dui.std = "gnu99";
dui.defines.push_back("__STRICT_ANSI__");
ASSERT_EQUALS("\nA", preprocess(code, dui));
}

static void ifdef1()
{
const char code[] = "#ifdef A\n"
Expand Down Expand Up @@ -3181,6 +3223,11 @@ int main(int argc, char **argv)
TEST_CASE(has_include_5);
TEST_CASE(has_include_6);

TEST_CASE(strict_ansi_1);
TEST_CASE(strict_ansi_2);
TEST_CASE(strict_ansi_3);
TEST_CASE(strict_ansi_4);

TEST_CASE(ifdef1);
TEST_CASE(ifdef2);
TEST_CASE(ifndef);
Expand Down
Loading