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

convert CheckPostfixOperator::postfixOperator() to use the symbol database

This commit is contained in:
Robert Reif 2011-07-23 15:14:15 -04:00
parent 5e1fd81ea7
commit aa65eed02b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/checkpostfixoperator.cpp
View File

@ -22,6 +22,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "checkpostfixoperator.h" #include "checkpostfixoperator.h"
#include "symboldatabase.h"
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -38,6 +39,7 @@ void CheckPostfixOperator::postfixOperator()
return; return;
const Token *tok = _tokenizer->tokens(); const Token *tok = _tokenizer->tokens();
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
// prevent crash if first token is ++ or -- // prevent crash if first token is ++ or --
if (Token::Match(tok, "++|--")) if (Token::Match(tok, "++|--"))
@ -73,23 +75,21 @@ void CheckPostfixOperator::postfixOperator()
if (result && tok->previous()->varId()) if (result && tok->previous()->varId())
{ {
const Token *decltok = Token::findmatch(_tokenizer->tokens(), "%varid%", tok->previous()->varId()); const Variable *var = symbolDatabase->getVariableFromVarId(tok->previous()->varId());
if (decltok == NULL || !Token::Match(decltok->tokAt(-1), "%type%")) if (!var || !Token::Match(var->typeEndToken(), "%type%"))
continue; continue;
const Token *decltok = var->nameToken();
if (Token::Match(decltok->previous(), "iterator|const_iterator|reverse_iterator|const_reverse_iterator")) if (Token::Match(decltok->previous(), "iterator|const_iterator|reverse_iterator|const_reverse_iterator"))
{ {
// the variable is an iterator // the variable is an iterator
postfixOperatorError(tok); postfixOperatorError(tok);
} }
else else if (var->type())
{ {
const std::string classDef = std::string("class ") + std::string(decltok->previous()->strAt(0)); // the variable is an instance of class
if (Token::findmatch(_tokenizer->tokens(), classDef.c_str())) postfixOperatorError(tok);
{
// the variable is an instance of class
postfixOperatorError(tok);
}
} }
} }
} }