AST: Better handling of '(type){..}'

danmar · danmar · commit 10088685065e · 2020-03-08T16:46:06.000+01:00
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -1341,7 +1341,7 @@ std::pair<const Token *, const Token *> Token::findExpressionStartEndTokens() co
                 break;
             }
         }
-        if (Token::Match(end,"(|[") &&
+        if (Token::Match(end,"(|[|{") &&
             !(Token::Match(end, "( %type%") && !end->astOperand2())) {
             end = end->link();
             break;
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -994,7 +994,7 @@ static void compilePrecedence3(Token *&tok, AST_state& state)
             castTok->isCast(true);
             tok = tok->link()->next();
             const int inArrayAssignment = state.inArrayAssignment;
-            if (Token::Match(tok, "{ . %name% ="))
+            if (tok && tok->str() == "{")
                 state.inArrayAssignment = 1;
             compilePrecedence3(tok, state);
             state.inArrayAssignment = inArrayAssignment;
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -2402,9 +2402,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "struct bstr bstr0 ( const char * s ) { "
                                 "return ( struct bstr ) { ( unsigned char * ) s , s ? strlen ( s ) : 0 } ; "
                                 "}";
-        TODO_ASSERT_THROW(tok(code, false), InternalError); // TODO: Do not produce bad AST
-        //ASSERT_EQUALS(expected, tok(code, false));
-        //ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS("", errout.str());
     }
 
     void simplifyTypedef118() { // #5749

Original file line number	Diff line number	Diff line change
`@@ -1341,7 +1341,7 @@ std::pair<const Token , const Token > Token::findExpressionStartEndTokens() co`
`1341`	`1341`	`break;`
`1342`	`1342`	`}`
`1343`	`1343`	`}`
`1344`		`- if (Token::Match(end,"(\|[") &&`
	`1344`	`+ if (Token::Match(end,"(\|[\|{") &&`
`1345`	`1345`	`!(Token::Match(end, "( %type%") && !end->astOperand2())) {`
`1346`	`1346`	`end = end->link();`
`1347`	`1347`	`break;`