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

Refactorization: Improve performance of simplifyTypedef by adding a pre-check for Token::link() by ~25%

This commit is contained in:
PKEuS 2015-12-02 22:40:49 +01:00
parent 5e441e471d
commit 7ea9e3ca4f
1 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
lib/tokenize.cpp
View File

@ -1050,27 +1050,78 @@ void Tokenizer::simplifyTypedef()
if (_settings->terminated()) if (_settings->terminated())
return; return;
// check for end of scope if (tok2->link()) { // Pre-check for performance
if (tok2->str() == "}") { // check for end of scope
// check for end of member function if (tok2->str() == "}") {
if (inMemberFunc) { // check for end of member function
--memberScope; if (inMemberFunc) {
if (memberScope == 0) --memberScope;
inMemberFunc = false; if (memberScope == 0)
inMemberFunc = false;
}
if (classLevel > 0 && tok2 == spaceInfo[classLevel - 1].classEnd) {
--classLevel;
pattern.clear();
for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
pattern += (spaceInfo[i].className + " :: ");
pattern += typeName->str();
} else {
--scope;
if (scope < 0)
break;
}
} }
if (classLevel > 0 && tok2 == spaceInfo[classLevel - 1].classEnd) { // check for member functions
--classLevel; else if (isCPP() && Token::Match(tok2, ") const| {")) {
pattern.clear(); const Token *func = tok2->link()->previous();
if (!func)
continue;
for (std::size_t i = classLevel; i < spaceInfo.size(); ++i) if (func->previous()) { // Ticket #4239
pattern += (spaceInfo[i].className + " :: "); /** @todo add support for multi-token operators */
if (func->previous()->str() == "operator")
func = func->previous();
pattern += typeName->str(); if (!func->previous()) // #7020
} else { syntaxError(func);
--scope; // check for qualifier
if (scope < 0) if (func->previous()->str() == "::") {
break; // check for available and matching class name
if (!spaceInfo.empty() && classLevel < spaceInfo.size() &&
func->strAt(-2) == spaceInfo[classLevel].className) {
memberScope = 0;
inMemberFunc = true;
}
}
}
}
// check for entering a new scope
else if (tok2->str() == "{") {
// check for entering a new namespace
if (isCPP() && tok2->strAt(-2) == "namespace") {
if (classLevel < spaceInfo.size() &&
spaceInfo[classLevel].isNamespace &&
spaceInfo[classLevel].className == tok2->previous()->str()) {
++classLevel;
pattern.clear();
for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
pattern += (spaceInfo[i].className + " :: ");
pattern += typeName->str();
}
++scope;
}
// keep track of scopes within member function
if (inMemberFunc)
++memberScope;
++scope;
} }
} }
@ -1094,55 +1145,6 @@ void Tokenizer::simplifyTypedef()
} }
} }
// check for member functions
else if (isCPP() && Token::Match(tok2, ") const| {")) {
const Token *func = tok2->link()->previous();
if (!func)
continue;
if (func->previous()) { // Ticket #4239
/** @todo add support for multi-token operators */
if (func->previous()->str() == "operator")
func = func->previous();
if (!func->previous()) // #7020
syntaxError(func);
// check for qualifier
if (func->previous()->str() == "::") {
// check for available and matching class name
if (!spaceInfo.empty() && classLevel < spaceInfo.size() &&
func->strAt(-2) == spaceInfo[classLevel].className) {
memberScope = 0;
inMemberFunc = true;
}
}
}
}
// check for entering a new namespace
else if (isCPP() && Token::Match(tok2, "namespace %any% {")) {
if (classLevel < spaceInfo.size() &&
spaceInfo[classLevel].isNamespace &&
spaceInfo[classLevel].className == tok2->next()->str()) {
++classLevel;
pattern.clear();
for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
pattern += (spaceInfo[i].className + " :: ");
pattern += typeName->str();
}
++scope;
}
// check for entering a new scope
else if (tok2->str() == "{") {
// keep track of scopes within member function
if (inMemberFunc)
++memberScope;
++scope;
}
// check for typedef that can be substituted // check for typedef that can be substituted
else if (Token::Match(tok2, pattern.c_str()) || else if (Token::Match(tok2, pattern.c_str()) ||
(inMemberFunc && tok2->str() == typeName->str())) { (inMemberFunc && tok2->str() == typeName->str())) {