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

Renamed _typeSize to mTypeSize

This commit is contained in:
Daniel Marjamäki 2018-06-16 21:56:05 +02:00
parent 5e43366126
commit 598a984071
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/tokenize.cpp
View File

@ -188,8 +188,8 @@ unsigned int Tokenizer::sizeOfType(const Token *type) const
if (type->tokType() == Token::eString) if (type->tokType() == Token::eString)
return Token::getStrLength(type) + 1U; return Token::getStrLength(type) + 1U;
const std::map<std::string, unsigned int>::const_iterator it = _typeSize.find(type->str()); const std::map<std::string, unsigned int>::const_iterator it = mTypeSize.find(type->str());
if (it == _typeSize.end()) { if (it == mTypeSize.end()) {
const Library::PodType* podtype = mSettings->library.podtype(type->str()); const Library::PodType* podtype = mSettings->library.podtype(type->str());
if (!podtype) if (!podtype)
return 0; return 0;
@ -1733,7 +1733,7 @@ void Tokenizer::createTokens(const simplecpp::TokenList *tokenList)
bool Tokenizer::simplifyTokens1(const std::string &configuration) bool Tokenizer::simplifyTokens1(const std::string &configuration)
{ {
// Fill the map _typeSize.. // Fill the map mTypeSize..
fillTypeSizes(); fillTypeSizes();
_configuration = configuration; _configuration = configuration;
@ -1798,18 +1798,18 @@ void Tokenizer::checkForEnumsWithTypedef()
void Tokenizer::fillTypeSizes() void Tokenizer::fillTypeSizes()
{ {
_typeSize.clear(); mTypeSize.clear();
_typeSize["char"] = 1; mTypeSize["char"] = 1;
_typeSize["_Bool"] = mSettings->sizeof_bool; mTypeSize["_Bool"] = mSettings->sizeof_bool;
_typeSize["bool"] = mSettings->sizeof_bool; mTypeSize["bool"] = mSettings->sizeof_bool;
_typeSize["short"] = mSettings->sizeof_short; mTypeSize["short"] = mSettings->sizeof_short;
_typeSize["int"] = mSettings->sizeof_int; mTypeSize["int"] = mSettings->sizeof_int;
_typeSize["long"] = mSettings->sizeof_long; mTypeSize["long"] = mSettings->sizeof_long;
_typeSize["float"] = mSettings->sizeof_float; mTypeSize["float"] = mSettings->sizeof_float;
_typeSize["double"] = mSettings->sizeof_double; mTypeSize["double"] = mSettings->sizeof_double;
_typeSize["wchar_t"] = mSettings->sizeof_wchar_t; mTypeSize["wchar_t"] = mSettings->sizeof_wchar_t;
_typeSize["size_t"] = mSettings->sizeof_size_t; mTypeSize["size_t"] = mSettings->sizeof_size_t;
_typeSize["*"] = mSettings->sizeof_pointer; mTypeSize["*"] = mSettings->sizeof_pointer;
} }
void Tokenizer::combineOperators() void Tokenizer::combineOperators()
@ -5183,7 +5183,7 @@ void Tokenizer::simplifyCasts()
// #4164 : ((unsigned char)1) => (1) // #4164 : ((unsigned char)1) => (1)
if (Token::Match(tok->next(), "( %type% ) %num%") && tok->next()->link()->previous()->isStandardType()) { if (Token::Match(tok->next(), "( %type% ) %num%") && tok->next()->link()->previous()->isStandardType()) {
const MathLib::bigint value = MathLib::toLongNumber(tok->next()->link()->next()->str()); const MathLib::bigint value = MathLib::toLongNumber(tok->next()->link()->next()->str());
unsigned int bits = mSettings->char_bit * _typeSize[tok->next()->link()->previous()->str()]; unsigned int bits = mSettings->char_bit * mTypeSize[tok->next()->link()->previous()->str()];
if (!tok->tokAt(2)->isUnsigned() && bits > 0) if (!tok->tokAt(2)->isUnsigned() && bits > 0)
bits--; bits--;
if (bits < 31 && value >= 0 && value < (1LL << bits)) { if (bits < 31 && value >= 0 && value < (1LL << bits)) {

2
lib/tokenize.h
View File

@ -879,7 +879,7 @@ private:
std::string _configuration; std::string _configuration;
/** sizeof information for known types */ /** sizeof information for known types */
std::map<std::string, unsigned int> _typeSize; std::map<std::string, unsigned int> mTypeSize;
/** variable count */ /** variable count */
unsigned int mVarId; unsigned int mVarId;