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

Refactoring, avoid 'magic' connection between vector items and variables

This commit is contained in:
Daniel Marjamäki 2021-02-01 17:13:58 +01:00
parent df305721c8
commit bd9e6212b2
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/checkclass.cpp
View File

@ -137,7 +137,9 @@ void CheckClass::constructors()
}
std::vector<Usage> usage(scope->varlist.size());
std::vector<Usage> usageList;
for (const Variable &var : scope->varlist)
usageList.push_back(Usage(&var));
for (const Function &func : scope->functionList) {
if (!func.hasBody() || !(func.isConstructor() || func.type == Function::eOperatorEqual))
@ -151,23 +153,22 @@ void CheckClass::constructors()
}
// Mark all variables not used
clearAllVar(usage);
clearAllVar(usageList);
std::list<const Function *> callstack;
initializeVarList(func, callstack, scope, usage);
initializeVarList(func, callstack, scope, usageList);
// Check if any variables are uninitialized
int count = -1;
for (const Variable &var : scope->varlist) {
++count;
for (Usage &usage : usageList) {
const Variable& var = *usage.var;
// check for C++11 initializer
if (var.hasDefault()) {
usage[count].init = true;
usage.init = true;
continue;
}
if (usage[count].assign || usage[count].init || var.isStatic())
if (usage.assign || usage.init || var.isStatic())
continue;
if (var.valueType() && var.valueType()->pointer == 0 && var.type() && var.type()->needInitialization == Type::NeedInitialization::False && var.type()->derivedFrom.empty())
@ -546,13 +547,11 @@ void CheckClass::assignVar(nonneg int varid, const Scope *scope, std::vector<Usa
}
}
void CheckClass::initVar(nonneg int varid, const Scope *scope, std::vector<Usage> &usage)
void CheckClass::initVar(std::vector<Usage> &usageList, nonneg int varid)
{
int count = 0;
for (std::list<Variable>::const_iterator var = scope->varlist.begin(); var != scope->varlist.end(); ++var, ++count) {
if (var->declarationId() == varid) {
usage[count].init = true;
for (Usage& usage: usageList) {
if (usage.var->declarationId() == varid) {
usage.init = true;
return;
}
}
@ -609,7 +608,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
if (initList) {
if (level == 0 && Token::Match(ftok, "%name% {|(") && Token::Match(ftok->linkAt(1), "}|) ,|{")) {
if (ftok->str() != func.name()) {
initVar(ftok->varId(), scope, usage);
initVar(usage, ftok->varId());
} else { // c++11 delegate constructor
const Function *member = ftok->function();
// member function not found => assume it initializes all members

18
lib/checkclass.h
View File

@ -272,7 +272,10 @@ private:
// constructors helper function
/** @brief Information about a member variable. Used when checking for uninitialized variables */
struct Usage {
Usage() : assign(false), init(false) { }
Usage(const Variable *var) : var(var), assign(false), init(false) { }
/** Variable that this usage is for */
const Variable *var;
/** @brief has this variable been assigned? */
bool assign;
@ -293,23 +296,22 @@ private:
/**
* @brief initialize a variable in the varlist
* @param usageList reference to usage vector
* @param varid id of variable to mark initialized
* @param scope pointer to variable Scope
* @param usage reference to usage vector
*/
static void initVar(nonneg int varid, const Scope *scope, std::vector<Usage> &usage);
static void initVar(std::vector<Usage> &usageList, nonneg int varid);
/**
* @brief set all variables in list assigned
* @param usage reference to usage vector
* @param usageList reference to usage vector
*/
static void assignAllVar(std::vector<Usage> &usage);
static void assignAllVar(std::vector<Usage> &usageList);
/**
* @brief set all variables in list not assigned and not initialized
* @param usage reference to usage vector
* @param usageList reference to usage vector
*/
static void clearAllVar(std::vector<Usage> &usage);
static void clearAllVar(std::vector<Usage> &usageList);
/**
* @brief parse a scope for a constructor or member function and set the "init" flags in the provided varlist