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

Use ValueType in astIsIntegral()

This commit is contained in:
Daniel Marjamäki 2015-10-11 14:11:11 +02:00
parent be7bca385d
commit cba11e623e
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/astutils.cpp
View File

@ -31,42 +31,10 @@ bool astIsSignedChar(const Token *tok)
bool astIsIntegral(const Token *tok, bool unknown)
{
// TODO: handle arrays
if (tok->isNumber())
return MathLib::isInt(tok->str());
if (tok->isName()) {
if (tok->variable())
return tok->variable()->isIntegralType();
const ValueType *vt = tok ? tok->valueType() : nullptr;
if (!vt)
return unknown;
}
if (tok->str() == "(") {
// cast
if (Token::Match(tok, "( const| float|double )"))
return false;
// Function call
if (tok->previous() && tok->previous()->function()) {
if (Token::Match(tok->previous()->function()->retDef, "float|double"))
return false;
else if (Token::Match(tok->previous()->function()->retDef, "bool|char|short|int|long"))
return true;
}
if (tok->strAt(-1) == "sizeof")
return true;
return unknown;
}
if (tok->astOperand2() && (tok->str() == "." || tok->str() == "::"))
return astIsIntegral(tok->astOperand2(), unknown);
if (tok->astOperand1() && tok->str() != "?")
return astIsIntegral(tok->astOperand1(), unknown);
return unknown;
return vt->isIntegral() && vt->pointer == 0U;
}
bool astIsFloat(const Token *tok, bool unknown)