commit 01afeeff1dc780e577fb6ebc0919ce3a92fd8bf1
author Douglas Gregor <dgregor@apple.com> Fri Aug 28 20:31:08 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Aug 28 20:31:08 2009 +0000
tree 79b5c5eb1ef4aa106bc5dec321e81de1ee64281d
parent d65d22a0c5202ed65e8f54834c34f9c12dca430b

Implement template instantiation for member class templates.

When performing template instantiation of the definitions of member
templates (or members thereof),  we build a data structure containing
the template arguments from each "level" of template
instantiation. During template instantiation, we substitute all levels
of template arguments simultaneously. 

llvm-svn: 80389

clang/lib/Sema/Sema.h

diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h
index d710544..1a062b7 100644
--- a/clang/lib/Sema/Sema.h
+++ b/clang/lib/Sema/Sema.h
@@ -2903,29 +2903,28 @@
 
   void PerformPendingImplicitInstantiations();
   
-  QualType SubstType(QualType T, const TemplateArgumentList &TemplateArgs,
+  QualType SubstType(QualType T, 
+                     const MultiLevelTemplateArgumentList &TemplateArgs,
                      SourceLocation Loc, DeclarationName Entity);
   
-  OwningExprResult SubstExpr(Expr *E, const TemplateArgumentList &TemplateArgs);
+  OwningExprResult SubstExpr(Expr *E, 
+                            const MultiLevelTemplateArgumentList &TemplateArgs);
 
-  OwningStmtResult SubstStmt(Stmt *S, const TemplateArgumentList &TemplateArgs);
+  OwningStmtResult SubstStmt(Stmt *S, 
+                            const MultiLevelTemplateArgumentList &TemplateArgs);
 
   Decl *SubstDecl(Decl *D, DeclContext *Owner,
-                  const TemplateArgumentList &TemplateArgs);
+                  const MultiLevelTemplateArgumentList &TemplateArgs);
 
   bool 
   SubstBaseSpecifiers(CXXRecordDecl *Instantiation,
                       CXXRecordDecl *Pattern,
-                      const TemplateArgumentList &TemplateArgs);
-
-  bool
-  InstantiateTemplatePattern(SourceLocation PointOfInstantiation,
-                             CXXRecordDecl *Pattern);
+                      const MultiLevelTemplateArgumentList &TemplateArgs);
 
   bool
   InstantiateClass(SourceLocation PointOfInstantiation,
                    CXXRecordDecl *Instantiation, CXXRecordDecl *Pattern,
-                   const TemplateArgumentList &TemplateArgs,
+                   const MultiLevelTemplateArgumentList &TemplateArgs,
                    bool ExplicitInstantiation,
                    bool Complain = true);
 
@@ -2936,7 +2935,7 @@
 
   void InstantiateClassMembers(SourceLocation PointOfInstantiation,
                                CXXRecordDecl *Instantiation,
-                               const TemplateArgumentList &TemplateArgs);
+                            const MultiLevelTemplateArgumentList &TemplateArgs);
 
   void InstantiateClassTemplateSpecializationMembers(
                                           SourceLocation PointOfInstantiation,
@@ -2945,13 +2944,13 @@
   NestedNameSpecifier *
   SubstNestedNameSpecifier(NestedNameSpecifier *NNS,
                            SourceRange Range,
-                           const TemplateArgumentList &TemplateArgs);
+                           const MultiLevelTemplateArgumentList &TemplateArgs);
 
   TemplateName
   SubstTemplateName(TemplateName Name, SourceLocation Loc,
-                    const TemplateArgumentList &TemplateArgs);
+                    const MultiLevelTemplateArgumentList &TemplateArgs);
   TemplateArgument Subst(TemplateArgument Arg,
-                         const TemplateArgumentList &TemplateArgs);
+                         const MultiLevelTemplateArgumentList &TemplateArgs);
 
   void InstantiateFunctionDefinition(SourceLocation PointOfInstantiation,
                                      FunctionDecl *Function,