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

Fix #11369 Syntax error. Unexpected tokens in initializer. (#4568)

This commit is contained in:
chrchr-github 2022-10-29 21:24:50 +02:00 committed by GitHub
parent 8672e12a7a
commit 6df8573e15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenlist.cpp
View File

@ -626,7 +626,8 @@ static bool iscpp11init_impl(const Token * const tok)
} }
if (!nameToken) if (!nameToken)
return false; return false;
if (nameToken->str() == ")" && Token::simpleMatch(nameToken->link()->previous(), "decltype (")) if (nameToken->str() == ")" && Token::simpleMatch(nameToken->link()->previous(), "decltype (") &&
!Token::simpleMatch(nameToken->link()->tokAt(-2), "."))
return true; return true;
if (Token::simpleMatch(nameToken, ", {")) if (Token::simpleMatch(nameToken, ", {"))
return true; return true;

6
test/testtokenize.cpp
View File

@ -6377,6 +6377,12 @@ private:
ASSERT_EQUALS("AB: abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };")); ASSERT_EQUALS("AB: abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };"));
ASSERT_EQUALS("xfts(=", testAst("; auto x = f(ts...);")); ASSERT_EQUALS("xfts(=", testAst("; auto x = f(ts...);"));
// #11369
ASSERT_NO_THROW(tokenizeAndStringify("int a;\n"
"template <class> auto b() -> decltype(a) {\n"
" if (a) {}\n"
"}\n"));
} }
void astcast() { void astcast() {