From b8b6b4183392d75ddb3e9fd68bc7b3153a15b40a Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Thu, 29 Sep 2022 13:29:50 +0200
Subject: [PATCH] Fix #10802 Broken AST lambda inside for loop (#4520)

* Fix #10802 Broken AST lambda inside for loop

* Add some boost and wxwidget defines (on behalf of "david ingamells")
---
 cfg/boost.cfg         | 4 ++++
 cfg/wxwidgets.cfg     | 1 +
 lib/tokenlist.cpp     | 1 +
 test/testtokenize.cpp | 1 +
 4 files changed, 7 insertions(+)

diff --git a/cfg/boost.cfg b/cfg/boost.cfg
index e9ea1be92..0702bad74 100644
--- a/cfg/boost.cfg
+++ b/cfg/boost.cfg
@@ -16,6 +16,7 @@
   <define name="BOOST_PP_SEQ_TRANSFORM(macro, data, list)" value=""/>
   <define name="BOOST_PP_CAT(a, b)" value=""/>
   <define name="BOOST_PP_REPEAT(a,b,c)" value=""/>
+  <define name="BOOST_PP_STRINGIZE(t)" value=""/>
   <!-- https://www.boost.org/doc/libs/master/doc/html/foreach.html -->
   <define name="BOOST_FOREACH(A,B)" value="for (A: B)"/>
   <!-- https://www.boost.org/doc/libs/master/libs/config/doc/html/boost_config/boost_macro_reference.html -->
@@ -92,6 +93,9 @@
   <define name="BOOST_SCOPED_ENUM_DECLARE_BEGIN(x)" value=""/>
   <define name="BOOST_SCOPED_ENUM_DECLARE_END(x)" value=""/>
   <define name="BOOST_TTI_HAS_TYPE(x)" value=""/>
+  <define name="BOOST_TTI_HAS_TYPE(x)" value=""/>
+  <define name="BOOST_TTI_MEMBER_TYPE(x)" value=""/>
+  <define name="BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION(x)" value=""/>
   <!-- ########## Boost containers ########## -->
   <!-- boost containers that are similar to std containers -->
   <container id="boostArray" startPattern="boost :: array|scoped_array &lt;" inherits="stdArray"/>
diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index e561a6709..6d187a423 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -276,6 +276,7 @@
   <define name="EVT_GRID_CMD_LABEL_RIGHT_DCLICK(id,func)" value=""/>
   <define name="EVT_GRID_CMD_LABEL_LEFT_CLICK(id,func)" value=""/>
   <define name="EVT_GRID_CMD_LABEL_RIGHT_CLICK(id,func)" value=""/>
+  <define name="EVT_GRID_CMD_CELL_LEFT_DCLICK(id,func)" value=""/>
   <define name="EVT_GRID_CMD_CELL_RIGHT_DCLICK(id,func)" value=""/>
   <define name="EVT_GRID_CMD_CELL_CHANGE(id,func)" value=""/>
   <define name="EVT_GRID_CMD_CELL_CHANGED(id,func)" value=""/>
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 3db8e0b31..b632085ee 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -1517,6 +1517,7 @@ static Token * createAstAtToken(Token *tok, bool cpp)
         }
         if (!tok2 || tok2->str() != ";") {
             if (tok2 == endPar && init1) {
+                createAstAtTokenInner(init1->next(), endPar, cpp);
                 tok->next()->astOperand2(init1);
                 tok->next()->astOperand1(tok);
             }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 57843ca19..20dfb5aea 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -5959,6 +5959,7 @@ private:
         ASSERT_EQUALS("forae*bc.({:(", testAst("for (a *e : {b->c()});"));
         ASSERT_EQUALS("fori0=iasize.(<i++;;( asize.(", testAst("for (decltype(a.size()) i = 0; i < a.size(); ++i);"));
         ASSERT_EQUALS("foria:( asize.(", testAst("for(decltype(a.size()) i:a);"));
+        ASSERT_EQUALS("forec0{([,(:( fb.return", testAst("for (auto e : c(0, [](auto f) { return f->b; }));")); // #10802
 
         // for with initializer (c++20)
         ASSERT_EQUALS("forab=ca:;(", testAst("for(a=b;int c:a)"));