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

Rename _function to mFunction

This commit is contained in:
Daniel Marjamäki 2018-06-16 20:26:43 +02:00
parent 78974e9267
commit 964841ba25
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/token.cpp
View File

@ -41,7 +41,7 @@ Token::Token(TokensFrontBack *tokensFrontBack) :
mPrevious(nullptr), mPrevious(nullptr),
_link(nullptr), _link(nullptr),
_scope(nullptr), _scope(nullptr),
_function(nullptr), // Initialize whole union mFunction(nullptr), // Initialize whole union
mVarId(0), mVarId(0),
mFileIndex(0), mFileIndex(0),
mLineNumber(0), mLineNumber(0),
@ -258,7 +258,7 @@ void Token::swapWithNext()
this->_link->_link = mNext; this->_link->_link = mNext;
std::swap(_link, mNext->_link); std::swap(_link, mNext->_link);
std::swap(_scope, mNext->_scope); std::swap(_scope, mNext->_scope);
std::swap(_function, mNext->_function); std::swap(mFunction, mNext->mFunction);
std::swap(_originalName, mNext->_originalName); std::swap(_originalName, mNext->_originalName);
std::swap(_values, mNext->_values); std::swap(_values, mNext->_values);
std::swap(_valuetype, mNext->_valuetype); std::swap(_valuetype, mNext->_valuetype);
@ -276,7 +276,7 @@ void Token::takeData(Token *fromToken)
mLineNumber = fromToken->mLineNumber; mLineNumber = fromToken->mLineNumber;
_link = fromToken->_link; _link = fromToken->_link;
_scope = fromToken->_scope; _scope = fromToken->_scope;
_function = fromToken->_function; mFunction = fromToken->mFunction;
if (fromToken->_originalName) { if (fromToken->_originalName) {
delete _originalName; delete _originalName;
_originalName = fromToken->_originalName; _originalName = fromToken->_originalName;

6
lib/token.h
View File

@ -676,7 +676,7 @@ public:
* @param f Function to be associated * @param f Function to be associated
*/ */
void function(const Function *f) { void function(const Function *f) {
_function = f; mFunction = f;
if (f) if (f)
tokType(eFunction); tokType(eFunction);
else if (mTokType == eFunction) else if (mTokType == eFunction)
@ -687,7 +687,7 @@ public:
* @return a pointer to the Function associated with this token. * @return a pointer to the Function associated with this token.
*/ */
const Function *function() const { const Function *function() const {
return mTokType == eFunction ? _function : nullptr; return mTokType == eFunction ? mFunction : nullptr;
} }
/** /**
@ -912,7 +912,7 @@ private:
// symbol database information // symbol database information
const Scope *_scope; const Scope *_scope;
union { union {
const Function *_function; const Function *mFunction;
const Variable *_variable; const Variable *_variable;
const ::Type* mType; const ::Type* mType;
const Enumerator *_enumerator; const Enumerator *_enumerator;