Skip to content
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

Fix #397 (Debracket macro not expanded) #398

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Fix #397 (Debracket macro not expanded) #398

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
c2b2aa9
Fix #397 (Debracket macro not expanded)
danmar Dec 11, 2024
024aeeb
non-arg
danmar Dec 13, 2024
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
10 changes: 8 additions & 2 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2046,13 +2046,19 @@ namespace simplecpp {
calledMacro.expand(&temp, loc, tok, macros, expandedmacros);
return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros2, parametertokens);
}
if (!sameline(tok, tok->next) || tok->next->op != '(') {
if (!sameline(tok, tok->next)) {
output->push_back(newMacroToken(tok->str(), loc, true, tok));
return tok->next;
}
TokenList tokens(files);
tokens.push_back(new Token(*tok));
const Token * const tok2 = appendTokens(&tokens, loc, tok->next, macros, expandedmacros, parametertokens);
const Token * tok2 = nullptr;
if (tok->next->op == '(')
tok2 = appendTokens(&tokens, loc, tok->next, macros, expandedmacros, parametertokens);
else if (expandArg(&tokens, tok->next, loc, macros, expandedmacros, parametertokens)) {
if (tokens.cfront()->next && tokens.cfront()->next->op == '(')
tok2 = tok->next;
}
if (!tok2) {
output->push_back(newMacroToken(tok->str(), loc, true, tok));
return tok->next;
Expand Down
15 changes: 15 additions & 0 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,20 @@ static void define_define_20() // #384 arg contains comma
ASSERT_EQUALS("\n\n\n\n\n\na = 1", preprocess(code));
}

static void define_define_21() // #397 DEBRACKET macro
{
const char code1[] = "#define A(val) B val\n"
"#define B(val) val\n"
"A((2))\n";
ASSERT_EQUALS("\n\n2", preprocess(code1));

const char code2[] = "#define x (2)\n"
"#define A B x\n"
"#define B(val) val\n"
"A\n";
ASSERT_EQUALS("\n\n\nB ( 2 )", preprocess(code2));
}

static void define_va_args_1()
{
const char code[] = "#define A(fmt...) dostuff(fmt)\n"
Expand Down Expand Up @@ -2999,6 +3013,7 @@ int main(int argc, char **argv)
TEST_CASE(define_define_18);
TEST_CASE(define_define_19);
TEST_CASE(define_define_20); // 384 arg contains comma
TEST_CASE(define_define_21);
TEST_CASE(define_va_args_1);
TEST_CASE(define_va_args_2);
TEST_CASE(define_va_args_3);
Expand Down