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

Fix from Philippe to enable Transform::GetPartiallyDesugaredType()

Browse Source 
to actually desugar while looking for typedefs to keep.


git-svn-id: http://root.cern.ch/svn/root/trunk@47672 27541ba8-7e3a-0410-8455-c3a389f83636
This commit is contained in:
Paul Russo 2012-11-28 16:14:29 +00:00
parent 27bfa0f1cc
commit 6827ff1446
1 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/Utils/AST.cpp
View File

@ -8,6 +8,7 @@
#include "clang/AST/ASTContext.h"
#include "clang/AST/DeclarationName.h"
#include "clang/AST/Type.h"
#include "clang/Sema/Sema.h"
#include "clang/Sema/Lookup.h"
@ -207,7 +208,7 @@ namespace utils {
QualType QT,
const llvm::SmallSet<const Type*, 4>& TypesToSkip,
bool fullyQualify /*=true*/){
// If there are no constains - use the standard desugaring.
// If there are no constraints - use the standard desugaring.
if (!TypesToSkip.size() && !fullyQualify)
return QT.getDesugaredType(Ctx);
@ -273,16 +274,53 @@ namespace utils {
}
}
while(isa<TypedefType>(QT.getTypePtr())) {
if (!ShouldKeepTypedef(QT,TypesToSkip))
QT = QT.getSingleStepDesugaredType(Ctx);
else if (fullyQualify) {
// We might have stripped the namespace/scope part,
// se we must go on if fullyQualify is true.
break;
} else
if (isa<TypedefType>(QT.getTypePtr()) && ShouldKeepTypedef(QT, TypesToSkip)) {
if (!fullyQualify) {
return QT;
}
} else {
// Do we really need this complexity? ... well check out clang::TypeOfType ... and
// clang::ParenType ... ok you're back ... enough said.
clang::QualType dsQT = QT.getSingleStepDesugaredType(Ctx);
while (dsQT != QT) {
QT = dsQT;
if (isa<TypedefType>(QT.getTypePtr()) && ShouldKeepTypedef(QT, TypesToSkip)) {
if (!fullyQualify) {
return QT;
}
break;
}
dsQT = QT.getSingleStepDesugaredType(Ctx);
}
}
/* The alternative to the previous dsQT != QT in the previous loop is:
#define ABSTRACT_TYPE(Class, Parent)
#define TYPE(Class, Parent) \
case Type::Class: { \
const Class##Type *ty = cast<Class##Type>(this); \
if (!ty->isSugared()) return QualType(ty, 0); \
return ty->desugar(); \
}
#include "clang/AST/TypeNodes.def"
}
where the return statement are replaced appropriately by
break statement and/or loop termination ... good luck with that.
*/
#ifdef G__IMPLEMENTATION2012
while (isa<TypedefType>(QT.getTypePtr())) {
if (ShouldKeepTypedef(QT, TypesToSkip)) {
if (!fullyQualify) {
return QT;
}
// We might have stripped the namespace/scope part,
// so we must go on.
break;
}
QT = QT.getSingleStepDesugaredType(Ctx);
}
#endif
// If we have a reference or pointer we still need to
// desugar what they point to.