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

SymbolDatabase: Code cleanup in findFunction

This commit is contained in:
Daniel Marjamäki 2019-08-01 17:29:25 +02:00
parent 25a13d061c
commit 81db8fda18
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/symboldatabase.cpp
View File

@ -4229,29 +4229,15 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
}
}
// check for a match with a numeric literal
else if (Token::Match(arguments[j], "%num%")) {
const Token *calltok = arguments[j];
if (funcarg->isPointer() && MathLib::isNullValue(calltok->str())) {
fallback1++;
} else {
ValueType::MatchResult res = ValueType::matchParameter(arguments[j]->valueType(), funcarg->valueType());
if (res == ValueType::MatchResult::SAME)
++same;
else if (res == ValueType::MatchResult::FALLBACK1)
++fallback1;
else if (res == ValueType::MatchResult::FALLBACK2)
++fallback2;
}
}
else if (funcarg->isStlStringType() && arguments[j]->valueType() && arguments[j]->valueType()->pointer == 1 && arguments[j]->valueType()->type == ValueType::Type::CHAR)
fallback1++;
// check for a match with nullptr
else if (funcarg->isPointer() && Token::Match(arguments[j], "nullptr|NULL ,|)")) {
else if (funcarg->isPointer() && Token::Match(arguments[j], "nullptr|NULL ,|)"))
same++;
}
else if (arguments[j]->isNumber() && funcarg->isPointer() && MathLib::isNullValue(arguments[j]->str()))
fallback1++;
// Try to evaluate the apparently more complex expression
else {