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

Fixed #8969 (C++ functional cast not handled correctly)

This commit is contained in:
Daniel Marjamäki 2019-02-23 17:29:53 +01:00
parent 9379266a52
commit b43572d75e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/symboldatabase.cpp
View File

@ -5339,14 +5339,14 @@ void SymbolDatabase::setValueTypeInTokenList()
setValueType(tok, valuetype);
} else if (tok->str() == "(") {
// cast
if (!tok->astOperand2() && Token::Match(tok, "( %name%")) {
if (tok->isCast() && !tok->astOperand2() && Token::Match(tok, "( %name%")) {
ValueType valuetype;
if (Token::simpleMatch(parsedecl(tok->next(), &valuetype, mDefaultSignedness, mSettings), ")"))
setValueType(tok, valuetype);
}
// C++ cast
if (tok->astOperand2() && Token::Match(tok->astOperand1(), "static_cast|const_cast|dynamic_cast|reinterpret_cast < %name%") && tok->astOperand1()->linkAt(1)) {
else if (tok->astOperand2() && Token::Match(tok->astOperand1(), "static_cast|const_cast|dynamic_cast|reinterpret_cast < %name%") && tok->astOperand1()->linkAt(1)) {
ValueType valuetype;
if (Token::simpleMatch(parsedecl(tok->astOperand1()->tokAt(2), &valuetype, mDefaultSignedness, mSettings), ">"))
setValueType(tok, valuetype);
@ -5377,6 +5377,10 @@ void SymbolDatabase::setValueTypeInTokenList()
else if (tok->previous() && tok->previous()->isStandardType()) {
ValueType valuetype;
valuetype.type = ValueType::typeFromString(tok->previous()->str(), tok->previous()->isLong());
if (tok->previous()->isUnsigned())
valuetype.sign = ValueType::Sign::UNSIGNED;
else if (tok->previous()->isSigned())
valuetype.sign = ValueType::Sign::SIGNED;
setValueType(tok, valuetype);
}

1
test/testsymboldatabase.cpp
View File

@ -5989,6 +5989,7 @@ private:
ASSERT_EQUALS("long double", typeOf("a = (long double)32;", "("));
ASSERT_EQUALS("char", typeOf("a = static_cast<char>(32);", "("));
ASSERT_EQUALS("", typeOf("a = (unsigned x)0;", "("));
ASSERT_EQUALS("unsigned int", typeOf("a = unsigned(123);", "("));
// sizeof..
ASSERT_EQUALS("char", typeOf("sizeof(char);", "char"));