Fix #397 (Debracket macro not expanded)

danmar · Dec 12, 2024 · 62be4c4 · 62be4c4
1 parent 328c133
commit 62be4c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -2046,13 +2046,20 @@ 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 (tok->next->name && tok->next->next && tok->next->next->op != '(') {
+                    expandToken(&tokens, loc, tok->next, macros, expandedmacros2, 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;

diff --git a/test.cpp b/test.cpp
@@ -823,9 +823,9 @@ static void define_define_20() // #384 arg contains comma
 
 static void define_define_21() // #397 DEBRACKET macro
 {
-    const char code[] = "#define A(ignore_this, val, ...) DEBRACKET val\n"
-                        "#define DEBRACKET(...) __VA_ARGS__\n"
-                        "A(_ , (2))\n";
+    const char code[] = "#define A(val) B val\n"
+                        "#define B(val) val\n"
+                        "A((2))\n";
     ASSERT_EQUALS("\n\n2", preprocess(code));
 }