Handle parsing of templates in member declarations. Pass the AccessSpecifier all the way down to ActOnClassTemplate.
Doug, Sebastian: Plz review! :)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67723 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 1bbf411..61182ef 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -460,7 +460,8 @@
Attr,
Action::MultiTemplateParamsArg(Actions,
&(*TemplateParams)[0],
- TemplateParams->size()));
+ TemplateParams->size()),
+ AS);
else
TagOrTempResult = Actions.ActOnTag(CurScope, TagType, TK, StartLoc, SS, Name,
NameLoc, Attr, AS);
@@ -615,7 +616,7 @@
/// ::[opt] nested-name-specifier template[opt] unqualified-id ';'[TODO]
/// using-declaration [TODO]
/// [C++0x] static_assert-declaration
-/// template-declaration [TODO]
+/// template-declaration
/// [GNU] '__extension__' member-declaration
///
/// member-declarator-list:
@@ -638,6 +639,10 @@
if (Tok.is(tok::kw_static_assert))
return ParseStaticAssertDeclaration();
+ if (Tok.is(tok::kw_template))
+ return ParseTemplateDeclarationOrSpecialization(Declarator::MemberContext,
+ AS);
+
// Handle: member-declaration ::= '__extension__' member-declaration
if (Tok.is(tok::kw___extension__)) {
// __extension__ silences extension warnings in the subexpression.