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

Merge pull request #698 from Dmitry-Me/betterVariableName6 

Reduce variable lifetime, better name
This commit is contained in:
amai2012 2015-10-16 10:26:19 +02:00
parent c22833342c fa30ed5d15
commit 399f8492d6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/tokenize.cpp
View File

@ -3156,9 +3156,6 @@ bool Tokenizer::simplifySizeof()
} }
else if (Token::simpleMatch(tok->next(), "( *") || Token::Match(tok->next(), "( %name% [")) { else if (Token::simpleMatch(tok->next(), "( *") || Token::Match(tok->next(), "( %name% [")) {
// Some default value..
std::size_t sz = 0;
unsigned int derefs = 0; unsigned int derefs = 0;
const Token* nametok = tok->tokAt(2); const Token* nametok = tok->tokAt(2);
@ -3181,14 +3178,17 @@ bool Tokenizer::simplifySizeof()
continue; continue;
} }
// Some default value
std::size_t size = 0;
const unsigned int varid = nametok->varId(); const unsigned int varid = nametok->varId();
if (derefs != 0 && varid != 0 && declTokOfVar.find(varid) != declTokOfVar.end()) { if (derefs != 0 && varid != 0 && declTokOfVar.find(varid) != declTokOfVar.end()) {
// Try to locate variable declaration.. // Try to locate variable declaration..
const Token *decltok = declTokOfVar[varid]; const Token *decltok = declTokOfVar[varid];
if (Token::Match(decltok->previous(), "%type%|* %name% [")) { if (Token::Match(decltok->previous(), "%type%|* %name% [")) {
sz = sizeOfType(decltok->previous()); size = sizeOfType(decltok->previous());
} else if (Token::Match(decltok->tokAt(-2), "%type% * %name%")) { } else if (Token::Match(decltok->tokAt(-2), "%type% * %name%")) {
sz = sizeOfType(decltok->tokAt(-2)); size = sizeOfType(decltok->tokAt(-2));
} }
// Multi-dimensional array.. // Multi-dimensional array..
if (Token::Match(decltok, "%name% [") && Token::simpleMatch(decltok->linkAt(1), "] [")) { if (Token::Match(decltok, "%name% [") && Token::simpleMatch(decltok->linkAt(1), "] [")) {
@ -3196,27 +3196,27 @@ bool Tokenizer::simplifySizeof()
for (unsigned int i = 0; i < derefs; i++) for (unsigned int i = 0; i < derefs; i++)
tok2 = tok2->linkAt(1); // Skip all dimensions that are derefenced before the sizeof call tok2 = tok2->linkAt(1); // Skip all dimensions that are derefenced before the sizeof call
while (Token::Match(tok2, "] [ %num% ]")) { while (Token::Match(tok2, "] [ %num% ]")) {
sz *= MathLib::toULongNumber(tok2->strAt(2)); size *= MathLib::toULongNumber(tok2->strAt(2));
tok2 = tok2->linkAt(1); tok2 = tok2->linkAt(1);
} }
if (Token::simpleMatch(tok2, "] [")) if (Token::simpleMatch(tok2, "] ["))
continue; continue;
} }
} else if (nametok->strAt(1) == "[" && nametok->isStandardType()) { } else if (nametok->strAt(1) == "[" && nametok->isStandardType()) {
sz = sizeOfType(nametok); size = sizeOfType(nametok);
if (sz == 0) if (size == 0)
continue; continue;
const Token *tok2 = nametok->next(); const Token *tok2 = nametok->next();
while (Token::Match(tok2, "[ %num% ]")) { while (Token::Match(tok2, "[ %num% ]")) {
sz *= MathLib::toULongNumber(tok2->strAt(1)); size *= MathLib::toULongNumber(tok2->strAt(1));
tok2 = tok2->link()->next(); tok2 = tok2->link()->next();
} }
if (!tok2 || tok2->str() != ")") if (!tok2 || tok2->str() != ")")
continue; continue;
} }
if (sz > 0) { if (size > 0) {
tok->str(MathLib::toString(sz)); tok->str(MathLib::toString(size));
Token::eraseTokens(tok, tok->next()->link()->next()); Token::eraseTokens(tok, tok->next()->link()->next());
ret = true; ret = true;
} }