noisymime
/
cppcheck
mirror of https://github.com/noisymime/cppcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #616 (Tokenizer: simplifyTemplates() should link() all inserted brackets) 

This also fixed #619.

http://sourceforge.net/apps/trac/cppcheck/ticket/616
http://sourceforge.net/apps/trac/cppcheck/ticket/619
This commit is contained in:
Slava Semushin 2009-08-27 23:33:42 +07:00
parent 9e32a0a595
commit dd64637ff1
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tokenize.cpp
View File

@ -34,6 +34,7 @@
#include <list> #include <list>
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <stack>
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -654,6 +655,9 @@ void Tokenizer::simplifyTemplates()
continue; continue;
int indentlevel = 0; int indentlevel = 0;
std::stack<Token *> braces; // holds "{" tokens
std::stack<Token *> brackets; // holds "(" tokens
for (; tok3; tok3 = tok3->next()) for (; tok3; tok3 = tok3->next())
{ {
if (tok3->str() == "{") if (tok3->str() == "{")
@ -668,6 +672,8 @@ void Tokenizer::simplifyTemplates()
// if indentlevel ever becomes 0, cppcheck will write: // if indentlevel ever becomes 0, cppcheck will write:
// ### Error: Invalid number of character { // ### Error: Invalid number of character {
addtoken("}", tok3->linenr(), tok3->fileIndex()); addtoken("}", tok3->linenr(), tok3->fileIndex());
Token::createMutualLinks(braces.top(), _tokensBack);
braces.pop();
break; break;
} }
--indentlevel; --indentlevel;
@ -689,7 +695,29 @@ void Tokenizer::simplifyTemplates()
// copy // copy
else else
{
addtoken(tok3->str().c_str(), tok3->linenr(), tok3->fileIndex()); addtoken(tok3->str().c_str(), tok3->linenr(), tok3->fileIndex());
// link() newly tokens manually
if (tok3->str() == "{")
{
braces.push(_tokensBack);
}
else if (tok3->str() == "}")
{
Token::createMutualLinks(braces.top(), _tokensBack);
braces.pop();
}
else if (tok3->str() == "(")
{
brackets.push(_tokensBack);
}
else if (tok3->str() == ")")
{
Token::createMutualLinks(brackets.top(), _tokensBack);
brackets.pop();
}
}
} }
} }
} }