commit 524734351dd3a2c625d8a7fb131ee8a424b3a00b
author Douglas Gregor <doug.gregor@gmail.com> Wed Dec 24 02:52:09 2008 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Wed Dec 24 02:52:09 2008 +0000
tree 9f49436d6c7742234922d2fe5d16f29ade8c0edb
parent 7efc24be89393d3921be2368df450dfc7ce827d4

Keep track of template arguments when we parse them. Right now, we don't actually do anything with the template arguments, but they'll be used to create template declarations

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61413 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 213a210..c7f92cf 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -419,7 +419,8 @@
 /// [C++]   'virtual'
 /// [C++]   'explicit'
 ///
-void Parser::ParseDeclarationSpecifiers(DeclSpec &DS)
+void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
+                                        TemplateParameterLists *TemplateParams)
 {
   DS.SetRangeStart(Tok.getLocation());
   while (1) {
@@ -436,7 +437,7 @@
     default: 
       // Try to parse a type-specifier; if we found one, continue. If it's not
       // a type, this falls through.
-      if (MaybeParseTypeSpecifier(DS, isInvalid, PrevSpec)) {
+      if (MaybeParseTypeSpecifier(DS, isInvalid, PrevSpec, TemplateParams)) {
         continue;
       }
 
@@ -661,7 +662,8 @@
 /// [OBJC]  class-name objc-protocol-refs[opt]    [TODO]
 /// [OBJC]  typedef-name objc-protocol-refs[opt]  [TODO]
 bool Parser::MaybeParseTypeSpecifier(DeclSpec &DS, int& isInvalid,
-                                     const char *&PrevSpec) {
+                                     const char *&PrevSpec,
+                                     TemplateParameterLists *TemplateParams) {
   // Annotate typenames and C++ scope specifiers.
   TryAnnotateTypeOrScopeToken();
 
@@ -748,7 +750,7 @@
   case tok::kw_class:
   case tok::kw_struct:
   case tok::kw_union:
-    ParseClassSpecifier(DS);
+    ParseClassSpecifier(DS, TemplateParams);
     return true;
 
   // enum-specifier:
@@ -1036,7 +1038,8 @@
   else
     TK = Action::TK_Reference;
   DeclTy *TagDecl = Actions.ActOnTag(CurScope, DeclSpec::TST_enum, TK, StartLoc,
-                                     SS, Name, NameLoc, Attr);
+                                     SS, Name, NameLoc, Attr, 
+                                     Action::MultiTemplateParamsArg(Actions));
   
   if (Tok.is(tok::l_brace))
     ParseEnumBody(StartLoc, TagDecl);