From 78974e9267a97d176c7f05c68619656158ee8bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 16 Jun 2018 20:25:54 +0200 Subject: [PATCH] Rename _type to mType --- lib/checkunusedvar.cpp | 56 +++++++++++++++++++++--------------------- lib/library.cpp | 2 +- lib/library.h | 4 +-- lib/symboldatabase.cpp | 10 ++++---- lib/symboldatabase.h | 10 ++++---- lib/token.cpp | 4 +-- lib/token.h | 4 +-- lib/tokenize.cpp | 8 +++--- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp index b605a0485..5544b4e21 100644 --- a/lib/checkunusedvar.cpp +++ b/lib/checkunusedvar.cpp @@ -64,7 +64,7 @@ public: bool allocateMemory = false) : _var(var), _lastAccess(var ? var->nameToken() : nullptr), - _type(type), + mType(type), _read(read), _write(write), _modified(modified), @@ -88,7 +88,7 @@ public: const Variable* _var; const Token* _lastAccess; - VariableType _type; + VariableType mType; bool _read; bool _write; bool _modified; // read/modify/write @@ -200,7 +200,7 @@ void Variables::alias(unsigned int varid1, unsigned int varid2, bool replace) var2->_aliases.insert(varid1); var1->_aliases.insert(varid2); - if (var2->_type == Variables::pointer) { + if (var2->mType == Variables::pointer) { _varReadInScope.back().insert(varid2); var2->_read = true; } @@ -524,17 +524,17 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de const Variables::VariableUsage* var2 = variables.find(varid2); if (var2) { // local variable (alias or read it) - if (var1->_type == Variables::pointer || var1->_type == Variables::pointerArray) { + if (var1->mType == Variables::pointer || var1->mType == Variables::pointerArray) { if (dereference) variables.read(varid2, tok); else { if (addressOf || - var2->_type == Variables::array || - var2->_type == Variables::pointer) { + var2->mType == Variables::array || + var2->mType == Variables::pointer) { bool replace = true; // pointerArray => don't replace - if (var1->_type == Variables::pointerArray) + if (var1->mType == Variables::pointerArray) replace = false; // check if variable declared in same scope @@ -569,7 +569,7 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de variables.alias(varid1, varid2, replace); } else if (tok->strAt(1) == "?") { - if (var2->_type == Variables::reference) + if (var2->mType == Variables::reference) variables.readAliases(varid2, tok); else variables.read(varid2, tok); @@ -577,16 +577,16 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de variables.readAll(varid2, tok); } } - } else if (var1->_type == Variables::reference) { + } else if (var1->mType == Variables::reference) { variables.alias(varid1, varid2, true); } else { - if ((var2->_type == Variables::pointer || var2->_type == Variables::pointerArray) && tok->strAt(1) == "[") + if ((var2->mType == Variables::pointer || var2->mType == Variables::pointerArray) && tok->strAt(1) == "[") variables.readAliases(varid2, tok); variables.read(varid2, tok); } } else { // not a local variable (or an unsupported local variable) - if (var1->_type == Variables::pointer && !dereference) { + if (var1->mType == Variables::pointer && !dereference) { // check if variable declaration is in this scope if (var1->_var->scope() == scope) { // If variable is used in RHS then "use" variable @@ -629,8 +629,8 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de const Variables::VariableUsage *var2 = variables.find(varid2); // struct member aliased to local variable - if (var2 && (var2->_type == Variables::array || - var2->_type == Variables::pointer)) { + if (var2 && (var2->mType == Variables::array || + var2->mType == Variables::pointer)) { // erase aliased variable and all variables that alias it // to prevent false positives variables.eraseAll(varid2); @@ -642,8 +642,8 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de else if (Token::Match(tok, "%name% = %name% ;")) { const unsigned int varid2 = tok->tokAt(2)->varId(); const Variables::VariableUsage *var2 = variables.find(varid2); - if (var2 && (var2->_type == Variables::array || - var2->_type == Variables::pointer)) { + if (var2 && (var2->mType == Variables::array || + var2->mType == Variables::pointer)) { variables.use(varid2,tok); } } @@ -999,7 +999,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const if (dereference) { Variables::VariableUsage *var = variables.find(varid1); - if (var && var->_type == Variables::array) + if (var && var->mType == Variables::array) variables.write(varid1, tok); variables.writeAliases(varid1, tok); variables.read(varid1, tok); @@ -1007,12 +1007,12 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const Variables::VariableUsage *var = variables.find(varid1); if (var && (inwhile || start->strAt(-1) == ",")) { variables.use(varid1, tok); - } else if (var && var->_type == Variables::reference) { + } else if (var && var->mType == Variables::reference) { variables.writeAliases(varid1, tok); variables.read(varid1, tok); } // Consider allocating memory separately because allocating/freeing alone does not constitute using the variable - else if (var && var->_type == Variables::pointer && + else if (var && var->mType == Variables::pointer && Token::Match(start, "%name% = new|malloc|calloc|kmalloc|kzalloc|kcalloc|strdup|strndup|vmalloc|g_new0|g_try_new|g_new|g_malloc|g_malloc0|g_try_malloc|g_try_malloc0|g_strdup|g_strndup|g_strdup_printf")) { bool allocate = true; @@ -1040,7 +1040,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const variables.read(varid1, tok); variables.write(varid1, start); } else if (var && - var->_type == Variables::pointer && + var->mType == Variables::pointer && Token::Match(tok, "%name% ;") && tok->varId() == 0 && tok->hasKnownIntValue() && @@ -1053,13 +1053,13 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const Variables::VariableUsage *var2 = variables.find(tok->varId()); if (var2) { - if (var2->_type == Variables::reference) { + if (var2->mType == Variables::reference) { variables.writeAliases(tok->varId(), tok); variables.read(tok->varId(), tok); } else if (tok->varId() != varid1 && Token::Match(tok, "%name% .|[")) variables.read(tok->varId(), tok); else if (tok->varId() != varid1 && - var2->_type == Variables::standard && + var2->mType == Variables::standard && tok->strAt(-1) != "&") variables.use(tok->varId(), tok); } @@ -1071,7 +1071,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const const unsigned int varId = tok->varId(); Variables::VariableUsage *var = variables.find(varId); - if (var && var->_type != Variables::reference) { + if (var && var->mType != Variables::reference) { variables.read(varId,tok); } @@ -1099,13 +1099,13 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const if (var) { // Consider allocating memory separately because allocating/freeing alone does not constitute using the variable - if (var->_type == Variables::pointer && + if (var->mType == Variables::pointer && Token::Match(skipBrackets(tok->next()), "= new|malloc|calloc|kmalloc|kzalloc|kcalloc|strdup|strndup|vmalloc|g_new0|g_try_new|g_new|g_malloc|g_malloc0|g_try_malloc|g_try_malloc0|g_strdup|g_strndup|g_strdup_printf")) { variables.allocateMemory(varid, tok); - } else if (var->_type == Variables::pointer || var->_type == Variables::reference) { + } else if (var->mType == Variables::pointer || var->mType == Variables::reference) { variables.read(varid, tok); variables.writeAliases(varid, tok); - } else if (var->_type == Variables::pointerArray) { + } else if (var->mType == Variables::pointerArray) { tok = doAssignment(variables, tok, deref, scope); } else variables.writeAll(varid, tok); @@ -1246,9 +1246,9 @@ void CheckUnusedVar::checkFunctionVariableUsage() continue; // skip things that are only partially implemented to prevent false positives - if (usage._type == Variables::pointerPointer || - usage._type == Variables::pointerArray || - usage._type == Variables::referenceArray) + if (usage.mType == Variables::pointerPointer || + usage.mType == Variables::pointerArray || + usage.mType == Variables::referenceArray) continue; const std::string &varname = usage._var->name(); diff --git a/lib/library.cpp b/lib/library.cpp index b9b138fc5..962d1e7dc 100644 --- a/lib/library.cpp +++ b/lib/library.cpp @@ -466,7 +466,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc) if (value == nullptr) return Error(MISSING_ATTRIBUTE, "value"); PlatformType type; - type._type = value; + type.mType = value; std::set platform; for (const tinyxml2::XMLElement *typenode = node->FirstChildElement(); typenode; typenode = typenode->NextSiblingElement()) { const std::string typenodename = typenode->Name(); diff --git a/lib/library.h b/lib/library.h index 0e20c9673..8306eaa7b 100644 --- a/lib/library.h +++ b/lib/library.h @@ -395,12 +395,12 @@ public: _pointer == type._pointer && _ptr_ptr == type._ptr_ptr && _const_ptr == type._const_ptr && - _type == type._type); + mType == type.mType); } bool operator != (const PlatformType & type) const { return !(*this == type); } - std::string _type; + std::string mType; bool _signed; bool _unsigned; bool _long; diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp index bea479289..74fa015dc 100644 --- a/lib/symboldatabase.cpp +++ b/lib/symboldatabase.cpp @@ -2646,7 +2646,7 @@ void SymbolDatabase::printVariable(const Variable *var, const char *indent) cons std::cout << indent << " isRValueRef: " << var->isRValueReference() << std::endl; std::cout << indent << " hasDefault: " << var->hasDefault() << std::endl; std::cout << indent << " isStlType: " << var->isStlType() << std::endl; - std::cout << indent << "_type: "; + std::cout << indent << "mType: "; if (var->type()) { std::cout << var->type()->type() << " " << var->type()->name(); std::cout << " " << mTokenizer->list.fileLine(var->type()->classDef); @@ -5479,13 +5479,13 @@ bool ValueType::fromLibraryType(const std::string &typestr, const Settings *sett const Library::PlatformType *platformType = settings->library.platform_type(typestr, settings->platformString()); if (platformType) { - if (platformType->_type == "char") + if (platformType->mType == "char") type = ValueType::Type::CHAR; - else if (platformType->_type == "short") + else if (platformType->mType == "short") type = ValueType::Type::SHORT; - else if (platformType->_type == "int") + else if (platformType->mType == "int") type = platformType->_long ? ValueType::Type::LONG : ValueType::Type::INT; - else if (platformType->_type == "long") + else if (platformType->mType == "long") type = platformType->_long ? ValueType::Type::LONGLONG : ValueType::Type::LONG; if (platformType->_signed) sign = ValueType::SIGNED; diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h index 95a37a8a8..81624d4ae 100644 --- a/lib/symboldatabase.h +++ b/lib/symboldatabase.h @@ -229,7 +229,7 @@ public: mAccess(access_), mFlags(0), mConstness(0), - _type(type_), + mType(type_), _scope(scope_) { evaluate(lib); } @@ -486,7 +486,7 @@ public: * @return pointer to type if known, NULL if not known */ const Type *type() const { - return _type; + return mType; } /** @@ -494,7 +494,7 @@ public: * @return pointer to type scope if known, NULL if not known */ const Scope *typeScope() const { - return _type ? _type->classScope : nullptr; + return mType ? mType->classScope : nullptr; } /** @@ -612,7 +612,7 @@ private: * @param t type */ void type(const Type * t) { - _type = t; + mType = t; } /** @brief variable name token */ @@ -637,7 +637,7 @@ private: unsigned int mConstness; /** @brief pointer to user defined type info (for known types) */ - const Type *_type; + const Type *mType; /** @brief pointer to scope this variable is in */ const Scope *_scope; diff --git a/lib/token.cpp b/lib/token.cpp index 177571cf1..dae05f7a4 100644 --- a/lib/token.cpp +++ b/lib/token.cpp @@ -1666,10 +1666,10 @@ void Token::setValueType(ValueType *vt) void Token::type(const ::Type *t) { - _type = t; + mType = t; if (t) { tokType(eType); - isEnumType(_type->isEnumType()); + isEnumType(mType->isEnumType()); } else if (mTokType == eType) tokType(eName); } diff --git a/lib/token.h b/lib/token.h index ec6b839aa..398d7a1e2 100644 --- a/lib/token.h +++ b/lib/token.h @@ -719,7 +719,7 @@ public: * @return a pointer to the type associated with this token. */ const ::Type *type() const { - return mTokType == eType ? _type : nullptr; + return mTokType == eType ? mType : nullptr; } /** @@ -914,7 +914,7 @@ private: union { const Function *_function; const Variable *_variable; - const ::Type* _type; + const ::Type* mType; const Enumerator *_enumerator; }; diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index a084fe12e..5094b543d 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -5957,20 +5957,20 @@ void Tokenizer::simplifyPlatformTypes() if (platformtype->_const_ptr) { tok->str("const"); tok->insertToken("*"); - tok->insertToken(platformtype->_type); + tok->insertToken(platformtype->mType); typeToken = tok; } else if (platformtype->_pointer) { - tok->str(platformtype->_type); + tok->str(platformtype->mType); typeToken = tok; tok->insertToken("*"); } else if (platformtype->_ptr_ptr) { - tok->str(platformtype->_type); + tok->str(platformtype->mType); typeToken = tok; tok->insertToken("*"); tok->insertToken("*"); } else { tok->originalName(tok->str()); - tok->str(platformtype->_type); + tok->str(platformtype->mType); typeToken = tok; } if (platformtype->_signed)