diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2009-06-14 09:24:02 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2009-06-14 09:24:02 +0000 |
| commit | 7ef7bab7e3d06f660b059b903c231f100bb13cc5 (patch) | |
| tree | d472a7615b5c7e413aa62a77d0777c1a9cf76478 /lib/AST/DeclTemplate.cpp | |
| parent | 8ba99c00327a4394e7568244d6cffd6e62625a7a (diff) | |
Import Clang r73340.vendor/clang/clang-r73340
Notes
svn path=/vendor/clang/dist/; revision=194179
svn path=/vendor/clang/clang-r73340/; revision=194181; tag=vendor/clang/clang-r73340
Diffstat (limited to 'lib/AST/DeclTemplate.cpp')
| -rw-r--r-- | lib/AST/DeclTemplate.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/lib/AST/DeclTemplate.cpp b/lib/AST/DeclTemplate.cpp index a53416433e03..5b1bf9b3afc5 100644 --- a/lib/AST/DeclTemplate.cpp +++ b/lib/AST/DeclTemplate.cpp @@ -50,7 +50,9 @@ unsigned TemplateParameterList::getMinRequiredArguments() const { ParamBegin = const_cast<TemplateParameterList *>(this)->begin(); while (Param != ParamBegin) { --Param; - if (!(isa<TemplateTypeParmDecl>(*Param) && + + if (!(*Param)->isTemplateParameterPack() && + !(isa<TemplateTypeParmDecl>(*Param) && cast<TemplateTypeParmDecl>(*Param)->hasDefaultArgument()) && !(isa<NonTypeTemplateParmDecl>(*Param) && cast<NonTypeTemplateParmDecl>(*Param)->hasDefaultArgument()) && @@ -186,9 +188,10 @@ QualType ClassTemplateDecl::getInjectedClassNameType(ASTContext &Context) { TemplateTypeParmDecl * TemplateTypeParmDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L, unsigned D, unsigned P, - IdentifierInfo *Id, bool Typename) { + IdentifierInfo *Id, bool Typename, + bool ParameterPack) { QualType Type = C.getTemplateTypeParmType(D, P, Id); - return new (C) TemplateTypeParmDecl(DC, L, Id, Typename, Type); + return new (C) TemplateTypeParmDecl(DC, L, Id, Typename, Type, ParameterPack); } //===----------------------------------------------------------------------===// @@ -246,9 +249,27 @@ void TemplateArgumentListBuilder::push_back(const TemplateArgument& Arg) { break; } + if (!isAddingFromParameterPack()) { + // Add begin and end indicies. + Indices.push_back(Args.size()); + Indices.push_back(Args.size()); + } + Args.push_back(Arg); } +void TemplateArgumentListBuilder::BeginParameterPack() { + assert(!isAddingFromParameterPack() && "Already adding to parameter pack!"); + + Indices.push_back(Args.size()); +} + +void TemplateArgumentListBuilder::EndParameterPack() { + assert(isAddingFromParameterPack() && "Not adding to parameter pack!"); + + Indices.push_back(Args.size()); +} + //===----------------------------------------------------------------------===// // TemplateArgumentList Implementation //===----------------------------------------------------------------------===// |