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

split "varid0" from more generic "debug" messages (#2997)

This commit is contained in:
Oliver Stöneberg 2020-12-31 19:24:16 +01:00 committed by GitHub
parent b16944b310
commit 20e462a8ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkclass.cpp
View File

@ -1889,7 +1889,7 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
for (const Variable &var : scope->varlist) { for (const Variable &var : scope->varlist) {
if (var.name() == tok->str()) { if (var.name() == tok->str()) {
if (tok->varId() == 0) if (tok->varId() == 0)
mSymbolDatabase->debugMessage(tok, "CheckClass::isMemberVar found used member variable \'" + tok->str() + "\' with varid 0"); mSymbolDatabase->debugMessage(tok, "varid0", "CheckClass::isMemberVar found used member variable \'" + tok->str() + "\' with varid 0");
return !var.isStatic(); return !var.isStatic();
} }

16
lib/symboldatabase.cpp
View File

@ -928,7 +928,7 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
if (retry == 100 && mSettings->debugwarnings) { if (retry == 100 && mSettings->debugwarnings) {
for (const Scope& scope : scopeList) { for (const Scope& scope : scopeList) {
if (scope.isClassOrStruct() && scope.definedType->needInitialization == Type::NeedInitialization::Unknown) if (scope.isClassOrStruct() && scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
debugMessage(scope.classDef, "SymbolDatabase::SymbolDatabase couldn't resolve all user defined types."); debugMessage(scope.classDef, "debug", "SymbolDatabase couldn't resolve all user defined types.");
} }
} }
} }
@ -1744,7 +1744,7 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
Token::simpleMatch(tok->linkAt(1), ") {") && Token::simpleMatch(tok->linkAt(1), ") {") &&
(!tok->previous() || Token::Match(tok->previous(), ";|}"))) { (!tok->previous() || Token::Match(tok->previous(), ";|}"))) {
if (mTokenizer->isC()) { if (mTokenizer->isC()) {
debugMessage(tok, "SymbolDatabase::isFunction found C function '" + tok->str() + "' without a return type."); debugMessage(tok, "debug", "SymbolDatabase::isFunction found C function '" + tok->str() + "' without a return type.");
*funcStart = tok; *funcStart = tok;
*argStart = tok->next(); *argStart = tok->next();
*declEnd = tok->linkAt(1)->next(); *declEnd = tok->linkAt(1)->next();
@ -2977,13 +2977,13 @@ const std::string& Type::name() const
return emptyString; return emptyString;
} }
void SymbolDatabase::debugMessage(const Token *tok, const std::string &msg) const void SymbolDatabase::debugMessage(const Token *tok, const std::string &type, const std::string &msg) const
{ {
if (tok && mSettings->debugwarnings) { if (tok && mSettings->debugwarnings) {
const std::list<const Token*> locationList(1, tok); const std::list<const Token*> locationList(1, tok);
const ErrorMessage errmsg(locationList, &mTokenizer->list, const ErrorMessage errmsg(locationList, &mTokenizer->list,
Severity::debug, Severity::debug,
"debug", type,
msg, msg,
false); false);
if (mErrorLogger) if (mErrorLogger)
@ -3712,7 +3712,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
endTok = nameTok->previous(); endTok = nameTok->previous();
if (hasBody()) if (hasBody())
symbolDatabase->debugMessage(nameTok, "Function::addArguments found argument \'" + nameTok->str() + "\' with varid 0."); symbolDatabase->debugMessage(nameTok, "varid0", "Function::addArguments found argument \'" + nameTok->str() + "\' with varid 0.");
} else } else
endTok = typeTok; endTok = typeTok;
} else } else
@ -4140,7 +4140,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
if (vartok->varId() == 0) { if (vartok->varId() == 0) {
if (!vartok->isBoolean()) if (!vartok->isBoolean())
check->debugMessage(vartok, "Scope::checkVariable found variable \'" + vartok->str() + "\' with varid 0."); check->debugMessage(vartok, "varid0", "Scope::checkVariable found variable \'" + vartok->str() + "\' with varid 0.");
return tok; return tok;
} }
@ -4933,7 +4933,7 @@ const Function* SymbolDatabase::findFunction(const Token *tok) const
tok1 = tok1->linkAt(-2)->tokAt(-1); tok1 = tok1->linkAt(-2)->tokAt(-1);
else { else {
if (mSettings->debugwarnings) if (mSettings->debugwarnings)
debugMessage(tok1->tokAt(-2), "SymbolDatabase::findFunction found '>' without link."); debugMessage(tok1->tokAt(-2), "debug", "SymbolDatabase::findFunction found '>' without link.");
return nullptr; return nullptr;
} }
} else } else
@ -6344,7 +6344,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
if (reportDebugWarnings && 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, "debug", "auto token with no type.");
} }
} }

2
lib/symboldatabase.h
View File

@ -1319,7 +1319,7 @@ public:
/** /**
* @brief output a debug message * @brief output a debug message
*/ */
void debugMessage(const Token *tok, const std::string &msg) const; void debugMessage(const Token *tok, const std::string &type, const std::string &msg) const;
void printOut(const char * title = nullptr) const; void printOut(const char * title = nullptr) const;
void printVariable(const Variable *var, const char *indent) const; void printVariable(const Variable *var, const char *indent) const;