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

Extract and reuse size computation

This commit is contained in:
Dmitry-Me 2017-10-19 00:20:04 +03:00
parent 8709490903
commit 34a8d2431f
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/valueflow.cpp
View File

@ -638,6 +638,20 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value, const Setti
}
}
unsigned int getSizeOfType(const Token *typeTok, const Settings *settings)
{
const std::string &typeStr = typeTok->str();
if (typeStr == "char")
return 1;
else if (typeStr == "short)
return settings->sizeof_short;
else if (typeStr == "int")
return settings->sizeof_int;
else if (typeStr == "long")
return typeTok->isLong() ? settings->sizeof_long_long : settings->sizeof_long;
else
return 0;
}
// Handle various constants..
static Token * valueFlowSetConstantValue(const Token *tok, const Settings *settings, bool cpp)
@ -666,11 +680,7 @@ static Token * valueFlowSetConstantValue(const Token *tok, const Settings *setti
long long size = settings->sizeof_int;
const Token * type = tok2->enumerator()->scope->enumType;
if (type) {
size = type->str() == "char" ? 1 :
type->str() == "short" ? settings->sizeof_short :
type->str() == "int" ? settings->sizeof_int :
(type->str() == "long" && type->isLong()) ? settings->sizeof_long_long :
type->str() == "long" ? settings->sizeof_long : 0;
size = getSizeOfType(type, settings);
}
ValueFlow::Value value(size);
if (settings->platformType != cppcheck::Platform::Unspecified)
@ -682,11 +692,7 @@ static Token * valueFlowSetConstantValue(const Token *tok, const Settings *setti
if (tok2->type()->classScope) {
const Token * type = tok2->type()->classScope->enumType;
if (type) {
size = type->str() == "char" ? 1 :
type->str() == "short" ? settings->sizeof_short :
type->str() == "int" ? settings->sizeof_int :
(type->str() == "long" && type->isLong()) ? settings->sizeof_long_long :
type->str() == "long" ? settings->sizeof_long : 0;
size = getSizeOfType(type, settings);
}
}
ValueFlow::Value value(size);