From 964841ba253faa758a5beb1b141b91b0d72ab1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 16 Jun 2018 20:26:43 +0200 Subject: [PATCH] Rename _function to mFunction --- lib/token.cpp | 6 +++--- lib/token.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/token.cpp b/lib/token.cpp index dae05f7a4..6fa0026f8 100644 --- a/lib/token.cpp +++ b/lib/token.cpp @@ -41,7 +41,7 @@ Token::Token(TokensFrontBack *tokensFrontBack) : mPrevious(nullptr), _link(nullptr), _scope(nullptr), - _function(nullptr), // Initialize whole union + mFunction(nullptr), // Initialize whole union mVarId(0), mFileIndex(0), mLineNumber(0), @@ -258,7 +258,7 @@ void Token::swapWithNext() this->_link->_link = mNext; std::swap(_link, mNext->_link); std::swap(_scope, mNext->_scope); - std::swap(_function, mNext->_function); + std::swap(mFunction, mNext->mFunction); std::swap(_originalName, mNext->_originalName); std::swap(_values, mNext->_values); std::swap(_valuetype, mNext->_valuetype); @@ -276,7 +276,7 @@ void Token::takeData(Token *fromToken) mLineNumber = fromToken->mLineNumber; _link = fromToken->_link; _scope = fromToken->_scope; - _function = fromToken->_function; + mFunction = fromToken->mFunction; if (fromToken->_originalName) { delete _originalName; _originalName = fromToken->_originalName; diff --git a/lib/token.h b/lib/token.h index 398d7a1e2..e621aa36b 100644 --- a/lib/token.h +++ b/lib/token.h @@ -676,7 +676,7 @@ public: * @param f Function to be associated */ void function(const Function *f) { - _function = f; + mFunction = f; if (f) tokType(eFunction); else if (mTokType == eFunction) @@ -687,7 +687,7 @@ public: * @return a pointer to the Function associated with this token. */ const Function *function() const { - return mTokType == eFunction ? _function : nullptr; + return mTokType == eFunction ? mFunction : nullptr; } /** @@ -912,7 +912,7 @@ private: // symbol database information const Scope *_scope; union { - const Function *_function; + const Function *mFunction; const Variable *_variable; const ::Type* mType; const Enumerator *_enumerator;