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

Revert "Optimisation: small speedups in the Tokenizer::simplifyTokenList handling" 

This reverts commit 056037feed.
This commit is contained in:
Daniel Marjamäki 2010-09-24 22:18:51 +02:00
parent 056037feed
commit ff7a99ad37
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/tokenize.cpp
View File

@ -8174,28 +8174,14 @@ void Tokenizer::simplifyStructDecl()
void Tokenizer::simplifyCallingConvention()
{
std::set<std::string> str;
str.insert("__cdecl");
str.insert("__stdcall");
str.insert("__fastcall");
str.insert("__thiscall");
str.insert("__clrcall");
str.insert("__syscall");
str.insert("__pascal");
str.insert("__fortran");
str.insert("__far");
str.insert("__near");
str.insert("WINAPI");
str.insert("APIENTRY");
str.insert("CALLBACK");
while (_tokens && str.find(_tokens->str()) != str.end())
const char * pattern = "__cdecl|__stdcall|__fastcall|__thiscall|__clrcall|__syscall|__pascal|__fortran|__far|__near|WINAPI|APIENTRY|CALLBACK";
while (Token::Match(_tokens, pattern))
{
_tokens->deleteThis();
}
for (Token *tok = _tokens; tok; tok = tok->next())
{
while (tok->next() && str.find(tok->next()->str()) != str.end())
while (Token::Match(tok->next(), pattern))
{
tok->deleteNext();
}
@ -8450,21 +8436,18 @@ void Tokenizer::simplifyMicrosoftMFC()
{
for (Token *tok = _tokens; tok; tok = tok->next())
{
if (tok->str().compare(0,9,"DECLARE_") == 0)
if (Token::simpleMatch(tok->next(), "DECLARE_MESSAGE_MAP ( )"))
{
if (Token::simpleMatch(tok->next(), "DECLARE_MESSAGE_MAP ( )"))
{
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
}
else if (Token::Match(tok->next(), "DECLARE_DYNAMIC|DECLARE_DYNAMIC_CLASS|DECLARE_DYNCREATE ( %any% )"))
{
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
}
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
}
else if (Token::Match(tok->next(), "DECLARE_DYNAMIC|DECLARE_DYNAMIC_CLASS|DECLARE_DYNCREATE ( %any% )"))
{
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
}
}
}