decltype

danmar · Jan 12, 2024 · 963fae7 · 963fae7
1 parent 8f4b44f
commit 963fae7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -1375,8 +1375,8 @@ const Token* findLambdaEndTokenWithoutAST(const Token* tok) {
         tok = tok->link()->next();
     if (Token::simpleMatch(tok, ".")) { // trailing return type
         tok = tok->next();
-        while (Token::Match(tok, "%type%|%name%|::|&|&&|*|<")) {
-            if (tok->str() == "<")
+        while (Token::Match(tok, "%type%|%name%|::|&|&&|*|<|(")) {
+            if (tok->link())
                 tok = tok->link()->next();
             else
                 tok = tok->next();

diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -2841,6 +2841,15 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS(3, db->scopeList.size());
             ASSERT_EQUALS(Scope::ScopeType::eLambda, db->scopeList.back().type);
         }
+        {
+            const char code[] = "void f() {\n"
+                                "    auto g = [&](const std::function<int(int)>& h = [](int i) -> decltype(0) { return i; }) {};\n"
+                                "}\n";
+            GET_SYMBOL_DB(code);
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS(Scope::ScopeType::eLambda, db->scopeList.back().type);
+        }
     }
 
     void functionArgs21() {