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

Adapt Tokenizer::simplifyCallingConvention() and Tokenizer::simplifyKeyword() for the match compiler 

This little change gives another 6% speed improvement on my box.
(tested with the testsuite and checking the 'rpm' codebase)

The profiler showed we were spending quite some time in
Tokenizer::simplifyCallingConvention(). The multi match
pattern in there is "complex", at least for the on-the-fly parser.
This commit is contained in:
Thomas Jarosch 2013-01-16 20:27:20 +01:00
parent 5773e69ab1
commit e22b1f7740
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/tokenize.cpp
View File

@ -8459,9 +8459,8 @@ void Tokenizer::simplifyStructDecl()
void Tokenizer::simplifyCallingConvention() void Tokenizer::simplifyCallingConvention()
{ {
static const char pattern[] = "__cdecl|__stdcall|__fastcall|__thiscall|__clrcall|__syscall|__pascal|__fortran|__far|__near|WINAPI|APIENTRY|CALLBACK";
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
while (Token::Match(tok, pattern)) { while (Token::Match(tok, "__cdecl|__stdcall|__fastcall|__thiscall|__clrcall|__syscall|__pascal|__fortran|__far|__near|WINAPI|APIENTRY|CALLBACK")) {
tok->deleteThis(); tok->deleteThis();
} }
} }
@ -8505,17 +8504,27 @@ void Tokenizer::simplifyAttribute()
// - Not in C++ standard yet // - Not in C++ standard yet
void Tokenizer::simplifyKeyword() void Tokenizer::simplifyKeyword()
{ {
std::string pattern = "volatile|inline|__inline|__forceinline|register|__restrict|__restrict__";
if (_settings->standards.c >= Standards::C99)
pattern += "|restrict";
if (_settings->standards.cpp >= Standards::CPP11)
pattern += "|constexpr|override|final";
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
while (Token::Match(tok, pattern.c_str())) { while (Token::Match(tok, "volatile|inline|__inline|__forceinline|register|__restrict|__restrict__")) {
tok->deleteThis(); tok->deleteThis();
} }
} }
if (_settings->standards.c >= Standards::C99) {
for (Token *tok = list.front(); tok; tok = tok->next()) {
while (Token::Match(tok, "restrict")) {
tok->deleteThis();
}
}
}
if (_settings->standards.cpp >= Standards::CPP11) {
for (Token *tok = list.front(); tok; tok = tok->next()) {
while (Token::Match(tok, "constexpr|override|final")) {
tok->deleteThis();
}
}
}
} }
void Tokenizer::simplifyAssignmentInFunctionCall() void Tokenizer::simplifyAssignmentInFunctionCall()