Skip to content

Fix #454: Accept __has_include for GNU C standards #456

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 3, 2025
Merged

Fix #454: Accept __has_include for GNU C standards #456

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
fcf39f6
fix #454
ludviggunne Jul 1, 2025
d497acb
add test
ludviggunne Jul 2, 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
9 changes: 6 additions & 3 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2681,13 +2681,16 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
}
}

/** Evaluate __has_include(file) */
static bool isCpp17OrLater(const simplecpp::DUI &dui)
{
const std::string std_ver = simplecpp::getCppStdString(dui.std);
return !std_ver.empty() && (std_ver >= "201703L");
}

static bool isGnu(const simplecpp::DUI &dui)
{
return dui.std.rfind("gnu", 0) != std::string::npos;
}

static std::string currentDirectoryOSCalc() {
const std::size_t size = 4096;
Expand Down Expand Up @@ -2760,7 +2763,7 @@ static std::string extractRelativePathFromAbsolute(const std::string& absoluteSi
static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header, bool systemheader);
static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI &dui)
{
if (!isCpp17OrLater(dui))
if (!isCpp17OrLater(dui) && !isGnu(dui))
return;

for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
Expand Down Expand Up @@ -3483,7 +3486,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
// use a dummy vector for the macros because as this is not part of the file and would add an empty entry - e.g. /usr/include/poll.h
std::vector<std::string> dummy;

const bool hasInclude = isCpp17OrLater(dui);
const bool hasInclude = isCpp17OrLater(dui) || isGnu(dui);
MacroMap macros;
for (std::list<std::string>::const_iterator it = dui.defines.begin(); it != dui.defines.end(); ++it) {
const std::string &macrostr = *it;
Expand Down
16 changes: 16 additions & 0 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,21 @@ static void has_include_5()
ASSERT_EQUALS("", preprocess(code));
}

static void has_include_6()
{
const char code[] = "#if defined( __has_include)\n"
" #if !__has_include(<testsuite/unrealFileName2.abcdef>)\n"
" A\n"
" #else\n"
" B\n"
" #endif\n"
"#endif";
simplecpp::DUI dui;
dui.std = "gnu99";
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
ASSERT_EQUALS("", preprocess(code));
}

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

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