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

Variable usage : A few small fixes to reduce false positives

This commit is contained in:
Daniel Marjamäki 2008-12-08 18:44:17 +00:00
parent 25847fdec4
commit 5bb81294c0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CheckOther.cpp
View File

@ -874,26 +874,29 @@ void CheckOther::functionVariableUsage()
if ( TOKEN::Match(tok, "[;{}] bool|char|short|int|long|float|double %var% ;|=") ) if ( TOKEN::Match(tok, "[;{}] bool|char|short|int|long|float|double %var% ;|=") )
varUsage[ tok->strAt(2) ] = USAGE_DECLARE; varUsage[ tok->strAt(2) ] = USAGE_DECLARE;
else if ( TOKEN::Match(tok, "[;{}] bool|char|short|int|long|float|double * %var% ;|=") ) if ( TOKEN::Match(tok, "[;{}] bool|char|short|int|long|float|double * %var% ;|=") )
varUsage[ tok->strAt(3) ] = USAGE_DECLARE; varUsage[ tok->strAt(3) ] = USAGE_DECLARE;
else if ( TOKEN::Match(tok, "delete|return %var%") ) if ( TOKEN::Match(tok, "delete|return %var%") )
varUsage[ tok->strAt(1) ] |= USAGE_READ; varUsage[ tok->strAt(1) ] |= USAGE_READ;
else if ( TOKEN::Match(tok, "%var% =") ) if ( TOKEN::Match(tok, "%var% =") )
varUsage[ tok->str() ] |= USAGE_WRITE; varUsage[ tok->str() ] |= USAGE_WRITE;
else if ( TOKEN::Match(tok, "else %var% =") ) if ( TOKEN::Match(tok, "else %var% =") )
varUsage[ tok->strAt(1) ] |= USAGE_WRITE; varUsage[ tok->strAt(1) ] |= USAGE_WRITE;
else if ( TOKEN::Match(tok, ">>|& %var%") ) if ( TOKEN::Match(tok, ">>|& %var%") )
varUsage[ tok->strAt(1) ] |= USAGE_WRITE; varUsage[ tok->strAt(1) ] |= USAGE_WRITE;
else if ((TOKEN::Match(tok,"[(=&]") || isOp(tok)) && TOKEN::Match(tok->next, "%var%")) if ((TOKEN::Match(tok,"[(=&!]") || isOp(tok)) && TOKEN::Match(tok->next, "%var%"))
varUsage[ tok->strAt(1) ] |= USAGE_READ; varUsage[ tok->strAt(1) ] |= USAGE_READ;
else if (TOKEN::Match(tok, "%var%") && (tok->next->str()==")" || isOp(tok->next))) if (TOKEN::Match(tok, "%var%") && (tok->next->str()==")" || isOp(tok->next)))
varUsage[ tok->str() ] |= USAGE_READ; varUsage[ tok->str() ] |= USAGE_READ;
if ( TOKEN::Match(tok, "[(,] %var% [,)]") )
varUsage[ tok->strAt(1) ] |= USAGE_WRITE;
} }
// Check usage of all variables in the current scope.. // Check usage of all variables in the current scope..
@ -902,6 +905,9 @@ void CheckOther::functionVariableUsage()
std::string varname = it->first; std::string varname = it->first;
unsigned int usage = it->second; unsigned int usage = it->second;
if (!isalpha(varname[0]))
continue;
if ( ! ( usage & USAGE_DECLARE ) ) if ( ! ( usage & USAGE_DECLARE ) )
continue; continue;