ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

data: expanded typename resolving

Browse Source 
* implemented explicit handling of Decltype when resolving the typename.
This commit is contained in:
malte_langkabel
2016-01-14 16:01:32 +01:00
parent 5a39cab495
commit eecf8b95d2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_parser/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp
+10 -6
View File
@@ -98,10 +98,7 @@ std::shared_ptr<DataType> CxxTypeNameResolver::typeToDataType(const clang::Type*
pp.SuppressTagKeyword = true; // value "true": for a class A it prints "A" instead of "class A" pp.SuppressTagKeyword = true; // value "true": for a class A it prints "A" instead of "class A"
pp.Bool = true; // value "true": prints bool type as "bool" instead of "_Bool" pp.Bool = true; // value "true": prints bool type as "bool" instead of "_Bool"
clang::SmallString<64> Buf; std::string typeName = type->getAs<clang::BuiltinType>()->getName(pp);
llvm::raw_svector_ostream StrOS(Buf);
clang::QualType::print(type, clang::Qualifiers(), StrOS, pp, clang::Twine());
std::string typeName = StrOS.str();
NameHierarchy typeNameHerarchy; NameHierarchy typeNameHerarchy;
typeNameHerarchy.push(std::make_shared<NameElement>(typeName)); typeNameHerarchy.push(std::make_shared<NameElement>(typeName));
@@ -138,7 +135,7 @@ std::shared_ptr<DataType> CxxTypeNameResolver::typeToDataType(const clang::Type*
templateArgumentNamePart += ">"; templateArgumentNamePart += ">";
std::string declName = typeNameHerarchy.back()->getFullName(); std::string declName = typeNameHerarchy.back()->getFullName();
declName = declName.substr(0, declName.rfind("<")); // remove template parameters - TODO: FIX: does not work for A<ajaj<ajsj>> declName = declName.substr(0, declName.rfind("<")); // remove template parameters
declName += templateArgumentNamePart; // add template arguments declName += templateArgumentNamePart; // add template arguments
typeNameHerarchy.pop(); typeNameHerarchy.pop();
typeNameHerarchy.push(std::make_shared<NameElement>(declName)); typeNameHerarchy.push(std::make_shared<NameElement>(declName));
@@ -184,9 +181,16 @@ std::shared_ptr<DataType> CxxTypeNameResolver::typeToDataType(const clang::Type*
dataType = qualTypeToDataType(autoType->getDeducedType()); dataType = qualTypeToDataType(autoType->getDeducedType());
break; break;
} }
case clang::Type::Decltype:
{
const clang::DecltypeType* decltypeType = clang::dyn_cast<clang::DecltypeType>(type);
dataType = qualTypeToDataType(decltypeType->getUnderlyingType());
break;
}
default: default:
{ {
LOG_INFO(std::string("Unhandled kind of type encountered: ") + type->getTypeClassName()); std::string typeClassName = type->getTypeClassName();
LOG_INFO(std::string("Unhandled kind of type encountered: ") + typeClassName);
clang::PrintingPolicy pp = clang::PrintingPolicy(clang::LangOptions()); clang::PrintingPolicy pp = clang::PrintingPolicy(clang::LangOptions());
pp.SuppressTagKeyword = true; // value "true": for a class A it prints "A" instead of "class A" pp.SuppressTagKeyword = true; // value "true": for a class A it prints "A" instead of "class A"
pp.Bool = true; // value "true": prints bool type as "bool" instead of "_Bool" pp.Bool = true; // value "true": prints bool type as "bool" instead of "_Bool"