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

Tokenizer::simplifyTokenList: some improvements. 

Corrections for 2de4c516e9 commit:
- declare variable near their usage
- set right position of next token
This commit is contained in:
Slava Semushin 2009-06-01 02:59:38 +07:00
parent e5c0383594
commit dc6168b9d7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tokenize.cpp
View File

@ -1292,22 +1292,23 @@ void Tokenizer::simplifyTokenList()
continue; continue;
const int type_tok = ((tok->next()->str() == "*") ? 1 : 0); const int type_tok = ((tok->next()->str() == "*") ? 1 : 0);
const int varname_tok = type_tok + 1;
const int num_tok = varname_tok + 2;
int size = SizeOfType(tok->tokAt(type_tok)->str().c_str()); int size = SizeOfType(tok->tokAt(type_tok)->str().c_str());
if (size <= 0) if (size <= 0)
continue; continue;
const int varname_tok = type_tok + 1;
const unsigned int varid = tok->tokAt(varname_tok)->varId(); const unsigned int varid = tok->tokAt(varname_tok)->varId();
if (varid == 0) if (varid == 0)
continue; continue;
const int num_tok = varname_tok + 2;
int total_size = size * MathLib::toLongNumber(tok->strAt(num_tok)); int total_size = size * MathLib::toLongNumber(tok->strAt(num_tok));
// Replace 'sizeof(var)' with number // Replace 'sizeof(var)' with number
int indentlevel = 0; int indentlevel = 0;
for (Token *tok2 = tok->tokAt(5); tok2; tok2 = tok2->next()) const int next_tok = num_tok + 3;
for (Token *tok2 = tok->tokAt(next_tok); tok2; tok2 = tok2->next())
{ {
if (tok2->str() == "{") if (tok2->str() == "{")
{ {