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

Fixed #4187 (False positive: Variable inside a lambda is reported as uninitialized)

This commit is contained in:
Daniel Marjamäki 2012-11-30 10:30:26 +01:00
parent 031adef6ea
commit 672831f41a
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -4906,6 +4906,10 @@ void Tokenizer::simplifyVarDecl(bool only_k_r_fpar)
continue; continue;
} else if (tok->str() == "(") { } else if (tok->str() == "(") {
tok = tok->link(); tok = tok->link();
// TestTokenizer::vardecl24 - lambda functions..
if (isCPP() && tok->previous()->str() == "}")
tok = tok->previous()->link();
} }
if (tok->previous() && !Token::Match(tok->previous(), "{|}|;|)|public:|protected:|private:")) if (tok->previous() && !Token::Match(tok->previous(), "{|}|;|)|public:|protected:|private:"))

19
test/testtokenize.cpp
View File

@ -338,6 +338,7 @@ private:
TEST_CASE(vardecl21); // #4042 - a::b const *p = 0; TEST_CASE(vardecl21); // #4042 - a::b const *p = 0;
TEST_CASE(vardecl22); // #4211 - segmentation fault TEST_CASE(vardecl22); // #4211 - segmentation fault
TEST_CASE(vardecl23); // #4276 - segmentation fault TEST_CASE(vardecl23); // #4276 - segmentation fault
TEST_CASE(vardecl24); // #4187 - variable declaration within lambda function
TEST_CASE(vardecl_stl_1); TEST_CASE(vardecl_stl_1);
TEST_CASE(vardecl_stl_2); TEST_CASE(vardecl_stl_2);
TEST_CASE(vardecl_template_1); TEST_CASE(vardecl_template_1);
@ -5362,6 +5363,24 @@ private:
tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }"); tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }");
} }
void vardecl24() { // #4187 - variable declaration within lambda function
const char code[] = "void f() {\n"
" std::for_each(ints.begin(), ints.end(), [](int val)\n"
" {\n"
" int temp = 0;\n"
" });\n"
"}";
const char expected[] = "void f ( ) {\n"
"std :: for_each ( ints . begin ( ) , ints . end ( ) , [ ] ( int val )\n"
"{\n"
"int temp ; temp = 0 ;\n"
"} ) ;\n"
"}";
ASSERT_EQUALS(expected, tokenizeAndStringify(code));
}
void volatile_variables() { void volatile_variables() {
const char code[] = "volatile int a=0;\n" const char code[] = "volatile int a=0;\n"
"volatile int b=0;\n" "volatile int b=0;\n"