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

Refactorization: Store sizes as int, not as string in Tokenizer::simplifySizeof().

This commit is contained in:
PKEuS 2014-03-30 11:21:40 +02:00
parent 345a80f4d5
commit aa527cb408
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tokenize.cpp
View File

@ -2777,7 +2777,7 @@ void Tokenizer::sizeofAddParentheses()
bool Tokenizer::simplifySizeof() bool Tokenizer::simplifySizeof()
{ {
// Locate variable declarations and calculate the size // Locate variable declarations and calculate the size
std::map<unsigned int, std::string> sizeOfVar; std::map<unsigned int, unsigned int> sizeOfVar;
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
if (tok->varId() != 0 && sizeOfVar.find(tok->varId()) == sizeOfVar.end()) { if (tok->varId() != 0 && sizeOfVar.find(tok->varId()) == sizeOfVar.end()) {
const unsigned int varId = tok->varId(); const unsigned int varId = tok->varId();
@ -2790,7 +2790,7 @@ bool Tokenizer::simplifySizeof()
continue; continue;
} }
sizeOfVar[varId] = MathLib::toString(size); sizeOfVar[varId] = size;
} }
else if (Token::Match(tok->previous(), "%type% %var% [ %num% ] [;=]") || else if (Token::Match(tok->previous(), "%type% %var% [ %num% ] [;=]") ||
@ -2799,14 +2799,14 @@ bool Tokenizer::simplifySizeof()
if (size == 0) if (size == 0)
continue; continue;
sizeOfVar[varId] = MathLib::toString(size * static_cast<unsigned long>(MathLib::toLongNumber(tok->strAt(2)))); sizeOfVar[varId] = size * static_cast<unsigned long>(MathLib::toLongNumber(tok->strAt(2)));
} }
else if (Token::Match(tok->previous(), "%type% %var% [ %num% ] [,)]") || else if (Token::Match(tok->previous(), "%type% %var% [ %num% ] [,)]") ||
Token::Match(tok->tokAt(-2), "%type% * %var% [ %num% ] [,)]")) { Token::Match(tok->tokAt(-2), "%type% * %var% [ %num% ] [,)]")) {
Token tempTok(0); Token tempTok(0);
tempTok.str("*"); tempTok.str("*");
sizeOfVar[varId] = MathLib::toString(sizeOfType(&tempTok)); sizeOfVar[varId] = sizeOfType(&tempTok);
} }
} }
} }
@ -2956,7 +2956,7 @@ bool Tokenizer::simplifySizeof()
tok->deleteNext(); tok->deleteNext();
tok->deleteThis(); tok->deleteThis();
tok->deleteNext(); tok->deleteNext();
tok->str(sizeOfVar[tok->varId()]); tok->str(MathLib::toString(sizeOfVar[tok->varId()]));
ret = true; ret = true;
} else { } else {
// don't try to replace size of variable if variable has // don't try to replace size of variable if variable has