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

some minor optimizations (#3057)

This commit is contained in:
Oliver Stöneberg 2021-01-28 22:18:17 +01:00 committed by GitHub
parent 0df10c3cb5
commit e8b8cfec78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/library.cpp
View File

@ -1414,7 +1414,7 @@ bool Library::isnoreturn(const Token *ftok) const
return true; return true;
if (isNotLibraryFunction(ftok)) if (isNotLibraryFunction(ftok))
return false; return false;
const std::map<std::string, FalseTrueMaybe>::const_iterator it = mNoReturn.find(getFunctionName(ftok)); const std::unordered_map<std::string, FalseTrueMaybe>::const_iterator it = mNoReturn.find(getFunctionName(ftok));
if (it == mNoReturn.end()) if (it == mNoReturn.end())
return false; return false;
if (it->second == FalseTrueMaybe::Maybe) if (it->second == FalseTrueMaybe::Maybe)
@ -1428,7 +1428,7 @@ bool Library::isnotnoreturn(const Token *ftok) const
return false; return false;
if (isNotLibraryFunction(ftok)) if (isNotLibraryFunction(ftok))
return false; return false;
const std::map<std::string, FalseTrueMaybe>::const_iterator it = mNoReturn.find(getFunctionName(ftok)); const std::unordered_map<std::string, FalseTrueMaybe>::const_iterator it = mNoReturn.find(getFunctionName(ftok));
if (it == mNoReturn.end()) if (it == mNoReturn.end())
return false; return false;
if (it->second == FalseTrueMaybe::Maybe) if (it->second == FalseTrueMaybe::Maybe)

2
lib/library.h
View File

@ -564,7 +564,7 @@ private:
std::map<std::string, AllocFunc> mAlloc; // allocation functions std::map<std::string, AllocFunc> mAlloc; // allocation functions
std::map<std::string, AllocFunc> mDealloc; // deallocation functions std::map<std::string, AllocFunc> mDealloc; // deallocation functions
std::map<std::string, AllocFunc> mRealloc; // reallocation functions std::map<std::string, AllocFunc> mRealloc; // reallocation functions
std::map<std::string, FalseTrueMaybe> mNoReturn; // is function noreturn? std::unordered_map<std::string, FalseTrueMaybe> mNoReturn; // is function noreturn?
std::map<std::string, std::string> mReturnValue; std::map<std::string, std::string> mReturnValue;
std::map<std::string, std::string> mReturnValueType; std::map<std::string, std::string> mReturnValueType;
std::map<std::string, int> mReturnValueContainer; std::map<std::string, int> mReturnValueContainer;

6
lib/tokenize.cpp
View File

@ -7381,7 +7381,7 @@ void Tokenizer::simplifyVariableMultipleAssign()
} }
// Binary operators simplification map // Binary operators simplification map
static const std::map<std::string, std::string> cAlternativeTokens = { static const std::unordered_map<std::string, std::string> cAlternativeTokens = {
std::make_pair("and", "&&") std::make_pair("and", "&&")
, std::make_pair("and_eq", "&=") , std::make_pair("and_eq", "&=")
, std::make_pair("bitand", "&") , std::make_pair("bitand", "&")
@ -7437,7 +7437,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
if (!tok->isName()) if (!tok->isName())
continue; continue;
const std::map<std::string, std::string>::const_iterator cOpIt = cAlternativeTokens.find(tok->str()); const std::unordered_map<std::string, std::string>::const_iterator cOpIt = cAlternativeTokens.find(tok->str());
if (cOpIt != cAlternativeTokens.end()) { if (cOpIt != cAlternativeTokens.end()) {
alt.push_back(tok); alt.push_back(tok);
@ -7474,7 +7474,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
return false; return false;
for (Token *tok: alt) { for (Token *tok: alt) {
const std::map<std::string, std::string>::const_iterator cOpIt = cAlternativeTokens.find(tok->str()); const std::unordered_map<std::string, std::string>::const_iterator cOpIt = cAlternativeTokens.find(tok->str());
if (cOpIt != cAlternativeTokens.end()) if (cOpIt != cAlternativeTokens.end())
tok->str(cOpIt->second); tok->str(cOpIt->second);
else if (tok->str() == "not") else if (tok->str() == "not")