AST: Handle 'x = { [ID] = 1, .. }' when ID is unexpanded macro

danmar · danmar · commit d9f72d5f8c0c · 2017-04-26T22:35:04.000+02:00
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -590,7 +590,7 @@ static void compileTerm(Token *&tok, AST_state& state)
         tok->astOperand1(tok->next());
         tok = tok->tokAt(2);
     }
-    if (state.inArrayAssignment && Token::Match(tok->previous(), "[{,] [ %num% ]")) {
+    if (state.inArrayAssignment && Token::Match(tok->previous(), "[{,] [ %num%|%name% ]")) {
         state.op.push(tok);
         tok->astOperand1(tok->next());
         tok = tok->tokAt(3);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -8078,6 +8078,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("s1a&,{2b&,{,{=", testAst("s = { {1, &a}, {2, &b} };"));
         ASSERT_EQUALS("s0[L.2[x={=", testAst("s = { [0].L[2] = x};"));
         ASSERT_EQUALS("ac.0={(=", testAst("a = (b){.c=0,};")); // <- useless comma
+        ASSERT_EQUALS("xB[1y.z.1={(&=,{={=", testAst("x = { [B] = {1, .y = &(struct s) { .z=1 } } };"));
 
         // struct initialization hang
         ASSERT_EQUALS("sbar.1{,{(={= fcmd( forfieldfield++;;(",

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ static void compileTerm(Token *&tok, AST_state& state)`
`590`	`590`	`tok->astOperand1(tok->next());`
`591`	`591`	`tok = tok->tokAt(2);`
`592`	`592`	`}`
`593`		`- if (state.inArrayAssignment && Token::Match(tok->previous(), "[{,] [ %num% ]")) {`
	`593`	`+ if (state.inArrayAssignment && Token::Match(tok->previous(), "[{,] [ %num%\|%name% ]")) {`
`594`	`594`	`state.op.push(tok);`
`595`	`595`	`tok->astOperand1(tok->next());`
`596`	`596`	`tok = tok->tokAt(3);`