walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

AST: initializer list with lambda

This commit is contained in:
Daniel Marjamäki 2019-11-27 06:44:43 +01:00
parent 8f72a714d1
commit 937c82efbe
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenlist.cpp
View File

@ -579,8 +579,15 @@ static bool iscpp11init_impl(const Token * const tok)
return false;
if (Token::simpleMatch(nameToken->previous(), "namespace"))
return false;
if (Token::Match(nameToken, "%any% {") && Token::findsimplematch(nameToken->next(), ";", nameToken->linkAt(1)))
return false;
if (Token::Match(nameToken, "%any% {")) {
// If there is semicolon between {..} this is not a initlist
for (const Token *tok2 = nameToken->next(); tok2 != endtok; tok2 = tok2->next()) {
if (tok2->str() == ";")
return false;
if (tok2->str() == "[" && Token::simpleMatch(tok2->link(), "] (") && Token::simpleMatch(tok2->link()->linkAt(1), ") {"))
tok2 = tok2->link()->linkAt(1)->linkAt(1);
}
}
// There is no initialisation for example here: 'class Fred {};'
if (!Token::simpleMatch(endtok, "} ;"))
return true;

2
test/testautovariables.cpp
View File

@ -2009,7 +2009,7 @@ private:
" std::vector<char> v;\n"
" return {v, [v]() { return v.data(); }};\n"
"}\n");
// FIXME ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("", errout.str());
check("template<class F>\n"
"void g(F);\n"