From c2b2aa92dce6fca5bcd29631eac73261d8d09371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 11 Dec 2024 17:53:58 +0100 Subject: [PATCH 1/2] Fix #397 (Debracket macro not expanded) --- simplecpp.cpp | 11 +++++++++-- test.cpp | 9 +++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/simplecpp.cpp b/simplecpp.cpp index 476f42ff..f3ac13af 100755 --- 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 index 0f7ebe77..daa31b66 100644 --- a/test.cpp +++ b/test.cpp @@ -821,6 +821,14 @@ 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 code[] = "#define A(val) B val\n" + "#define B(val) val\n" + "A((2))\n"; + ASSERT_EQUALS("\n\n2", preprocess(code)); +} + static void define_va_args_1() { const char code[] = "#define A(fmt...) dostuff(fmt)\n" @@ -2999,6 +3007,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); From 024aeebdc3e2d671747ea8c8126583955600ef0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 13 Dec 2024 11:13:18 +0100 Subject: [PATCH 2/2] non-arg --- simplecpp.cpp | 3 +-- test.cpp | 14 ++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/simplecpp.cpp b/simplecpp.cpp index f3ac13af..050a5d08 100755 --- a/simplecpp.cpp +++ b/simplecpp.cpp @@ -2055,8 +2055,7 @@ namespace simplecpp { 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); + else if (expandArg(&tokens, tok->next, loc, macros, expandedmacros, parametertokens)) { if (tokens.cfront()->next && tokens.cfront()->next->op == '(') tok2 = tok->next; } diff --git a/test.cpp b/test.cpp index daa31b66..bf83763e 100644 --- a/test.cpp +++ b/test.cpp @@ -823,10 +823,16 @@ static void define_define_20() // #384 arg contains comma static void define_define_21() // #397 DEBRACKET macro { - const char code[] = "#define A(val) B val\n" - "#define B(val) val\n" - "A((2))\n"; - ASSERT_EQUALS("\n\n2", preprocess(code)); + 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()