Fix #10451 syntaxError with typedef and lambda (#3900)

chrchr-github · web-flow · commit 6376bac5bb7e · 2022-03-14T17:59:29.000+01:00
* Fix #10451 syntaxError with typedef and lambda * Don't insert union into template argument list, add test * Format * Revert "Format" This reverts commit 8c52d49. * Format
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -192,7 +192,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                         continue;
                     else if (Token::Match(tok2, "%name% (") && mTokenizer->isFunctionHead(tok2->next(), "{;"))
                         continue;
-                    else if (Token::Match(tok2, "%name% ["))
+                    else if (Token::Match(tok2, "%name% [|="))
                         continue;
                     // skip template
                     else if (Token::simpleMatch(tok2, ";") &&
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1371,7 +1371,7 @@ void Tokenizer::simplifyTypedef()
                             structRemoved = true;
                         typeStart = typeStart->next();
                     }
-                    if (Token::Match(typeStart, "struct|class") && Token::Match(tok2, "%name% ::"))
+                    if (Token::Match(typeStart, "struct|class|union") && Token::Match(tok2, "%name% ::"))
                         typeStart = typeStart->next();
 
                     if (sameStartEnd)
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -658,7 +658,7 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode43() { // #6703
-        ASSERT_THROW(checkCode("int { }; struct A<void> a = { }"), InternalError);
+        checkCode("int { }; struct A<void> a = { }");
     }
 
     void garbageCode44() { // #6704
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -356,6 +356,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(symboldatabase95); // #10295
         TEST_CASE(symboldatabase96); // #10126
         TEST_CASE(symboldatabase97); // #10598 - final class
+        TEST_CASE(symboldatabase98); // #10451
 
         TEST_CASE(createSymbolDatabaseFindAllScopes1);
         TEST_CASE(createSymbolDatabaseFindAllScopes2);
@@ -4858,6 +4859,26 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(functok->function()->type, Function::Type::eConstructor);
     }
 
+    void symboldatabase98() { // #10451
+        {
+            GET_SYMBOL_DB("struct A { typedef struct {} B; };\n"
+                          "void f() {\n"
+                          "    auto g = [](A::B b) -> void { A::B b2 = b; };\n"
+                          "};\n");
+            ASSERT(db);
+            ASSERT_EQUALS(5, db->scopeList.size());
+        }
+        {
+            GET_SYMBOL_DB("typedef union {\n"
+                          "    int i;\n"
+                          "} U;\n"
+                          "template <auto U::*>\n"
+                          "void f();\n");
+            ASSERT(db);
+            ASSERT_EQUALS(2, db->scopeList.size());
+        }
+    }
+
     void createSymbolDatabaseFindAllScopes1() {
         GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }");
         ASSERT(db->scopeList.size() == 3);

Original file line number	Diff line number	Diff line change
`@@ -1371,7 +1371,7 @@ void Tokenizer::simplifyTypedef()`
`1371`	`1371`	`structRemoved = true;`
`1372`	`1372`	`typeStart = typeStart->next();`
`1373`	`1373`	`}`
`1374`		`- if (Token::Match(typeStart, "struct\|class") && Token::Match(tok2, "%name% ::"))`
	`1374`	`+ if (Token::Match(typeStart, "struct\|class\|union") && Token::Match(tok2, "%name% ::"))`
`1375`	`1375`	`typeStart = typeStart->next();`
`1376`	`1376`
`1377`	`1377`	`if (sameStartEnd)`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ class TestGarbage : public TestFixture {`
`658`	`658`	`}`
`659`	`659`
`660`	`660`	`void garbageCode43() { // #6703`
`661`		`- ASSERT_THROW(checkCode("int { }; struct A<void> a = { }"), InternalError);`
	`661`	`+ checkCode("int { }; struct A<void> a = { }");`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`void garbageCode44() { // #6704`