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

More conservative fallback for function overload matching

This commit is contained in:
PKEuS 2017-02-24 20:56:47 +01:00
parent 4e28d40bf0
commit 3f1e2b4270
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/symboldatabase.cpp
View File

@ -3900,10 +3900,9 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
++i; ++i;
} }
// no exact match so just return first function found // no exact match, but only one candidate left
if (!matches.empty()) { if (matches.size() == 1)
return matches[0]; return matches[0];
}
return nullptr; return nullptr;
} }

4
test/testsymboldatabase.cpp
View File

@ -3495,12 +3495,16 @@ private:
"void foo(long long a) { }\n" "void foo(long long a) { }\n"
"void foo() {\n" "void foo() {\n"
" foo(0);\n" " foo(0);\n"
" foo(bar());\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( 0 ) ;"); const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( 0 ) ;");
ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2); ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
f = Token::findsimplematch(tokenizer.tokens(), "foo ( bar ( ) ) ;");
ASSERT_EQUALS(true, db && f && f->function() == nullptr);
} }
#define FUNC(x) const Function *x = findFunctionByName(#x, &db->scopeList.front()); \ #define FUNC(x) const Function *x = findFunctionByName(#x, &db->scopeList.front()); \