Skip to content

Fix #10802 Broken AST lambda inside for loop #4520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orbitcowboy merged 2 commits into from
Sep 29, 2022
+7 −0
Merged

Fix #10802 Broken AST lambda inside for loop #4520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5d7195
Fix #10802 Broken AST lambda inside for loop
chrchr-github Sep 29, 2022
8d92839
Add some boost and wxwidget defines (on behalf of "david ingamells")
chrchr-github Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cfg/boost.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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"/>
Expand Down
1 change: 1 addition & 0 deletions cfg/wxwidgets.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""/>
Expand Down
1 change: 1 addition & 0 deletions lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5959,6 +5959,7 @@ class TestTokenizer : public TestFixture {
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)"));
Expand Down