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

Improve --debug-warnings output for 'auto' tokens without type. Do not report that prematurely before the type is set properly.

This commit is contained in:
Daniel Marjamäki 2019-08-05 13:42:00 +02:00
parent 20278d9c92
commit ebcca4edd1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/symboldatabase.cpp
View File

@ -59,7 +59,7 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
createSymbolDatabaseVariableSymbolTable(); createSymbolDatabaseVariableSymbolTable();
createSymbolDatabaseSetScopePointers(); createSymbolDatabaseSetScopePointers();
createSymbolDatabaseSetVariablePointers(); createSymbolDatabaseSetVariablePointers();
setValueTypeInTokenList(); setValueTypeInTokenList(false);
createSymbolDatabaseSetFunctionPointers(true); createSymbolDatabaseSetFunctionPointers(true);
createSymbolDatabaseSetTypePointers(); createSymbolDatabaseSetTypePointers();
createSymbolDatabaseEnums(); createSymbolDatabaseEnums();
@ -5395,7 +5395,7 @@ static const Function *getOperatorFunction(const Token * const tok)
return nullptr; return nullptr;
} }
void SymbolDatabase::setValueTypeInTokenList() void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings)
{ {
Token * tokens = const_cast<Tokenizer *>(mTokenizer)->list.front(); Token * tokens = const_cast<Tokenizer *>(mTokenizer)->list.front();
@ -5605,7 +5605,7 @@ void SymbolDatabase::setValueTypeInTokenList()
} }
} }
if (mSettings->debugwarnings) { if (reportDebugWarnings && mSettings->debugwarnings) {
for (Token *tok = tokens; tok; tok = tok->next()) { for (Token *tok = tokens; tok; tok = tok->next()) {
if (tok->str() == "auto" && !tok->valueType()) if (tok->str() == "auto" && !tok->valueType())
debugMessage(tok, "auto token with no type."); debugMessage(tok, "auto token with no type.");

2
lib/symboldatabase.h
View File

@ -1238,7 +1238,7 @@ public:
void validateVariables() const; void validateVariables() const;
/** Set valuetype in provided tokenlist */ /** Set valuetype in provided tokenlist */
void setValueTypeInTokenList(); void setValueTypeInTokenList(bool reportDebugWarnings);
/** /**
* Calculates sizeof value for given type. * Calculates sizeof value for given type.

6
lib/tokenize.cpp
View File

@ -2315,9 +2315,9 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
if (mTimerResults) { if (mTimerResults) {
Timer t("Tokenizer::simplifyTokens1::setValueType", mSettings->showtime, mTimerResults); Timer t("Tokenizer::simplifyTokens1::setValueType", mSettings->showtime, mTimerResults);
mSymbolDatabase->setValueTypeInTokenList(); mSymbolDatabase->setValueTypeInTokenList(true);
} else { } else {
mSymbolDatabase->setValueTypeInTokenList(); mSymbolDatabase->setValueTypeInTokenList(true);
} }
if (mTimerResults) { if (mTimerResults) {
@ -4762,7 +4762,7 @@ bool Tokenizer::simplifyTokenList2()
// Create symbol database and then remove const keywords // Create symbol database and then remove const keywords
createSymbolDatabase(); createSymbolDatabase();
mSymbolDatabase->setValueTypeInTokenList(); mSymbolDatabase->setValueTypeInTokenList(true);
ValueFlow::setValues(&list, mSymbolDatabase, mErrorLogger, mSettings); ValueFlow::setValues(&list, mSymbolDatabase, mErrorLogger, mSettings);