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

Improved parsing of C++11 initializer list (#3956) in CheckClass::initializeVarList.

This commit is contained in:
PKEuS 2012-07-10 05:47:51 -07:00
parent a93c47988c
commit 37d9d6fd7e
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/checkclass.cpp
View File

@ -236,7 +236,8 @@ bool CheckClass::isBaseClassFunc(const Token *tok, const Scope *scope)
void CheckClass::initializeVarList(const Function &func, std::list<std::string> &callstack, const Scope *scope, std::vector<Usage> &usage)
{
bool initList = true;
const Token *ftok = func.arg->link();
const Token *ftok = func.arg->link()->next();
int level = 0;
for (; ftok != func.functionScope->classEnd; ftok = ftok->next()) {
if (!ftok->next())
@ -245,20 +246,23 @@ void CheckClass::initializeVarList(const Function &func, std::list<std::string>
// Class constructor.. initializing variables like this
// clKalle::clKalle() : var(value) { }
if (initList) {
if (Token::Match(ftok, "%var% (")) {
if (level == 0 && Token::Match(ftok, "%var% ("))
initVar(ftok->str(), scope, usage);
else if (level != 0 && Token::Match(ftok, "%var% =")) // assignment in the initializer: var(value = x)
assignVar(ftok->str(), scope, usage);
// assignment in the initializer..
// : var(value = x)
if (Token::Match(ftok->tokAt(2), "%var% ="))
assignVar(ftok->strAt(2), scope, usage);
else if (ftok->str() == "(")
level++;
else if (ftok->str() == ")")
level--;
else if (ftok->str() == "{") {
if (level == 0)
initList = false;
else
ftok = ftok->link();
}
}
if (ftok->str() == "{")
initList = false;
if (initList)
continue;

12
test/testconstructors.cpp
View File

@ -118,6 +118,7 @@ private:
TEST_CASE(uninitVarArray8);
TEST_CASE(uninitVarArray2D);
TEST_CASE(uninitVarArray3D);
TEST_CASE(uninitVarCpp11Init);
TEST_CASE(uninitVarStruct1); // ticket #2172
TEST_CASE(uninitVarStruct2); // ticket #838
TEST_CASE(uninitVarUnion1); // ticket #3196
@ -1694,6 +1695,17 @@ private:
ASSERT_EQUALS("", errout.str());
}
void uninitVarCpp11Init() {
check("class Foo {\n"
" std::vector<std::string> bar;\n"
"public:\n"
" Foo()\n"
" : bar({\"a\", \"b\"})\n"
" {}\n"
"};");
ASSERT_EQUALS("", errout.str());
}
void uninitVarStruct1() { // ticket #2172
check("class A\n"
"{\n"