@@ -1504,8 +1504,11 @@ namespace simplecpp {
                                 expanded = true;
                             }
                         }
-                        if (!expanded)
+                        if (!expanded) {
                             tokens->push_back(new Token(*tok));
+                            if (tok->macro.empty() && (par > 0 || tok->str() != "("))
+                                tokens->back()->macro = name();
+                        }
                     }
 
                     if (tok->op == '(')
@@ -1812,6 +1815,7 @@ namespace simplecpp {
                     partok = it->second.expand(output, loc, partok, macros, expandedmacros);
                 else {
                     output->push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros)));
+                    output->back()->macro = partok->macro;
                     partok = partok->next;
                 }
             }
 
@@ -2007,6 +2007,22 @@ static void tokenMacro4()
     ASSERT_EQUALS("A", tok->macro);
 }
 
+static void tokenMacro5()
+{
+    const char code[] = "#define SET_BPF(code) (code)\n"
+                        "#define SET_BPF_JUMP(code) SET_BPF(D | code)\n"
+                        "SET_BPF_JUMP(A | B | C);";
+    const simplecpp::DUI dui;
+    std::vector<std::string> files;
+    std::map<std::string, simplecpp::TokenList*> filedata;
+    std::istringstream istr(code);
+    simplecpp::TokenList tokenList(files);
+    simplecpp::preprocess(tokenList, simplecpp::TokenList(istr,files), files, filedata, dui);
+    const simplecpp::Token *tok = tokenList.cfront()->next;
+    ASSERT_EQUALS("D", tok->str());
+    ASSERT_EQUALS("SET_BPF_JUMP", tok->macro);
+}
+
 static void undef()
 {
     std::istringstream istr("#define A\n"
@@ -2327,6 +2343,7 @@ int main(int argc, char **argv)
     TEST_CASE(tokenMacro2);
     TEST_CASE(tokenMacro3);
     TEST_CASE(tokenMacro4);
+    TEST_CASE(tokenMacro5);
 
     TEST_CASE(undef);
Original file line number	Diff line number	Diff line change
`@@ -1504,8 +1504,11 @@ namespace simplecpp {`
`1504`	`1504`	`expanded = true;`
`1505`	`1505`	`}`
`1506`	`1506`	`}`
`1507`		`- if (!expanded)`
	`1507`	`+ if (!expanded) {`
`1508`	`1508`	`tokens->push_back(new Token(*tok));`
	`1509`	`+ if (tok->macro.empty() && (par > 0 \|\| tok->str() != "("))`
	`1510`	`+ tokens->back()->macro = name();`
	`1511`	`+ }`
`1509`	`1512`	`}`
`1510`	`1513`
`1511`	`1514`	`if (tok->op == '(')`
`@@ -1812,6 +1815,7 @@ namespace simplecpp {`
`1812`	`1815`	`partok = it->second.expand(output, loc, partok, macros, expandedmacros);`
`1813`	`1816`	`else {`
`1814`	`1817`	`output->push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros)));`
	`1818`	`+ output->back()->macro = partok->macro;`
`1815`	`1819`	`partok = partok->next;`
`1816`	`1820`	`}`
`1817`	`1821`	`}`