Skip to content

Fix #14317 Syntax error using macro inside ifdef block #8123

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

Draft
ceJce wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix #14317 Syntax error using macro inside ifdef block #8123

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
a965059
Fix #14317 Syntax error using macro inside ifdef block
ceJce Jan 14, 2026
8321b48
Test-implementation of replace ifdef/if defined macros with itself an…
ceJce Jan 19, 2026
472dd08
handle defines in getconfigs
ceJce Jan 19, 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
14 changes: 12 additions & 2 deletions externals/simplecpp/simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3333,13 +3333,23 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
const std::string &macrostr = *it;
const std::string::size_type eq = macrostr.find('=');
const std::string::size_type par = macrostr.find('(');
const std::string::size_type useMName = 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));
const std::string rhs(eq==std::string::npos ? std::string("1") : macrostr.substr(eq+1));
std::string lhs;
std::string rhs;
if (useMName != std::string::npos) {
//Define macro as itself or to specified value
lhs.assign(macrostr.substr(0, useMName));
rhs.assign(eq == std::string::npos ? lhs : macrostr.substr(eq + 1));
} else {
//Define macro as 1 or to specified value
lhs.assign(macrostr.substr(0, eq));
rhs.assign(eq == std::string::npos ? std::string("1") : macrostr.substr(eq + 1));
}
const Macro macro(lhs, rhs, dummy);
macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
}
Expand Down
4 changes: 3 additions & 1 deletion lib/preprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
if (dtok->op == '(')
dtok = dtok->next;
if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end())
configset.insert(dtok->str());
configset.insert(dtok->str() + "=" + dtok->str()); // if defined is set to itself.
}
std::string cfgStr;
for (const std::string &s : configset) {
Expand Down Expand Up @@ -553,6 +553,8 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
const simplecpp::Token *expr1 = cmdtok->next;
if (sameline(tok,expr1) && expr1->name && !sameline(tok,expr1->next))
config = expr1->str();
if (cmdtok->str() == "ifdef")
config.append("=" + expr1->str()); //ifdef:S shall be defined as itself
if (defined.find(config) != defined.end())
config.clear();
} else if (cmdtok->str() == "if") {
Expand Down
Loading