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

Tokenizer: Fixed bug. When varid is 0 then %varid% doesn't work. Ticket: #2723

This commit is contained in:
Daniel Marjamäki 2011-04-16 17:45:14 +02:00
parent 877a233145
commit 05f59a1567
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tokenize.cpp
View File

@ -6234,9 +6234,10 @@ void Tokenizer::simplifyIfNotNull()
{ {
if (Token::Match(tok->tokAt(-2), "[;{}] %var%")) if (Token::Match(tok->tokAt(-2), "[;{}] %var%"))
{ {
const unsigned int varid = tok->previous()->varId(); const std::string varname(tok->previous()->str());
if (Token::Match(tok, "= ( %varid% != 0 ) ;", varid) ||
Token::Match(tok, "= ( 0 != %varid% ) ;", varid)) if (Token::Match(tok->tokAt(2), (varname + " != 0 ) ;").c_str()) ||
Token::Match(tok->tokAt(2), ("0 != " + varname + " ) ;").c_str()))
{ {
tok = tok->tokAt(-2); tok = tok->tokAt(-2);
Token::eraseTokens(tok, tok->tokAt(9)); Token::eraseTokens(tok, tok->tokAt(9));