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

Refactor findFunction to unify two ValueFlow paths. (#1149)

This commit is contained in:
IOBYTE 2018-04-05 00:46:48 -04:00 committed by Daniel Marjamäki
parent 0c6f184423
commit 06133fa3ba
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/symboldatabase.cpp
View File

@ -3991,6 +3991,21 @@ static void checkVariableCallMatch(const Variable* callarg, const Variable* func
} }
} }
static bool valueTypeMatch(const ValueType * valuetype, const Token * type)
{
return ((((type->str() == "bool" && valuetype->type == ValueType::BOOL) ||
(type->str() == "char" && valuetype->type == ValueType::CHAR) ||
(type->str() == "short" && valuetype->type == ValueType::SHORT) ||
(type->str() == "int" && valuetype->type == ValueType::INT) ||
((type->str() == "long" && type->isLong()) && valuetype->type == ValueType::LONGLONG) ||
(type->str() == "long" && valuetype->type == ValueType::LONG) ||
(type->str() == "float" && valuetype->type == ValueType::FLOAT) ||
((type->str() == "double" && type->isLong()) && valuetype->type == ValueType::LONGDOUBLE) ||
(type->str() == "double" && valuetype->type == ValueType::DOUBLE)) &&
(type->isUnsigned() == (valuetype->sign == ValueType::UNSIGNED))) ||
(valuetype->isEnum() && type->isEnumType() && valuetype->typeScope->className == type->str()));
}
const Function* Scope::findFunction(const Token *tok, bool requireConst) const const Function* Scope::findFunction(const Token *tok, bool requireConst) const
{ {
// make sure this is a function call // make sure this is a function call
@ -4224,49 +4239,30 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
while (argtok->astParent() && argtok->astParent() != tok->next() && argtok->astParent()->str() != ",") { while (argtok->astParent() && argtok->astParent() != tok->next() && argtok->astParent()->str() != ",") {
argtok = argtok->astParent(); argtok = argtok->astParent();
} }
if (argtok && argtok->valueType() && argtok->previous()->function() && argtok->previous()->function()->retDef) { if (argtok && argtok->valueType()) {
const ValueType* valuetype = argtok->valueType(); const ValueType* valuetype = argtok->valueType();
const Function* argfunc = argtok->previous()->function();
const bool isArrayOrPointer = valuetype->pointer; const bool isArrayOrPointer = valuetype->pointer;
const bool ptrequals = isArrayOrPointer == funcarg->isArrayOrPointer(); const bool ptrequals = isArrayOrPointer == funcarg->isArrayOrPointer();
const bool constEquals = !isArrayOrPointer || ((argfunc->retDef->strAt(-1) == "const") == (funcarg->typeStartToken()->strAt(-1) == "const")); const bool constEquals = !isArrayOrPointer ||
if (ptrequals && constEquals && ((valuetype->constness > 0) == (funcarg->typeStartToken()->strAt(-1) == "const"));
argfunc->retDef->str() == funcarg->typeStartToken()->str() && if (ptrequals && constEquals && valueTypeMatch(valuetype, funcarg->typeStartToken())) {
argfunc->retDef->isUnsigned() == funcarg->typeStartToken()->isUnsigned() &&
argfunc->retDef->isLong() == funcarg->typeStartToken()->isLong()) {
same++; same++;
} else if (isArrayOrPointer) { } else if (isArrayOrPointer) {
if (ptrequals && constEquals && funcarg->typeStartToken()->str() == "void") if (ptrequals && constEquals && valuetype->type == ValueType::VOID)
fallback1++; fallback1++;
else if (constEquals && funcarg->isStlStringType() && Token::Match(argfunc->retDef, "char|wchar_t")) else if (constEquals && funcarg->isStlStringType() && valuetype->type == ValueType::CHAR)
fallback2++; fallback2++;
} else if (ptrequals) { } else if (ptrequals) {
const bool takesInt = Token::Match(funcarg->typeStartToken(), "char|short|int|long"); const bool takesInt = Token::Match(funcarg->typeStartToken(), "bool|char|short|int|long") ||
funcarg->typeStartToken()->isEnumType();
const bool takesFloat = Token::Match(funcarg->typeStartToken(), "float|double"); const bool takesFloat = Token::Match(funcarg->typeStartToken(), "float|double");
const bool passesInt = Token::Match(argfunc->retDef, "char|short|int|long"); const bool passesInt = valuetype->isIntegral() || valuetype->isEnum();
const bool passesFloat = Token::Match(argfunc->retDef, "float|double"); const bool passesFloat = valuetype->isFloat();
if ((takesInt && passesInt) || (takesFloat && passesFloat)) if ((takesInt && passesInt) || (takesFloat && passesFloat))
fallback1++; fallback1++;
else if ((takesInt && passesFloat) || (takesFloat && passesInt)) else if ((takesInt && passesFloat) || (takesFloat && passesInt))
fallback2++; fallback2++;
} }
} else if (argtok && argtok->valueType() && !funcarg->isArrayOrPointer()) { // TODO: Pointers
if (argtok->valueType()->type == ValueType::BOOL) {
if (funcarg->typeStartToken()->str() == "bool")
same++;
else if (Token::Match(funcarg->typeStartToken(), "wchar_t|char|short|int|long"))
fallback1++;
} else if (argtok->valueType()->isIntegral()) {
if (Token::Match(funcarg->typeStartToken(), "wchar_t|char|short|int|long"))
same++;
else if (Token::Match(funcarg->typeStartToken(), "float|double"))
fallback1++;
} else if (argtok->valueType()->isFloat()) {
if (Token::Match(funcarg->typeStartToken(), "float|double"))
same++;
else if (Token::Match(funcarg->typeStartToken(), "wchar_t|char|short|int|long"))
fallback1++;
}
} else { } else {
while (Token::Match(argtok, ".|::")) while (Token::Match(argtok, ".|::"))
argtok = argtok->astOperand2(); argtok = argtok->astOperand2();

4
lib/symboldatabase.h
View File

@ -1081,6 +1081,10 @@ public:
bool fromLibraryType(const std::string &typestr, const Settings *settings); bool fromLibraryType(const std::string &typestr, const Settings *settings);
bool isEnum() const {
return typeScope && typeScope->type == Scope::eEnum;
}
std::string str() const; std::string str() const;
std::string dump() const; std::string dump() const;
}; };