AST: fix hang for code 'MACRO({.x=1,.y=2})'

danmar · danmar · commit cd75b2d83de7 · 2014-08-25T19:10:16.000+02:00
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -895,6 +895,8 @@ static Token * createAstAtToken(Token *tok, bool cpp)
                 continue;
             if (tok->next() == endToken)
                 break;
+            if (Token::simpleMatch(tok, "( { ."))
+                break;
             const Token * const endToken2 = tok->linkAt(1);
             for (; tok && tok != endToken && tok != endToken2; tok = tok ? tok->next() : NULL)
                 tok = createAstAtToken(tok, cpp);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -10755,6 +10755,9 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("QT_WA{{,( QT_WA{{,( x1=",
                       testAst("QT_WA({},{x=0;});" // don't hang
                               "QT_WA({x=1;},{x=2;});"));
+        ASSERT_EQUALS("xMACROtypeT=value1=,{({=",
+                      testAst("x = { MACRO( { .type=T, .value=1 } ) }")); // dont hang: MACRO({..})
+
 
         // function pointer
         TODO_ASSERT_EQUALS("todo", "va_argapvoid((,(*0=", testAst("*va_arg(ap, void(**) ()) = 0;"));
