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

Rename members

This commit is contained in:
Daniel Marjamäki 2018-06-16 21:52:29 +02:00
parent 237314fb51
commit 5e43366126
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/tokenize.cpp
View File

@ -10362,46 +10362,46 @@ void Tokenizer::simplifyNamespaceAliases()
} }
Tokenizer::VariableMap::VariableMap() : varId(0) {} Tokenizer::VariableMap::VariableMap() : mVarId(0) {}
void Tokenizer::VariableMap::enterScope() void Tokenizer::VariableMap::enterScope()
{ {
scopeInfo.push(std::list<std::pair<std::string, unsigned int>>()); mScopeInfo.push(std::list<std::pair<std::string, unsigned int>>());
} }
bool Tokenizer::VariableMap::leaveScope() bool Tokenizer::VariableMap::leaveScope()
{ {
if (scopeInfo.empty()) if (mScopeInfo.empty())
return false; return false;
for (const std::pair<std::string, unsigned int> &outerVariable : scopeInfo.top()) { for (const std::pair<std::string, unsigned int> &outerVariable : mScopeInfo.top()) {
if (outerVariable.second != 0) if (outerVariable.second != 0)
variableId[outerVariable.first] = outerVariable.second; mVariableId[outerVariable.first] = outerVariable.second;
else else
variableId.erase(outerVariable.first); mVariableId.erase(outerVariable.first);
} }
scopeInfo.pop(); mScopeInfo.pop();
return true; return true;
} }
void Tokenizer::VariableMap::addVariable(const std::string &varname) void Tokenizer::VariableMap::addVariable(const std::string &varname)
{ {
if (scopeInfo.empty()) { if (mScopeInfo.empty()) {
variableId[varname] = ++varId; mVariableId[varname] = ++mVarId;
return; return;
} }
std::map<std::string, unsigned int>::iterator it = variableId.find(varname); std::map<std::string, unsigned int>::iterator it = mVariableId.find(varname);
if (it == variableId.end()) { if (it == mVariableId.end()) {
scopeInfo.top().push_back(std::pair<std::string, unsigned int>(varname, 0)); mScopeInfo.top().push_back(std::pair<std::string, unsigned int>(varname, 0));
variableId[varname] = ++varId; mVariableId[varname] = ++mVarId;
return; return;
} }
scopeInfo.top().push_back(std::pair<std::string, unsigned int>(varname, it->second)); mScopeInfo.top().push_back(std::pair<std::string, unsigned int>(varname, it->second));
it->second = ++varId; it->second = ++mVarId;
} }
bool Tokenizer::VariableMap::hasVariable(const std::string &varname) const bool Tokenizer::VariableMap::hasVariable(const std::string &varname) const
{ {
return variableId.find(varname) != variableId.end(); return mVariableId.find(varname) != mVariableId.end();
} }

14
lib/tokenize.h
View File

@ -54,9 +54,9 @@ class CPPCHECKLIB Tokenizer {
/** Class used in Tokenizer::setVarIdPass1 */ /** Class used in Tokenizer::setVarIdPass1 */
class VariableMap { class VariableMap {
private: private:
std::map<std::string, unsigned int> variableId; std::map<std::string, unsigned int> mVariableId;
std::stack<std::list<std::pair<std::string, unsigned int> > > scopeInfo; std::stack<std::list<std::pair<std::string, unsigned int> > > mScopeInfo;
mutable unsigned int varId; mutable unsigned int mVarId;
public: public:
VariableMap(); VariableMap();
void enterScope(); void enterScope();
@ -64,16 +64,16 @@ class CPPCHECKLIB Tokenizer {
void addVariable(const std::string &varname); void addVariable(const std::string &varname);
bool hasVariable(const std::string &varname) const; bool hasVariable(const std::string &varname) const;
std::map<std::string, unsigned int>::const_iterator find(const std::string &varname) const { std::map<std::string, unsigned int>::const_iterator find(const std::string &varname) const {
return variableId.find(varname); return mVariableId.find(varname);
} }
std::map<std::string, unsigned int>::const_iterator end() const { std::map<std::string, unsigned int>::const_iterator end() const {
return variableId.end(); return mVariableId.end();
} }
const std::map<std::string, unsigned int> &map() const { const std::map<std::string, unsigned int> &map() const {
return variableId; return mVariableId;
} }
unsigned int *getVarId() const { unsigned int *getVarId() const {
return &varId; return &mVarId;
} }
}; };