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

Issue useInitializationList message only on variables of class types.

This commit is contained in:
PKEuS 2012-06-06 03:03:51 -07:00
parent 8a9d1048bf
commit 7c1b0a7602
2 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/checkclass.cpp
View File

@ -530,7 +530,8 @@ void CheckClass::initializationListUsage()
} }
if (!allowed) if (!allowed)
continue; continue;
suggestInitializationList(tok, tok->str()); if (!var->isPointer() && (var->type() || Token::Match(var->typeStartToken(), "std :: string|wstring") || Token::Match(var->typeStartToken(), "std :: %type% <") || symbolDatabase->isClassOrStruct(var->typeStartToken()->str())))
suggestInitializationList(tok, tok->str());
} }
} }
} }

50
test/testclass.cpp
View File

@ -5125,10 +5125,11 @@ private:
void initializerListUsage() { void initializerListUsage() {
checkInitializationListUsage("class Fred {\n" checkInitializationListUsage("class Fred {\n"
" int a;\n" " int a;\n" // No message for builtin types: No performance gain
" Fred() { a = 0; }\n" " int* b;\n" // No message for pointers: No performance gain
" Fred() { a = 0; b = 0; }\n"
"};"); "};");
ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'a' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str()); ASSERT_EQUALS("", errout.str());
checkInitializationListUsage("class Fred {\n" checkInitializationListUsage("class Fred {\n"
" std::string s;\n" " std::string s;\n"
@ -5137,31 +5138,56 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 's' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 's' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str());
checkInitializationListUsage("class Fred {\n" checkInitializationListUsage("class Fred {\n"
" int a;\n" " std::vector<int> v;\n"
" Fred() { v = unknown; }\n"
"};");
ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'v' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str());
checkInitializationListUsage("class C { std::string s; };\n"
"class Fred {\n"
" C c;\n"
" Fred() { c = unknown; }\n"
"};");
ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str());
checkInitializationListUsage("class C;\n"
"class Fred {\n"
" C c;\n"
" Fred() { c = unknown; }\n"
"};");
ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str());
checkInitializationListUsage("class C;\n"
"class Fred {\n"
" C a;\n"
" Fred() { initB(); a = b; }\n" " Fred() { initB(); a = b; }\n"
"};"); "};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkInitializationListUsage("class Fred {\n" checkInitializationListUsage("class C;\n"
" int a;\n" "class Fred {\n"
" C a;\n"
" Fred() : a(0) { if(b) a = 0; }\n" " Fred() : a(0) { if(b) a = 0; }\n"
"};"); "};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkInitializationListUsage("class Fred {\n" checkInitializationListUsage("class C;\n"
" int a[5];\n" "class Fred {\n"
" C a[5];\n"
" Fred() { for(int i = 0; i < 5; i++) a[i] = 0; }\n" " Fred() { for(int i = 0; i < 5; i++) a[i] = 0; }\n"
"};"); "};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkInitializationListUsage("class Fred {\n" checkInitializationListUsage("class C;\n"
" int a; int b;\n" "class Fred {\n"
" C a; int b;\n"
" Fred() : b(5) { a = b; }\n" // Don't issue a message here: You actually could move it to the initalization list, but it would cause problems if you change the order of the variable declarations. " Fred() : b(5) { a = b; }\n" // Don't issue a message here: You actually could move it to the initalization list, but it would cause problems if you change the order of the variable declarations.
"};"); "};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkInitializationListUsage("class Fred {\n" checkInitializationListUsage("class C;\n"
" int a;\n" "class Fred {\n"
" C a;\n"
" Fred() { try { a = new int; } catch(...) {} }\n" " Fred() { try { a = new int; } catch(...) {} }\n"
"};"); "};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());