Index: include/clang-c/Index.h =================================================================== --- include/clang-c/Index.h (revision 195297) +++ include/clang-c/Index.h (working copy) @@ -3012,6 +3012,19 @@ }; /** + * \brief Returns the number of template parameters for given class template + * specialization, or -1 if type T is not a class template specialization. + * + */ +CINDEX_LINKAGE int clang_Type_getNumTemplateArguments(CXType T); + +/** +* \brief Returns the template parameter of a template class specialization +* at given index. +*/ +CINDEX_LINKAGE CXType clang_Type_getTemplateArgument(CXType T, unsigned i); + +/** * \brief Retrieve the ref-qualifier kind of a function or method. * * The ref-qualifier is returned for C++ functions or methods. For other types Index: tools/c-index-test/c-index-test.c =================================================================== --- tools/c-index-test/c-index-test.c (revision 195297) +++ tools/c-index-test/c-index-test.c (working copy) @@ -1202,6 +1202,21 @@ printf("]"); } } + /* Print the template argument types if they exist. */ + { + int numTArgs = clang_Type_getNumTemplateArguments(T); + if (numTArgs != -1 && numTArgs != 0) { + int i; + printf(" [templateargs="); + for (i = 0; i < numTArgs; ++i) { + CXType TArg = clang_Type_getTemplateArgument(T, i); + if (TArg.kind != CXType_Invalid) { + PrintTypeAndTypeKind(TArg, " [%s] [%s]"); + } + } + printf("]"); + } + } /* Print if this is a non-POD type. */ printf(" [isPOD=%d]", clang_isPODType(T)); Index: tools/libclang/CXType.cpp =================================================================== --- tools/libclang/CXType.cpp (revision 195297) +++ tools/libclang/CXType.cpp (working copy) @@ -138,7 +138,7 @@ CXType clang_getCursorType(CXCursor C) { using namespace cxcursor; - + CXTranslationUnit TU = cxcursor::getCursorTU(C); if (!TU) return MakeCXType(QualType(), TU); @@ -161,7 +161,7 @@ if (const DeclaratorDecl *DD = dyn_cast(D)) { if (TypeSourceInfo *TSInfo = DD->getTypeSourceInfo()) return MakeCXType(TSInfo->getType(), TU); - return MakeCXType(DD->getType(), TU); + return MakeCXType(DD->getType(), TU); } if (const ValueDecl *VD = dyn_cast(D)) return MakeCXType(VD->getType(), TU); @@ -174,7 +174,7 @@ } return MakeCXType(QualType(), TU); } - + if (clang_isReference(C.kind)) { switch (C.kind) { case CXCursor_ObjCSuperClassRef: { @@ -182,18 +182,18 @@ = Context.getObjCInterfaceType(getCursorObjCSuperClassRef(C).first); return MakeCXType(T, TU); } - + case CXCursor_ObjCClassRef: { QualType T = Context.getObjCInterfaceType(getCursorObjCClassRef(C).first); return MakeCXType(T, TU); } - + case CXCursor_TypeRef: { QualType T = Context.getTypeDeclType(getCursorTypeRef(C).first); return MakeCXType(T, TU); } - + case CXCursor_CXXBaseSpecifier: return cxtype::MakeCXType(getCursorCXXBaseSpecifier(C)->getType(), TU); @@ -210,7 +210,7 @@ default: break; } - + return MakeCXType(QualType(), TU); } @@ -348,10 +348,10 @@ CXType clang_getPointeeType(CXType CT) { QualType T = GetQualType(CT); const Type *TP = T.getTypePtrOrNull(); - + if (!TP) return MakeCXType(QualType(), GetTU(CT)); - + switch (TP->getTypeClass()) { case Type::Pointer: T = cast(TP)->getPointeeType(); @@ -410,17 +410,17 @@ D = cast(TP)->getTemplateName() .getAsTemplateDecl(); break; - + case Type::InjectedClassName: D = cast(TP)->getDecl(); break; - // FIXME: Template type parameters! + // FIXME: Template type parameters! case Type::Elaborated: TP = cast(TP)->getNamedType().getTypePtrOrNull(); goto try_again; - + default: break; } @@ -442,7 +442,7 @@ TKIND(Char_U); TKIND(UChar); TKIND(Char16); - TKIND(Char32); + TKIND(Char32); TKIND(UShort); TKIND(UInt); TKIND(ULong); @@ -502,7 +502,7 @@ if (T->getAs()) return 1; - + return 0; } @@ -510,7 +510,7 @@ QualType T = GetQualType(X); if (T.isNull()) return CXCallingConv_Invalid; - + if (const FunctionType *FD = T->getAs()) { #define TCALLINGCONV(X) case CC_##X: return CXCallingConv_##X switch (FD->getCallConv()) { @@ -528,7 +528,7 @@ } #undef TCALLINGCONV } - + return CXCallingConv_Invalid; } @@ -536,15 +536,15 @@ QualType T = GetQualType(X); if (T.isNull()) return -1; - + if (const FunctionProtoType *FD = T->getAs()) { return FD->getNumArgs(); } - + if (T->getAs()) { return 0; } - + return -1; } @@ -557,10 +557,10 @@ unsigned numArgs = FD->getNumArgs(); if (i >= numArgs) return MakeCXType(QualType(), GetTU(X)); - + return MakeCXType(FD->getArgType(i), GetTU(X)); } - + return MakeCXType(QualType(), GetTU(X)); } @@ -568,10 +568,10 @@ QualType T = GetQualType(X); if (T.isNull()) return MakeCXType(QualType(), GetTU(X)); - + if (const FunctionType *FD = T->getAs()) return MakeCXType(FD->getResultType(), GetTU(X)); - + return MakeCXType(QualType(), GetTU(X)); } @@ -591,7 +591,7 @@ QualType T = GetQualType(X); if (T.isNull()) return 0; - + CXTranslationUnit TU = GetTU(X); return T.isPODType(cxtu::getASTUnit(TU)->getASTContext()) ? 1 : 0; @@ -871,4 +871,38 @@ return cxstring::createDup(encoding); } +int clang_Type_getNumTemplateArguments(CXType X) { + QualType T = GetQualType(X); + if (T.isNull()) + return -1; + const CXXRecordDecl* RecordDecl = T->getAsCXXRecordDecl(); + if (!RecordDecl) + return -1; + const ClassTemplateSpecializationDecl* TemplateDecl = + dyn_cast_or_null(RecordDecl); + if (!TemplateDecl) + return -1; + return TemplateDecl->getTemplateArgs().size(); +} + +CXType clang_Type_getTemplateArgument(CXType CT, unsigned i) { + QualType T = GetQualType(CT); + if (T.isNull()) + return MakeCXType(QualType(), GetTU(CT)); + const CXXRecordDecl* RecordDecl = T->getAsCXXRecordDecl(); + if (!RecordDecl) + return MakeCXType(QualType(), GetTU(CT)); + const ClassTemplateSpecializationDecl* TemplateDecl = + dyn_cast_or_null(RecordDecl); + if (!TemplateDecl) + return MakeCXType(QualType(), GetTU(CT)); + const TemplateArgumentList& TA = TemplateDecl->getTemplateArgs(); + if (TA.size() <= i) + return MakeCXType(QualType(), GetTU(CT)); + const TemplateArgument& A = TA.get(i); + if (A.getKind() != TemplateArgument::Type) + return MakeCXType(QualType(), GetTU(CT)); + return MakeCXType(A.getAsType(), GetTU(CT)); +} + } // end: extern "C" Index: tools/libclang/libclang.exports =================================================================== --- tools/libclang/libclang.exports (revision 195297) +++ tools/libclang/libclang.exports (working copy) @@ -64,6 +64,8 @@ clang_Type_getClassType clang_Type_getSizeOf clang_Type_getOffsetOf +clang_Type_getNumTemplateArguments +clang_Type_getTemplateArgument clang_Type_getCXXRefQualifier clang_VerbatimBlockLineComment_getText clang_VerbatimLineComment_getText Index: test/Index/print-type.cpp =================================================================== --- test/Index/print-type.cpp (revision 195297) +++ test/Index/print-type.cpp (working copy) @@ -5,10 +5,13 @@ T t; }; +template +struct Baz { }; + namespace inner { struct Bar { - Bar(outer::Foo* foo) { }; + Bar(outer::Foo* foo) { } typedef int FooType; int *p; @@ -18,6 +21,7 @@ } typedef double OtherType; typedef int ArrayType[5]; + Baz baz; }; } @@ -45,37 +49,64 @@ // CHECK: TemplateTypeParameter=T:3:19 (Definition) [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] // CHECK: FieldDecl=t:5:5 (Definition) [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] // CHECK: TypeRef=T:3:19 [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] -// CHECK: Namespace=inner:8:11 (Definition) [type=] [typekind=Invalid] [isPOD=0] -// CHECK: StructDecl=Bar:10:8 (Definition) [type=outer::inner::Bar] [typekind=Record] [isPOD=0] -// CHECK: CXXConstructor=Bar:11:3 (Definition) [type=void (outer::Foo *)] [typekind=FunctionProto] [canonicaltype=void (outer::Foo *)] [canonicaltypekind=FunctionProto] [resulttype=void] [resulttypekind=Void] [args= [outer::Foo *] [Pointer]] [isPOD=0] -// CHECK: ParmDecl=foo:11:25 (Definition) [type=outer::Foo *] [typekind=Pointer] [canonicaltype=outer::Foo *] [canonicaltypekind=Pointer] [isPOD=1] +// CHECK: ClassTemplate=Baz:9:8 (Definition) [type=] [typekind=Invalid] [isPOD=0] +// CHECK: TemplateTypeParameter=T:8:20 (Definition) [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: NonTypeTemplateParameter=U:8:32 (Definition) [type=unsigned int] [typekind=UInt] [isPOD=1] +// CHECK: TemplateTypeParameter=V:8:44 (Definition) [type=V] [typekind=Unexposed] [canonicaltype=type-parameter-0-2] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: Namespace=inner:11:11 (Definition) [type=] [typekind=Invalid] [isPOD=0] +// CHECK: StructDecl=Bar:13:8 (Definition) [type=outer::inner::Bar] [typekind=Record] [isPOD=0] +// CHECK: CXXConstructor=Bar:14:3 (Definition) [type=void (outer::Foo *)] [typekind=FunctionProto] [canonicaltype=void (outer::Foo *)] [canonicaltypekind=FunctionProto] [resulttype=void] [resulttypekind=Void] [args= [outer::Foo *] [Pointer]] [isPOD=0] +// CHECK: ParmDecl=foo:14:25 (Definition) [type=outer::Foo *] [typekind=Pointer] [canonicaltype=outer::Foo *] [canonicaltypekind=Pointer] [isPOD=1] // CHECK: NamespaceRef=outer:1:11 [type=] [typekind=Invalid] [isPOD=0] // CHECK: TemplateRef=Foo:4:8 [type=] [typekind=Invalid] [isPOD=0] // CHECK: CompoundStmt= [type=] [typekind=Invalid] [isPOD=0] -// CHECK: TypedefDecl=FooType:13:15 (Definition) [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] -// CHECK: FieldDecl=p:14:8 (Definition) [type=int *] [typekind=Pointer] [isPOD=1] -// CHECK: CXXMethod=f:15:8 (Definition) [type=int *(int *, char *, FooType)] [typekind=FunctionProto] [canonicaltype=int *(int *, char *, int)] [canonicaltypekind=FunctionProto] [resulttype=int *] [resulttypekind=Pointer] [args= [int *] [Pointer] [char *] [Pointer] [FooType] [Typedef]] [isPOD=0] -// CHECK: ParmDecl=p:15:15 (Definition) [type=int *] [typekind=Pointer] [isPOD=1] -// CHECK: ParmDecl=x:15:24 (Definition) [type=char *] [typekind=Pointer] [isPOD=1] -// CHECK: ParmDecl=z:15:35 (Definition) [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] -// CHECK: TypeRef=FooType:13:15 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: TypedefDecl=FooType:16:15 (Definition) [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: FieldDecl=p:17:8 (Definition) [type=int *] [typekind=Pointer] [isPOD=1] +// CHECK: CXXMethod=f:18:8 (Definition) [type=int *(int *, char *, FooType)] [typekind=FunctionProto] [canonicaltype=int *(int *, char *, int)] [canonicaltypekind=FunctionProto] [resulttype=int *] [resulttypekind=Pointer] [args= [int *] [Pointer] [char *] [Pointer] [FooType] [Typedef]] [isPOD=0] +// CHECK: ParmDecl=p:18:15 (Definition) [type=int *] [typekind=Pointer] [isPOD=1] +// CHECK: ParmDecl=x:18:24 (Definition) [type=char *] [typekind=Pointer] [isPOD=1] +// CHECK: ParmDecl=z:18:35 (Definition) [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: TypeRef=FooType:16:15 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] // CHECK: CompoundStmt= [type=] [typekind=Invalid] [isPOD=0] // CHECK: DeclStmt= [type=] [typekind=Invalid] [isPOD=0] -// CHECK: VarDecl=w:16:19 (Definition) [type=const FooType] [typekind=Typedef] const [canonicaltype=const int] [canonicaltypekind=Int] [isPOD=1] -// CHECK: TypeRef=FooType:13:15 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] -// CHECK: DeclRefExpr=z:15:35 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: VarDecl=w:19:19 (Definition) [type=const FooType] [typekind=Typedef] const [canonicaltype=const int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: TypeRef=FooType:16:15 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: UnexposedExpr=z:18:35 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: DeclRefExpr=z:18:35 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] // CHECK: ReturnStmt= [type=] [typekind=Invalid] [isPOD=0] // CHECK: BinaryOperator= [type=int *] [typekind=Pointer] [isPOD=1] -// CHECK: DeclRefExpr=p:15:15 [type=int *] [typekind=Pointer] [isPOD=1] -// CHECK: DeclRefExpr=z:15:35 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] -// CHECK: TypedefDecl=OtherType:19:18 (Definition) [type=OtherType] [typekind=Typedef] [canonicaltype=double] [canonicaltypekind=Double] [isPOD=1] -// CHECK: TypedefDecl=ArrayType:20:15 (Definition) [type=ArrayType] [typekind=Typedef] [canonicaltype=int [5]] [canonicaltypekind=ConstantArray] [isPOD=1] -// CHECK: FunctionTemplate=tbar:27:3 [type=T (int)] [typekind=FunctionProto] [canonicaltype=type-parameter-0-0 (int)] [canonicaltypekind=FunctionProto] [resulttype=T] [resulttypekind=Unexposed] [isPOD=0] -// CHECK: TemplateTypeParameter=T:26:20 (Definition) [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] -// CHECK: FunctionTemplate=tbar:30:3 [type=T (int *)] [typekind=FunctionProto] [canonicaltype=type-parameter-0-0 (int *)] [canonicaltypekind=FunctionProto] [resulttype=T] [resulttypekind=Unexposed] [isPOD=0] -// CHECK: ParmDecl=:30:11 (Definition) [type=int [5]] [typekind=ConstantArray] [isPOD=1] -// CHECK: FunctionTemplate=tbar:33:3 [type=T (int *)] [typekind=FunctionProto] [canonicaltype=type-parameter-0-0 (int *)] [canonicaltypekind=FunctionProto] [resulttype=T] [resulttypekind=Unexposed] [isPOD=0] -// CHECK: ParmDecl=:33:11 (Definition) [type=int [size]] [typekind=DependentSizedArray] [isPOD=0] -// CHECK: ParmDecl=incomplete_array:35:21 (Definition) [type=int []] [typekind=IncompleteArray] [isPOD=1] -// CHECK: VarDecl=variable_array:35:47 (Definition) [type=int [i]] [typekind=VariableArray] [isPOD=1] -// CHECK: VarDecl=member_pointer:40:12 (Definition) [type=int Blob::*] [typekind=MemberPointer] [isPOD=1] +// CHECK: UnexposedExpr=p:18:15 [type=int *] [typekind=Pointer] [isPOD=1] +// CHECK: DeclRefExpr=p:18:15 [type=int *] [typekind=Pointer] [isPOD=1] +// CHECK: UnexposedExpr=z:18:35 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: DeclRefExpr=z:18:35 [type=FooType] [typekind=Typedef] [canonicaltype=int] [canonicaltypekind=Int] [isPOD=1] +// CHECK: TypedefDecl=OtherType:22:18 (Definition) [type=OtherType] [typekind=Typedef] [canonicaltype=double] [canonicaltypekind=Double] [isPOD=1] +// CHECK: TypedefDecl=ArrayType:23:15 (Definition) [type=ArrayType] [typekind=Typedef] [canonicaltype=int [5]] [canonicaltypekind=ConstantArray] [isPOD=1] +// CHECK: IntegerLiteral= [type=int] [typekind=Int] [isPOD=1] +// CHECK: FieldDecl=baz:24:21 (Definition) [type=Baz] [typekind=Unexposed] [canonicaltype=outer::Baz] [canonicaltypekind=Record] [templateargs= [int] [Int] [bool] [Bool]] [isPOD=1] +// CHECK: TemplateRef=Baz:9:8 [type=] [typekind=Invalid] [isPOD=0] +// CHECK: IntegerLiteral= [type=int] [typekind=Int] [isPOD=1] +// CHECK: FunctionTemplate=tbar:31:3 [type=T (int)] [typekind=FunctionProto] [canonicaltype=type-parameter-0-0 (int)] [canonicaltypekind=FunctionProto] [resulttype=T] [resulttypekind=Unexposed] [isPOD=0] +// CHECK: TemplateTypeParameter=T:30:20 (Definition) [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: TypeRef=T:30:20 [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: ParmDecl=:31:11 (Definition) [type=int] [typekind=Int] [isPOD=1] +// CHECK: FunctionTemplate=tbar:34:3 [type=T (int *)] [typekind=FunctionProto] [canonicaltype=type-parameter-0-0 (int *)] [canonicaltypekind=FunctionProto] [resulttype=T] [resulttypekind=Unexposed] [isPOD=0] +// CHECK: TemplateTypeParameter=T:33:20 (Definition) [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: TypeRef=T:33:20 [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: ParmDecl=:34:11 (Definition) [type=int [5]] [typekind=ConstantArray] [isPOD=1] +// CHECK: IntegerLiteral= [type=int] [typekind=Int] [isPOD=1] +// CHECK: FunctionTemplate=tbar:37:3 [type=T (int *)] [typekind=FunctionProto] [canonicaltype=type-parameter-0-0 (int *)] [canonicaltypekind=FunctionProto] [resulttype=T] [resulttypekind=Unexposed] [isPOD=0] +// CHECK: TemplateTypeParameter=T:36:20 (Definition) [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: NonTypeTemplateParameter=size:36:27 (Definition) [type=int] [typekind=Int] [isPOD=1] +// CHECK: TypeRef=T:36:20 [type=T] [typekind=Unexposed] [canonicaltype=type-parameter-0-0] [canonicaltypekind=Unexposed] [isPOD=0] +// CHECK: ParmDecl=:37:11 (Definition) [type=int [size]] [typekind=DependentSizedArray] [isPOD=0] +// CHECK: DeclRefExpr=size:36:27 [type=int] [typekind=Int] [isPOD=1] +// CHECK: FunctionDecl=foo:39:6 (Definition) [type=void (int, int *)] [typekind=FunctionProto] [canonicaltype=void (int, int *)] [canonicaltypekind=FunctionProto] [resulttype=void] [resulttypekind=Void] [args= [int] [Int] [int []] [IncompleteArray]] [isPOD=0] +// CHECK: ParmDecl=i:39:14 (Definition) [type=int] [typekind=Int] [isPOD=1] +// CHECK: ParmDecl=incomplete_array:39:21 (Definition) [type=int []] [typekind=IncompleteArray] [isPOD=1] +// CHECK: CompoundStmt= [type=] [typekind=Invalid] [isPOD=0] +// CHECK: DeclStmt= [type=] [typekind=Invalid] [isPOD=0] +// CHECK: VarDecl=variable_array:39:47 (Definition) [type=int [i]] [typekind=VariableArray] [isPOD=1] +// CHECK: DeclRefExpr=i:39:14 [type=int] [typekind=Int] [isPOD=1] +// CHECK: StructDecl=Blob:41:8 (Definition) [type=Blob] [typekind=Record] [isPOD=1] +// CHECK: FieldDecl=i:42:7 (Definition) [type=int] [typekind=Int] [isPOD=1] +// CHECK: VarDecl=member_pointer:44:12 (Definition) [type=int Blob::*] [typekind=MemberPointer] [isPOD=1]