Fixed #7966 (ValueType: wrong type for gcc initialization {[1]=..})

danmar · danmar · commit 164df2aa7b7e · 2017-03-31T09:41:38.000+02:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -4578,7 +4578,7 @@ void SymbolDatabase::setValueType(Token *tok, const ValueType &valuetype)
         return;
     }
 
-    if (parent->str() == "[" && (!cpp || parent->astOperand1() == tok) && valuetype.pointer > 0U) {
+    if (parent->str() == "[" && (!cpp || parent->astOperand1() == tok) && valuetype.pointer > 0U && !Token::Match(parent->previous(), "[{,]")) {
         const Token *op1 = parent->astOperand1();
         while (op1 && op1->str() == "[")
             op1 = op1->astOperand1();
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -4429,6 +4429,7 @@ class TestSymbolDatabase: public TestFixture {
 
         // Variable declaration
         ASSERT_EQUALS("char *", typeOf("; char abc[] = \"abc\";", "["));
+        ASSERT_EQUALS("", typeOf("; int x[10] = { [3]=1 };", "[ 3 ]"));
     }
 
     void variadic1() { // #7453

Original file line number	Diff line number	Diff line change
`@@ -4578,7 +4578,7 @@ void SymbolDatabase::setValueType(Token *tok, const ValueType &valuetype)`
`4578`	`4578`	`return;`
`4579`	`4579`	`}`
`4580`	`4580`
`4581`		`- if (parent->str() == "[" && (!cpp \|\| parent->astOperand1() == tok) && valuetype.pointer > 0U) {`
	`4581`	`+ if (parent->str() == "[" && (!cpp \|\| parent->astOperand1() == tok) && valuetype.pointer > 0U && !Token::Match(parent->previous(), "[{,]")) {`
`4582`	`4582`	`const Token *op1 = parent->astOperand1();`
`4583`	`4583`	`while (op1 && op1->str() == "[")`
`4584`	`4584`	`op1 = op1->astOperand1();`
Original file line number	Diff line number	Diff line change
`@@ -4429,6 +4429,7 @@ class TestSymbolDatabase: public TestFixture {`
`4429`	`4429`
`4430`	`4430`	`// Variable declaration`
`4431`	`4431`	`ASSERT_EQUALS("char *", typeOf("; char abc[] = \"abc\";", "["));`
	`4432`	`+ ASSERT_EQUALS("", typeOf("; int x[10] = { [3]=1 };", "[ 3 ]"));`
`4432`	`4433`	`}`
`4433`	`4434`
`4434`	`4435`	`void variadic1() { // #7453`