Skip to content

fix #12302: internalAstError using lambda #7589

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
danmar merged 2 commits into from
Jun 12, 2025
+22 −1
Merged

fix #12302: internalAstError using lambda #7589

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
475e456
add test
ludviggunne Jun 12, 2025
618354c
fix #12302
ludviggunne Jun 12, 2025
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
6 changes: 5 additions & 1 deletion lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ static bool iscast(const Token *tok, bool cpp)
if (Token::Match(tok->link(), ") %assign%|,|..."))
return false;

if (tok->previous() && tok->previous()->isName() && tok->strAt(-1) != "return" &&
if (tok->previous() && tok->previous()->isName() && !Token::Match(tok->previous(), "return|case") &&
(!cpp || !Token::Match(tok->previous(), "delete|throw")))
return false;

Expand Down Expand Up @@ -600,6 +600,10 @@ static bool iscpp11init_impl(const Token * const tok)
if (Token::simpleMatch(castTok->astParent(), "case"))
return true;
}
if (findParent(colonTok->previous(), [](const Token *parent){
return parent->str() == "case";
}))
return true;
const Token* caseTok = colonTok->tokAt(-2);
while (caseTok && Token::Match(caseTok->tokAt(-1), "::|%name%"))
caseTok = caseTok->tokAt(-1);
Expand Down
17 changes: 17 additions & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7071,6 +7071,23 @@ class TestTokenizer : public TestFixture {
"}\n"));
ASSERT_EQUALS("", errout_str());

ASSERT_NO_THROW(tokenizeAndStringify("int foo() {\n"
" connect([]( const int& f ) {\n"
" switch( f )\n"
" {\n"
" case (int)1:\n"
" {\n"
" A r(f);\n"
" if (1) {}\n"
" }\n"
" break;\n"
" }\n"
" return 0;\n"
" });\n"
" return 0;\n"
"}\n"));
ASSERT_EQUALS("", errout_str());

// #11378
ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };"));

Expand Down
Loading