Fix test case with recursive scans

Author: Your Name

simplecpp.cpp

@@ -2090,38 +2090,33 @@ namespace simplecpp {
         }
 
         const Token *recursiveExpandToken(TokenList &output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
-            if (!temp.cback() || !temp.cback()->name || !tok->next || tok->next->op != '(') {
-                output.takeTokens(temp);
-                return tok->next;
-            }
+            // Loop: the expansion result may itself end with the name of a function-like
+            // macro whose arguments are supplied by the tokens that follow it.
+            while (true) {
+                if (!temp.cback() || !temp.cback()->name || !tok->next || tok->next->op != '(' || !sameline(tok, tok->next))
+                    break;
 
-            if (!sameline(tok, tok->next)) {
-                output.takeTokens(temp);
-                return tok->next;
-            }
+                const MacroMap::const_iterator it = macros.find(temp.cback()->str());
+                if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end())
+                    break;
 
-            const MacroMap::const_iterator it = macros.find(temp.cback()->str());
-            if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end()) {
-                output.takeTokens(temp);
-                return tok->next;
-            }
+                const Macro &calledMacro = it->second;
+                if (!calledMacro.functionLike() || temp.cback()->isExpandedFrom(&calledMacro))
+                    break;
 
-            const Macro &calledMacro = it->second;
-            if (!calledMacro.functionLike()) {
+                TokenList temp2(files);
+                temp2.push_back(new Token(temp.cback()->str(), tok->location));
+
+                const Token * const tok2 = appendTokens(temp2, loc, tok->next, macros, expandedmacros, parametertokens);
+                if (!tok2)
+                    break;
                 output.takeTokens(temp);
-                return tok->next;
+                output.deleteToken(output.back());
+                calledMacro.expand(temp, loc, temp2.cfront(), macros, expandedmacros);
+                tok = tok2;
             }
-
-            TokenList temp2(files);
-            temp2.push_back(new Token(temp.cback()->str(), tok->location));
-
-            const Token * const tok2 = appendTokens(temp2, loc, tok->next, macros, expandedmacros, parametertokens);
-            if (!tok2)
-                return tok->next;
             output.takeTokens(temp);
-            output.deleteToken(output.back());
-            calledMacro.expand(output, loc, temp2.cfront(), macros, expandedmacros);
-            return tok2->next;
+            return tok->next;
         }
 
         const Token *expandToken(TokenList &output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {

test.cpp

@@ -909,6 +909,31 @@ static void define23() // #40
                   "unsigned A , B ;", preprocess(code));
 }
 
+static void define24()
+{
+    // an expansion result that is a function-like macro name must be rescanned
+    // repeatedly against the tokens that follow it
+    const char code[] = "#define a(b, c) c\n"
+                        "#define d() a\n"
+                        "#define g(e) h(e, ) h(e, )\n"
+                        "#define h(e, b) d()(, e)()\n"
+                        "#define i()\n"
+                        "g(i)\n";
+    ASSERT_EQUALS("", preprocess(code));
+}
+
+static void define25()
+{
+    // a macro name that came from expanding that same macro must not be
+    // re-expanded when rescanned with the tokens that follow it
+    const char code[] = "#define f() f\n"
+                        "#define wrap(x) x()\n"
+                        "wrap(f())\n";
+    ASSERT_EQUALS("\n"
+                  "\n"
+                  "f ( )", preprocess(code));
+}
+
 
 static void define_invalid_1()
 {
@@ -4096,6 +4121,8 @@ static void runTests(int argc, char **argv, Input input)
     TEST_CASE(define21); // #66
     TEST_CASE(define22); // #40
     TEST_CASE(define23); // #40
+    TEST_CASE(define24);
+    TEST_CASE(define25);
     TEST_CASE(define_invalid_1);
     TEST_CASE(define_invalid_2);
     TEST_CASE(define_invalid_3);