Merge pull request #694 from Dmitry-Me/omitRepeatedSearch
Remove repeated search, clearer code
This commit is contained in:
commit
430e31ec1e
|
@ -3133,11 +3133,12 @@ bool Tokenizer::simplifySizeof()
|
||||||
|
|
||||||
// sizeof( a )
|
// sizeof( a )
|
||||||
else if (Token::Match(tok->next(), "( %var% )")) {
|
else if (Token::Match(tok->next(), "( %var% )")) {
|
||||||
if (sizeOfVar.find(tok->tokAt(2)->varId()) != sizeOfVar.end()) {
|
std::map<unsigned int, unsigned int>::const_iterator sizeOfVarPos = sizeOfVar.find(tok->tokAt(2)->varId());
|
||||||
|
if (sizeOfVarPos != sizeOfVar.end()) {
|
||||||
tok->deleteNext();
|
tok->deleteNext();
|
||||||
tok->deleteThis();
|
tok->deleteThis();
|
||||||
tok->deleteNext();
|
tok->deleteNext();
|
||||||
tok->str(MathLib::toString(sizeOfVar[tok->varId()]));
|
tok->str(MathLib::toString(sizeOfVarPos->second));
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue