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

Fixed #5493 (False positive: Found a statement that begins with numeric constant / string constant - in the presence of initialization list.)

This commit is contained in:
Daniel Marjamäki 2014-02-26 06:18:52 +01:00
parent 8550289722
commit 7dbfd67da3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkother.cpp
View File

@ -2166,8 +2166,8 @@ void CheckOther::checkIncompleteStatement()
else if (Token::simpleMatch(tok, "= {"))
tok = tok->next()->link();
// C++11 struct/array initialization in initializer list
else if (tok->str() == "{" && Token::Match(tok->tokAt(-2), ",|: %var%") && Token::Match(tok->link(), "} [,{]"))
// C++11 struct/array/etc initialization in initializer list
else if (Token::Match(tok->previous(), "%var% {") && !Token::findsimplematch(tok,";",tok->link()))
tok = tok->link();
// C++11 vector initialization / return { .. }

8
test/testincompletestatement.cpp
View File

@ -68,6 +68,7 @@ private:
TEST_CASE(returnstruct);
TEST_CASE(cast); // #3009 : (struct Foo *)123.a = 1;
TEST_CASE(increment); // #3251 : FP for increment
TEST_CASE(cpp11init); // #5493 : int i{1};
}
void test1() {
@ -220,6 +221,13 @@ private:
"}");
ASSERT_EQUALS("", errout.str());
}
void cpp11init() {
check("void f() {\n"
" int x{1};\n"
"}");
ASSERT_EQUALS("", errout.str());
}
};
REGISTER_TEST(TestIncompleteStatement)