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

Fixed bug in Token::deleteThis and optimized createLinks() calls.

This commit is contained in:
Reijo Tomperi 2009-08-28 23:31:11 +03:00
parent bf4ac5521d
commit 0f0d7e92ee
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/token.cpp
View File

@ -90,6 +90,9 @@ void Token::deleteThis()
_fileIndex = _next->_fileIndex;
_linenr = _next->_linenr;
_link = _next->_link;
if (_link)
_link->link(this);
deleteNext();
}
else if (_previous)

21
src/tokenize.cpp
View File

@ -2160,8 +2160,6 @@ bool Tokenizer::simplifyQuestionMark()
bool Tokenizer::simplifyCasts()
{
createLinks();
bool ret = false;
for (Token *tok = _tokens; tok; tok = tok->next())
{
@ -3237,6 +3235,8 @@ void Tokenizer::simplifyGoto()
// Insert the statements..
bool ret = false;
std::list<Token*> links;
for (const Token *tok2 = tok; tok2; tok2 = tok2->next())
{
if (tok2->str() == "}")
@ -3245,7 +3245,24 @@ void Tokenizer::simplifyGoto()
ret = true;
token->insertToken(tok2->str().c_str());
token = token->next();
if (token->str() == "(")
{
links.push_back(token);
}
else if (token->str() == ")")
{
if (links.size() == 0)
{
// This should never happen at this point
syntaxError(token, ')');
return;
}
Token::createMutualLinks(links.back(), token);
links.pop_back();
}
}
if (!ret)
{
token->insertToken("return");