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

SymbolDatabase: Better handling of type aliases in ValueType

This commit is contained in:
Daniel Marjamäki 2018-06-20 14:49:55 +02:00
parent b62c562a89
commit 10fc070f44
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/symboldatabase.cpp
View File

@ -5184,6 +5184,8 @@ static const Token * parsedecl(const Token *type, ValueType * const valuetype, V
valuetype->pointer++; valuetype->pointer++;
else if (type->isStandardType()) else if (type->isStandardType())
valuetype->fromLibraryType(type->str(), settings); valuetype->fromLibraryType(type->str(), settings);
else if (Token::Match(type->previous(), "!!:: %name% !!::"))
valuetype->fromLibraryType(type->str(), settings);
if (!type->originalName().empty()) if (!type->originalName().empty())
valuetype->originalTypeName = type->originalName(); valuetype->originalTypeName = type->originalName();
type = type->next(); type = type->next();

19
test/testsymboldatabase.cpp
View File

@ -146,6 +146,9 @@ private:
TEST_CASE(isVariableDeclarationRValueRef); TEST_CASE(isVariableDeclarationRValueRef);
TEST_CASE(isVariableStlType); TEST_CASE(isVariableStlType);
TEST_CASE(VariableValueType1);
TEST_CASE(VariableValueType2);
TEST_CASE(findVariableType1); TEST_CASE(findVariableType1);
TEST_CASE(findVariableType2); TEST_CASE(findVariableType2);
TEST_CASE(findVariableType3); TEST_CASE(findVariableType3);
@ -789,6 +792,22 @@ private:
ASSERT(var.tokens()->tokAt(2)->scope() != 0); ASSERT(var.tokens()->tokAt(2)->scope() != 0);
} }
void VariableValueType1() {
GET_SYMBOL_DB("typedef uint8_t u8;\n"
"static u8 x;\n");
const Variable* x = db->getVariableFromVarId(1);
ASSERT_EQUALS("x", x->name());
ASSERT(x->valueType()->isIntegral());
}
void VariableValueType2() {
GET_SYMBOL_DB("using u8 = uint8_t;\n"
"static u8 x;\n");
const Variable* x = db->getVariableFromVarId(1);
ASSERT_EQUALS("x", x->name());
ASSERT(x->valueType()->isIntegral());
}
void findVariableType1() { void findVariableType1() {
GET_SYMBOL_DB("class A {\n" GET_SYMBOL_DB("class A {\n"
"public:\n" "public:\n"