Skip to content

Fixup #397 (Debracket macro not expanded) #399

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 1 commit into from
Dec 13, 2024
+7 −0
Merged

Fixup #397 (Debracket macro not expanded) #399

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
1 change: 1 addition & 0 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2056,6 +2056,7 @@ namespace simplecpp {
if (tok->next->op == '(')
tok2 = appendTokens(&tokens, loc, tok->next, macros, expandedmacros, parametertokens);
else if (expandArg(&tokens, tok->next, loc, macros, expandedmacros, parametertokens)) {
tokens.front()->location = loc;
if (tokens.cfront()->next && tokens.cfront()->next->op == '(')
tok2 = tok->next;
}
Expand Down
6 changes: 6 additions & 0 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,12 @@ static void define_define_21() // #397 DEBRACKET macro
"#define B(val) val\n"
"A\n";
ASSERT_EQUALS("\n\n\nB ( 2 )", preprocess(code2));

const char code3[] = "#define __GET_ARG2_DEBRACKET(ignore_this, val, ...) __DEBRACKET val\n"
"#define __DEBRACKET(...) __VA_ARGS__\n"
"#5 \"a.c\"\n"
"__GET_ARG2_DEBRACKET(432 (33), (B))\n";
ASSERT_EQUALS("\n#line 5 \"a.c\"\nB", preprocess(code3));
}

static void define_va_args_1()
Expand Down