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

ValueType: Better handling of const

This commit is contained in:
Daniel Marjamäki 2015-10-10 08:32:45 +02:00
parent 6545172d8c
commit 0849ad4707
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/symboldatabase.cpp
View File

@ -3752,6 +3752,9 @@ static void setValueType(Token *tok, const ValueType &valuetype)
static const Token * parsedecl(const Token *type, ValueType * const valuetype) static const Token * parsedecl(const Token *type, ValueType * const valuetype)
{ {
const unsigned int pointer0 = valuetype->pointer;
while (Token::Match(type->previous(), "%name%"))
type = type->previous();
valuetype->sign = ValueType::Sign::UNKNOWN_SIGN; valuetype->sign = ValueType::Sign::UNKNOWN_SIGN;
valuetype->type = ValueType::Type::UNKNOWN_TYPE; valuetype->type = ValueType::Type::UNKNOWN_TYPE;
while (Token::Match(type, "%name%|*|&") && !type->variable()) { while (Token::Match(type, "%name%|*|&") && !type->variable()) {
@ -3759,7 +3762,9 @@ static const Token * parsedecl(const Token *type, ValueType * const valuetype)
valuetype->sign = ValueType::Sign::SIGNED; valuetype->sign = ValueType::Sign::SIGNED;
else if (type->isUnsigned()) else if (type->isUnsigned())
valuetype->sign = ValueType::Sign::UNSIGNED; valuetype->sign = ValueType::Sign::UNSIGNED;
if (type->str() == "bool") if (type->str() == "const")
valuetype->constness |= (1 << (valuetype->pointer - pointer0));
else if (type->str() == "bool")
valuetype->type = ValueType::Type::BOOL; valuetype->type = ValueType::Type::BOOL;
else if (type->str() == "char") else if (type->str() == "char")
valuetype->type = ValueType::Type::CHAR; valuetype->type = ValueType::Type::CHAR;

3
test/testsymboldatabase.cpp
View File

@ -3005,6 +3005,9 @@ private:
// const.. // const..
ASSERT_EQUALS("const char *", typeOf("a = \"123\";", "\"123\"")); ASSERT_EQUALS("const char *", typeOf("a = \"123\";", "\"123\""));
ASSERT_EQUALS("const int *", typeOf("const int *a; x = a + 1;", "a +"));
ASSERT_EQUALS("int * const", typeOf("int * const a; x = a + 1;", "+"));
ASSERT_EQUALS("const int *", typeOf("const int a[20]; x = a + 1;", "+"));
} }
}; };