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

Only add exprids to expression and not variable declarations (#3397)

This commit is contained in:
Paul Fultz II 2021-08-13 23:49:12 -05:00 committed by GitHub
parent b9ac48c90a
commit f946bbc249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/symboldatabase.cpp
View File

@ -1416,6 +1416,23 @@ void SymbolDatabase::createSymbolDatabaseEscapeFunctions()
} }
} }
static bool isExpression(const Token* tok)
{
if (!Token::Match(tok, "(|.|[|%cop%"))
return false;
if (Token::Match(tok, "*|&|&&")) {
const Token* vartok = findAstNode(tok, [&](const Token* tok2) {
const Variable* var = tok2->variable();
if (!var)
return false;
return var->nameToken() == tok2;
});
if (vartok)
return false;
}
return true;
}
void SymbolDatabase::createSymbolDatabaseExprIds() void SymbolDatabase::createSymbolDatabaseExprIds()
{ {
nonneg int base = 0; nonneg int base = 0;
@ -1433,7 +1450,7 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) { for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
if (tok->varId() > 0) { if (tok->varId() > 0) {
tok->exprId(tok->varId()); tok->exprId(tok->varId());
} else if (Token::Match(tok, "(|.|[|%cop%")) { } else if (isExpression(tok)) {
exprs[tok->str()].push_back(tok); exprs[tok->str()].push_back(tok);
tok->exprId(id++); tok->exprId(id++);