non-arg

Author: danmar

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;
                 }

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()