Handle lambda in constructor initializer list in setVarIdPass1

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: autoantwort

lib/tokenize.cpp

@@ -4771,6 +4771,7 @@ void Tokenizer::setVarIdPass1()
     std::stack<const Token *> functionDeclEndStack;
     const Token *functionDeclEndToken = nullptr;
     bool initlist = false;
+    std::stack<const Token *> initlistLambdaEnds; // ends of lambda bodies in an initializer list
     bool inlineFunction = false;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->isOp())
@@ -4843,6 +4844,7 @@ void Tokenizer::setVarIdPass1()
                     while (Token::Match(prev, "%name%|."))
                         prev = prev->previous();
                     const bool isLambda = prev && prev->str() == ")" && Token::simpleMatch(prev->link()->previous(), "] (");
+                    const bool isInitlistLambda = initlist && (isLambda || Token::simpleMatch(prev, "]"));
                     if ((!isLambda && (tok->strAt(-1) == ")" || Token::Match(tok->tokAt(-2), ") %type%"))) ||
                         (initlist && tok->strAt(-1) == "}")) {
                         isExecutable = true;
@@ -4852,8 +4854,10 @@ void Tokenizer::setVarIdPass1()
                         if (!(scopeStack.top().isStructInit || tok->strAt(-1) == "="))
                             variableMap.enterScope();
                     }
-                    const bool isStructInit = scopeStack.top().isStructInit || tok->strAt(-1) == "=" || (initlist && !Token::Match(tok->tokAt(-1), ")|}|..."));
+                    const bool isStructInit = scopeStack.top().isStructInit || tok->strAt(-1) == "=" || (initlist && !isInitlistLambda && !Token::Match(tok->tokAt(-1), ")|}|..."));
                     scopeStack.emplace(isExecutable, isStructInit, isEnumStart(tok), variableMap.getVarId());
+                    if (isInitlistLambda)
+                        initlistLambdaEnds.push(tok->link());
                     initlist = false;
                 } else { /* if (tok->str() == "}") */
                     bool isNamespace = false;
@@ -4894,6 +4898,11 @@ void Tokenizer::setVarIdPass1()
                     if (scopeStack.empty()) {  // should be impossible
                         scopeStack.emplace(/*VarIdScopeInfo()*/);
                     }
+                    if (!initlistLambdaEnds.empty() && initlistLambdaEnds.top() == tok) {
+                        // continue with the initializer list after the lambda
+                        initlistLambdaEnds.pop();
+                        initlist = true;
+                    }
                 }
             }
         }

test/testvarid.cpp

@@ -2739,6 +2739,30 @@ class TestVarID : public TestFixture {
                       "10: } ;\n"
                       "11: int T :: g ( ) { return * p@5 ; }\n",
                       tokenize(code14));
+
+        const char code15[] = "struct S {\n" // lambda in initializer list
+                              "    int x;\n"
+                              "    int* p;\n"
+                              "    S(int* p) : x([p] { return *p; }()), p(p) {}\n"
+                              "    S(int* p, int) : x([](int* q) { int y = *q; return y; }(p)), p(p) {}\n"
+                              "};\n"
+                              "struct T {\n"
+                              "    int* p;\n"
+                              "    int g();\n"
+                              "};\n"
+                              "int T::g() { return *p; }\n";
+        ASSERT_EQUALS("1: struct S {\n"
+                      "2: int x@1 ;\n"
+                      "3: int * p@2 ;\n"
+                      "4: S ( int * p@3 ) : x@1 ( [ p@3 ] { return * p@3 ; } ( ) ) , p@2 ( p@3 ) { }\n"
+                      "5: S ( int * p@4 , int ) : x@1 ( [ ] ( int * q@5 ) { int y@6 ; y@6 = * q@5 ; return y@6 ; } ( p@4 ) ) , p@2 ( p@4 ) { }\n"
+                      "6: } ;\n"
+                      "7: struct T {\n"
+                      "8: int * p@7 ;\n"
+                      "9: int g ( ) ;\n"
+                      "10: } ;\n"
+                      "11: int T :: g ( ) { return * p@7 ; }\n",
+                      tokenize(code15));
     }
 
     void varid_initListWithBaseTemplate() {