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

AST: lambdas and scopes in expressions

This commit is contained in:
Daniel Marjamäki 2019-11-23 21:36:36 +01:00
parent ebd32cfd73
commit ab2274b8ad
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenlist.cpp
View File

@ -579,6 +579,8 @@ static bool iscpp11init_impl(const Token * const tok)
return false; return false;
if (Token::simpleMatch(nameToken->previous(), "namespace")) if (Token::simpleMatch(nameToken->previous(), "namespace"))
return false; return false;
if (Token::Match(nameToken, "%any% {") && Token::findsimplematch(nameToken->next(), ";", nameToken->linkAt(1)))
return false;
// There is no initialisation for example here: 'class Fred {};' // There is no initialisation for example here: 'class Fred {};'
if (!Token::simpleMatch(endtok, "} ;")) if (!Token::simpleMatch(endtok, "} ;"))
return true; return true;
@ -714,7 +716,7 @@ static void compileTerm(Token *&tok, AST_state& state)
compileBinOp(tok, state, compileExpression); compileBinOp(tok, state, compileExpression);
if (Token::Match(tok, "} ,|:")) if (Token::Match(tok, "} ,|:"))
tok = tok->next(); tok = tok->next();
} else if (state.cpp && Token::Match(tok->tokAt(-2), "%name% ( {")) { } else if (state.cpp && Token::Match(tok->tokAt(-2), "%name% ( {") && !Token::findsimplematch(tok, ";", tok->link())) {
if (Token::simpleMatch(tok, "{ }")) if (Token::simpleMatch(tok, "{ }"))
tok = tok->tokAt(2); tok = tok->tokAt(2);
else { else {

2
test/testautovariables.cpp
View File

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

4
test/testtokenize.cpp
View File

@ -7621,7 +7621,7 @@ private:
// ({..}) // ({..})
ASSERT_EQUALS("a{+d+ bc+", testAst("a+({b+c;})+d")); ASSERT_EQUALS("a{+d+ bc+", testAst("a+({b+c;})+d"));
ASSERT_EQUALS("a{d*+ bc+", testAst("a+({b+c;})*d")); ASSERT_EQUALS("a{d*+ bc+", testAst("a+({b+c;})*d"));
ASSERT_EQUALS("xabc({((= ydef({((=", ASSERT_EQUALS("xa{((= bc( yd{((= ef(",
testAst("x=(int)(a({b(c);}));" // don't hang testAst("x=(int)(a({b(c);}));" // don't hang
"y=(int)(d({e(f);}));")); "y=(int)(d({e(f);}));"));
ASSERT_EQUALS("A{{,( x0= Bx1={x2={,(", // TODO: This is not perfect!! ASSERT_EQUALS("A{{,( x0= Bx1={x2={,(", // TODO: This is not perfect!!
@ -7726,7 +7726,7 @@ private:
ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)")); ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)"));
ASSERT_EQUALS("abc{d{,{(=", testAst("a = b({ c{}, d{} });")); ASSERT_EQUALS("abc{d{,{(=", testAst("a = b({ c{}, d{} });"));
ASSERT_EQUALS("abc;(", testAst("a(b;c)")); ASSERT_EQUALS("abc;(", testAst("a(b;c)"));
ASSERT_EQUALS("aforab;c;({(", testAst("a({ for(a;b;c){} });")); ASSERT_EQUALS("x{( forbc;;(", testAst("x({ for(a;b;c){} });"));
} }
void asttemplate() { // uninstantiated templates will have <,>,etc.. void asttemplate() { // uninstantiated templates will have <,>,etc..