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

Support {} initialization in initializer list (#6216)

This commit is contained in:
Frank Zingsheim 2014-10-15 21:33:07 +02:00 committed by PKEuS
parent 228206f556
commit eab0878b8a
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenize.cpp
View File

@ -2141,7 +2141,8 @@ const Token * Tokenizer::startOfExecutableScope(const Token * tok)
} else
return nullptr;
} else {
if (tok->isName() && tok->next() && tok->next()->str() == "(") {
if (tok->isName() && tok->next() && (tok->next()->str() == "(" ||
(inInit && tok->next()->str() == "{"))) {
tok = tok->next()->link()->next();
} else if (tok->str() == ",") {
tok = tok->next();

18
test/testtokenize.cpp
View File

@ -682,6 +682,22 @@ private:
// #3496 - make sure hasComplicatedSyntaxErrorsInTemplates works
ASSERT_EQUALS("void a ( Fred * f ) { for ( ; n < f . x ( ) ; ) { } }",
tokenizeAndStringify("void a(Fred* f) MACRO { for (;n < f->x();) {} }"));
// #6216 - make sure hasComplicatedSyntaxErrorsInTemplates works
ASSERT_EQUALS("C :: C ( )\n"
": v { }\n"
"{\n"
"for ( int dim = 0 ; dim < v . size ( ) ; ++ dim ) {\n"
"v [ dim ] . f ( ) ;\n"
"}\n"
"} ;",
tokenizeAndStringify("C::C()\n"
":v{}\n"
"{\n"
" for (int dim = 0; dim < v.size(); ++dim) {\n"
" v[dim]->f();\n"
" }\n"
"};"));
}
void tokenize20() { // replace C99 _Bool => bool
@ -8605,6 +8621,8 @@ private:
ASSERT(isStartOfExecutableScope(3, "void foo() const throw(int) { }"));
ASSERT(isStartOfExecutableScope(2, "foo() : a(1) { }"));
ASSERT(isStartOfExecutableScope(2, "foo() : a(1), b(2) { }"));
ASSERT(isStartOfExecutableScope(2, "foo() : a{1} { }"));
ASSERT(isStartOfExecutableScope(2, "foo() : a{1}, b{2} { }"));
}
};