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

Check for unused private functions now handles overloads - removed redundant and less powerful duplicate of CheckClass::isVirtualFunc. 

CheckClass::initializerList does now also check copy constructors
Started fix for #3682: use reportInconclusiveError
This commit is contained in:
PKEuS 2012-03-24 10:50:19 +01:00
parent 4076c46a33
commit 8c657872d1
1 changed files with 32 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/checkclass.cpp
View File

@ -509,35 +509,6 @@ void CheckClass::operatorEqVarError(const Token *tok, const std::string &classna
// ClassCheck: Unused private functions // ClassCheck: Unused private functions
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static bool checkBaseFunctionsRec(const Scope* scope, std::list<const Token*>& FuncList, bool& whole)
{
for (std::vector<Scope::BaseInfo>::const_iterator i = scope->derivedFrom.begin(); i != scope->derivedFrom.end(); ++i) {
if (!i->scope || !i->scope->classStart) {
whole = false; // We need to see the complete definition of the class
return false;
}
for (std::list<Function>::const_iterator func = i->scope->functionList.begin(); func != i->scope->functionList.end(); ++func) {
if (func->isVirtual) { // Only virtual functions can be overriden
// Remove function from FuncList. TODO: Handle overloads
bool found = false;
std::list<const Token*>::iterator it = FuncList.begin();
while (it != FuncList.end()) {
if (func->token->str() == (*it)->str()) {
FuncList.erase(it++);
found = true;
} else
++it;
}
if (found)
return false;
}
}
if (!checkBaseFunctionsRec(i->scope, FuncList, whole))
return false;
}
return true;
}
static bool checkFunctionUsage(const std::string& name, const Scope* scope) static bool checkFunctionUsage(const std::string& name, const Scope* scope)
{ {
if (!scope) if (!scope)
@ -602,11 +573,24 @@ void CheckClass::privateFunctions()
} }
// Bailout for overriden virtual functions of base classes // Bailout for overriden virtual functions of base classes
if (!scope->derivedFrom.empty()) if (!scope->derivedFrom.empty()) {
checkBaseFunctionsRec(&*scope, FuncList, whole); // All base classes seen?
for (unsigned int i = 0; i < scope->derivedFrom.size() && whole; ++i) {
if (!scope->derivedFrom[i].scope || !scope->derivedFrom[i].scope->classStart)
whole = false;
}
if (!whole) if (!whole)
continue; continue;
// Check virtual functions
for (std::list<const Token*>::iterator i = FuncList.begin(); i != FuncList.end();) {
if (isVirtualFunc(&*scope, *i))
FuncList.erase(i++);
else
++i;
}
}
while (!FuncList.empty()) { while (!FuncList.empty()) {
// Check that all private functions are used // Check that all private functions are used
bool used = checkFunctionUsage(FuncList.front()->str(), &*scope); // Usage in this class bool used = checkFunctionUsage(FuncList.front()->str(), &*scope); // Usage in this class
@ -1581,7 +1565,7 @@ void CheckClass::initializerList()
// iterate through all member functions looking for constructors // iterate through all member functions looking for constructors
for (func = info->functionList.begin(); func != info->functionList.end(); ++func) { for (func = info->functionList.begin(); func != info->functionList.end(); ++func) {
if (func->type == Function::eConstructor && func->hasBody) { if ((func->type == Function::eConstructor || func->type == Function::eCopyConstructor) && func->hasBody) {
// check for initializer list // check for initializer list
const Token *tok = func->arg->link()->next(); const Token *tok = func->arg->link()->next();
@ -1603,12 +1587,12 @@ void CheckClass::initializerList()
if (var) if (var)
vars.push_back(VarInfo(var, tok->tokAt(2))); vars.push_back(VarInfo(var, tok->tokAt(2)));
} }
} tok = tok->next()->link()->next();
} else
tok = tok->next(); tok = tok->next();
} }
// need at least 2 members to have out of order initialization // need at least 2 members to have out of order initialization
if (vars.size() > 1) {
for (unsigned int i = 1; i < vars.size(); i++) { for (unsigned int i = 1; i < vars.size(); i++) {
// check for out of order initialization // check for out of order initialization
if (vars[i].var->index() < vars[i - 1].var->index()) if (vars[i].var->index() < vars[i - 1].var->index())
@ -1618,7 +1602,6 @@ void CheckClass::initializerList()
} }
} }
} }
}
} }
void CheckClass::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname) void CheckClass::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname)
@ -1626,7 +1609,7 @@ void CheckClass::initializerListError(const Token *tok1, const Token *tok2, cons
std::list<const Token *> toks; std::list<const Token *> toks;
toks.push_back(tok1); toks.push_back(tok1);
toks.push_back(tok2); toks.push_back(tok2);
reportError(toks, Severity::style, "initializerList", reportInconclusiveError(toks, Severity::style, "initializerList",
"Member variable '" + classname + "::" + "Member variable '" + classname + "::" +
varname + "' is in the wrong order in the initializer list.\n" varname + "' is in the wrong order in the initializer list.\n"
"Members are initialized in the order they are declared, not the " "Members are initialized in the order they are declared, not the "