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

SymbolDatabase: Use ValueType::matchParameter for numeric literal parameters

This commit is contained in:
Daniel Marjamäki 2019-07-30 07:48:14 +02:00
parent bf219aecde
commit 88e3199372
1 changed files with 7 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/symboldatabase.cpp
View File

@ -4187,66 +4187,10 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
// check for a match with a numeric literal // check for a match with a numeric literal
else if (Token::Match(arguments[j], "%num% ,|)")) { else if (Token::Match(arguments[j], "%num% ,|)")) {
if (MathLib::isInt(arguments[j]->str()) && (!funcarg->isPointer() || MathLib::isNullValue(arguments[j]->str()))) { const Token *calltok = arguments[j];
bool exactMatch = false; if (funcarg->isPointer() && MathLib::isNullValue(calltok->str())) {
if (arguments[j]->str().find("ll") != std::string::npos ||
arguments[j]->str().find("LL") != std::string::npos) {
if (arguments[j]->str().find('u') != std::string::npos ||
arguments[j]->str().find('U') != std::string::npos) {
if (funcarg->typeStartToken()->isLong() &&
funcarg->typeStartToken()->isUnsigned() &&
funcarg->typeStartToken()->str() == "long") {
exactMatch = true;
}
} else {
if (funcarg->typeStartToken()->isLong() &&
!funcarg->typeStartToken()->isUnsigned() &&
funcarg->typeStartToken()->str() == "long") {
exactMatch = true;
}
}
} else if (arguments[j]->str().find('l') != std::string::npos ||
arguments[j]->str().find('L') != std::string::npos) {
if (arguments[j]->str().find('u') != std::string::npos ||
arguments[j]->str().find('U') != std::string::npos) {
if (!funcarg->typeStartToken()->isLong() &&
funcarg->typeStartToken()->isUnsigned() &&
funcarg->typeStartToken()->str() == "long") {
exactMatch = true;
}
} else {
if (!funcarg->typeStartToken()->isLong() &&
!funcarg->typeStartToken()->isUnsigned() &&
funcarg->typeStartToken()->str() == "long") {
exactMatch = true;
}
}
} else if (arguments[j]->str().find('u') != std::string::npos ||
arguments[j]->str().find('U') != std::string::npos) {
if (funcarg->typeStartToken()->isUnsigned() &&
funcarg->typeStartToken()->str() == "int") {
exactMatch = true;
} else if (Token::Match(funcarg->typeStartToken(), "char|short")) {
exactMatch = true;
}
} else {
if (Token::Match(funcarg->typeStartToken(), "wchar_t|char|short|int|long")) {
exactMatch = true;
}
}
if (exactMatch)
if (funcarg->isPointer())
fallback2++;
else
same++;
else {
if (funcarg->isPointer() || Token::Match(funcarg->typeStartToken(), "wchar_t|char|short|int|long"))
fallback1++; fallback1++;
else if (Token::Match(funcarg->typeStartToken(), "float|double")) } else {
fallback2++;
}
} else if (!funcarg->isPointer()) {
ValueType::MatchResult res = ValueType::matchParameter(arguments[j]->valueType(), funcarg->valueType()); ValueType::MatchResult res = ValueType::matchParameter(arguments[j]->valueType(), funcarg->valueType());
if (res == ValueType::MatchResult::SAME) if (res == ValueType::MatchResult::SAME)
++same; ++same;
@ -5844,7 +5788,9 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
if (call->type != func->type) { if (call->type != func->type) {
if (call->isIntegral() && func->isIntegral()) if (call->isIntegral() && func->isIntegral())
return ValueType::MatchResult::FALLBACK1; return call->type < func->type ?
ValueType::MatchResult::FALLBACK1 :
ValueType::MatchResult::FALLBACK2;
else if (call->isFloat() && func->isFloat()) else if (call->isFloat() && func->isFloat())
return ValueType::MatchResult::FALLBACK1; return ValueType::MatchResult::FALLBACK1;
else if (call->isIntegral() && func->isFloat()) else if (call->isIntegral() && func->isFloat())