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

ValueType: better handling of nonstandard types

This commit is contained in:
Daniel Marjamäki 2016-05-08 11:55:25 +02:00
parent b94eaeca6a
commit f0953c6916
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/symboldatabase.cpp
View File

@ -4041,18 +4041,7 @@ static void setValueType(Token *tok, const Variable &var, bool cpp, ValueType::S
ValueType valuetype; ValueType valuetype;
valuetype.pointer = var.dimensions().size(); valuetype.pointer = var.dimensions().size();
valuetype.typeScope = var.typeScope(); valuetype.typeScope = var.typeScope();
if (var.isEnumType()) { if (parsedecl(var.typeStartToken(), &valuetype, defaultSignedness, lib))
if (var.type() && var.type()->classScope && var.type()->classScope->enumType) {
if (parsedecl(var.type()->classScope->enumType, &valuetype, defaultSignedness, lib)) {
setValueType(tok, valuetype, cpp, defaultSignedness, lib);
valuetype.originalTypeName = var.type()->classScope->className;
}
} else if (parsedecl(var.typeStartToken(), &valuetype, defaultSignedness, lib)) {
valuetype.sign = ValueType::SIGNED;
valuetype.type = ValueType::INT;
setValueType(tok, valuetype, cpp, defaultSignedness, lib);
}
} else if (parsedecl(var.typeStartToken(), &valuetype, defaultSignedness, lib))
setValueType(tok, valuetype, cpp, defaultSignedness, lib); setValueType(tok, valuetype, cpp, defaultSignedness, lib);
} }
@ -4238,7 +4227,7 @@ static const Token * parsedecl(const Token *type, ValueType * const valuetype, V
while (Token::Match(type->previous(), "%name%")) while (Token::Match(type->previous(), "%name%"))
type = type->previous(); type = type->previous();
valuetype->sign = ValueType::Sign::UNKNOWN_SIGN; valuetype->sign = ValueType::Sign::UNKNOWN_SIGN;
valuetype->type = ValueType::Type::UNKNOWN_TYPE; valuetype->type = valuetype->typeScope ? ValueType::Type::NONSTD : ValueType::Type::UNKNOWN_TYPE;
while (Token::Match(type, "%name%|*|&") && !type->variable()) { while (Token::Match(type, "%name%|*|&") && !type->variable()) {
if (type->isSigned()) if (type->isSigned())
valuetype->sign = ValueType::Sign::SIGNED; valuetype->sign = ValueType::Sign::SIGNED;
@ -4262,7 +4251,7 @@ static const Token * parsedecl(const Token *type, ValueType * const valuetype, V
valuetype->type = ValueType::Type::FLOAT; valuetype->type = ValueType::Type::FLOAT;
else if (type->str() == "double") else if (type->str() == "double")
valuetype->type = type->isLong() ? ValueType::Type::LONGDOUBLE : ValueType::Type::DOUBLE; valuetype->type = type->isLong() ? ValueType::Type::LONGDOUBLE : ValueType::Type::DOUBLE;
else if (type->str() == "struct") else if (type->str() == "struct" || type->str() == "enum")
valuetype->type = ValueType::Type::NONSTD; valuetype->type = ValueType::Type::NONSTD;
else if (type->isName() && valuetype->sign != ValueType::Sign::UNKNOWN_SIGN && valuetype->pointer == 0U) else if (type->isName() && valuetype->sign != ValueType::Sign::UNKNOWN_SIGN && valuetype->pointer == 0U)
return nullptr; return nullptr;
@ -4427,6 +4416,8 @@ std::string ValueType::str() const
ret += " double"; ret += " double";
else if (type == LONGDOUBLE) else if (type == LONGDOUBLE)
ret += " long double"; ret += " long double";
else if (type == NONSTD && typeScope)
ret += ' ' + typeScope->className;
for (unsigned int p = 0; p < pointer; p++) { for (unsigned int p = 0; p < pointer; p++) {
ret += " *"; ret += " *";
if (constness & (2 << p)) if (constness & (2 << p))

5
test/testsymboldatabase.cpp
View File

@ -3220,7 +3220,10 @@ private:
ASSERT_EQUALS("signed int", typeOf("struct X {int i;}; void f(struct X x) { x.i }", ".")); ASSERT_EQUALS("signed int", typeOf("struct X {int i;}; void f(struct X x) { x.i }", "."));
ASSERT_EQUALS("signed int *", typeOf("int *p; a = p++;", "++")); ASSERT_EQUALS("signed int *", typeOf("int *p; a = p++;", "++"));
ASSERT_EQUALS("signed int", typeOf("int x; a = x++;", "++")); ASSERT_EQUALS("signed int", typeOf("int x; a = x++;", "++"));
ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; enum AB *ab; x=ab+2;", "+")); ASSERT_EQUALS("AB *", typeOf("enum AB {A,B}; AB *ab; x=ab+2;", "+"));
ASSERT_EQUALS("AB *", typeOf("enum AB {A,B}; enum AB *ab; x=ab+2;", "+"));
ASSERT_EQUALS("AB *", typeOf("struct AB {int A; int B;}; AB ab; x=&ab;", "&"));
ASSERT_EQUALS("AB *", typeOf("struct AB {int A; int B;}; struct AB ab; x=&ab;", "&"));
// Unary arithmetic/bit operators // Unary arithmetic/bit operators
ASSERT_EQUALS("signed int", typeOf("int x; a = -x;", "-")); ASSERT_EQUALS("signed int", typeOf("int x; a = -x;", "-"));