gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In GetPartiallyDesugaredType add support for expression as template parameter.

Browse Source 
For example:
namespace edm {
  template <int I> class Hash {};
  const int typeN =1;
  typedef Hash<typeN> ParentageID;
}

edm::ParentageID should be desugared to edm::Hash<1>.
This commit is contained in:
Philippe Canal 2013-10-30 07:23:58 -05:00 committed by sftnight
parent a375e7f201
commit b96f1409ac
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Utils/AST.cpp
View File

@ -899,8 +899,32 @@ namespace utils {
bool mightHaveChanged = false;
llvm::SmallVector<TemplateArgument, 4> desArgs;
unsigned int argi = 0;
for(TemplateSpecializationType::iterator I = TST->begin(), E = TST->end();
I != E; ++I) {
I != E; ++I, ++argi) {
if (I->getKind() == TemplateArgument::Expression) {
// If we have an expression, we need to replace it / desugar it
// as it could contain unqualifed (or partially qualified or
// private) parts.
QualType canon = QT->getCanonicalTypeInternal();
const RecordType *TSTRecord
= dyn_cast<const RecordType>(canon.getTypePtr());
if (TSTRecord) {
if (const ClassTemplateSpecializationDecl* TSTdecl =
dyn_cast<ClassTemplateSpecializationDecl>(TSTRecord->getDecl()))
{
const TemplateArgumentList& templateArgs
= TSTdecl->getTemplateArgs();
mightHaveChanged = true;
desArgs.push_back(templateArgs[argi]);
continue;
}
}
}
if (I->getKind() != TemplateArgument::Type) {
desArgs.push_back(*I);
continue;
@ -949,6 +973,7 @@ namespace utils {
llvm::SmallVector<TemplateArgument, 4> desArgs;
for(unsigned int I = 0, E = templateArgs.size();
I != E; ++I) {
if (templateArgs[I].getKind() != TemplateArgument::Type) {
desArgs.push_back(templateArgs[I]);
continue;
@ -974,10 +999,11 @@ namespace utils {
// If desugaring happened allocate new type in the AST.
if (mightHaveChanged) {
Qualifiers qualifiers = QT.getLocalQualifiers();
QT = Ctx.getTemplateSpecializationType(TemplateName(TSTdecl->getSpecializedTemplate()),
QT = Ctx.getTemplateSpecializationType(TemplateName(
TSTdecl->getSpecializedTemplate()),
desArgs.data(),
desArgs.size(),
TSTRecord->getCanonicalTypeInternal());
TSTRecord->getCanonicalTypeInternal());
QT = Ctx.getQualifiedType(QT, qualifiers);
}
}

15
test/Utils/Transform.C
View File

@ -53,10 +53,13 @@ namespace NS {
typedef Content Content_t;
typedef ::Details::Impl Impl_t;
};
template <typename T> class TDataPoint {};
typedef TDataPoint<float> TDataPointF;
typedef TDataPoint<Double32_t> TDataPointD32;
const int typeN =1;
typedef ArrayType<float, typeN + 1> FArray;
}
// Anonymous namespace
@ -272,6 +275,16 @@ QT = clang::QualType(t, 0);
Transform::GetPartiallyDesugaredType(Ctx, QT, transConfig).getAsString().c_str()
// CHECK: (const char *) "NS::TDataPoint<Double32_t>"
lookup.findScope("NS::ArrayType<float,1>", &t);
QT = clang::QualType(t, 0);
Transform::GetPartiallyDesugaredType(Ctx, QT, transConfig).getAsString().c_str()
// CHECK: (const char *) "NS::ArrayType<float, 1>"
lookup.findScope("NS::FArray", &t);
QT = clang::QualType(t, 0);
Transform::GetPartiallyDesugaredType(Ctx, QT, transConfig).getAsString().c_str()
// CHECK: (const char *) "NS::ArrayType<float, 2>"
lookup.findScope("vector<Details::Impl>::value_type", &t);
QT = clang::QualType(t, 0);
Transform::GetPartiallyDesugaredType(Ctx, QT, transConfig).getAsString().c_str()