I'm sorry, I misread the entire test case. I thought the last line was a definition of an enum member of a nested class in a class template, not a top-level enum template. My bad!
On Apr 1, 2013, at 14:59 , Richard Smith <[email protected]> wrote: > On Mon, Apr 1, 2013 at 2:55 PM, Jordan Rose <[email protected]> wrote: > If this is never legal, why can't we warn about this in the template > declaration? > > What do you mean by "this"? > > And, why isn't this legal? You can have "enum E : T" directly in a class > template [temp.mem.enum], as well as class members [temp.mem.class]. > > I assume both of these questions have good answers; I'm just curious. > Jordan > > > On Apr 1, 2013, at 14:43 , Richard Smith <[email protected]> wrote: > >> Author: rsmith >> Date: Mon Apr 1 16:43:41 2013 >> New Revision: 178502 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=178502&view=rev >> Log: >> PR15633: Note that we are EnteringContext when parsing the nested name >> specifier for an enumeration. Also fix a crash-on-invalid if a non-dependent >> name specifier is used to declare an enum template. >> >> Modified: >> cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td >> cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td >> cfe/trunk/lib/Parse/ParseDecl.cpp >> cfe/trunk/lib/Sema/SemaDecl.cpp >> cfe/trunk/test/SemaCXX/enum-scoped.cpp >> >> Modified: cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td?rev=178502&r1=178501&r2=178502&view=diff >> ============================================================================== >> --- cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td (original) >> +++ cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td Mon Apr 1 >> 16:43:41 2013 >> @@ -77,6 +77,7 @@ def note_decl_hiding_tag_type : Note< >> "%1 %0 is hidden by a non-type declaration of %0 here">; >> def err_attribute_not_type_attr : Error< >> "%0 attribute cannot be applied to types">; >> +def err_enum_template : Error<"enumeration cannot be a template">; >> >> // Sema && Lex >> def ext_c99_longlong : Extension< >> >> Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=178502&r1=178501&r2=178502&view=diff >> ============================================================================== >> --- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original) >> +++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Mon Apr 1 >> 16:43:41 2013 >> @@ -556,7 +556,6 @@ def err_explicit_instantiation_with_defi >> "explicit template instantiation cannot have a definition; if this " >> "definition is meant to be an explicit specialization, add '<>' after >> the " >> "'template' keyword">; >> -def err_enum_template : Error<"enumeration cannot be a template">; >> def err_explicit_instantiation_enum : Error< >> "enumerations cannot be explicitly instantiated">; >> def err_expected_template_parameter : Error<"expected template parameter">; >> >> Modified: cfe/trunk/lib/Parse/ParseDecl.cpp >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=178502&r1=178501&r2=178502&view=diff >> ============================================================================== >> --- cfe/trunk/lib/Parse/ParseDecl.cpp (original) >> +++ cfe/trunk/lib/Parse/ParseDecl.cpp Mon Apr 1 16:43:41 2013 >> @@ -3262,7 +3262,7 @@ void Parser::ParseEnumSpecifier(SourceLo >> ColonProtectionRAIIObject X(*this, AllowFixedUnderlyingType); >> >> if (ParseOptionalCXXScopeSpecifier(SS, ParsedType(), >> - /*EnteringContext=*/false)) >> + /*EnteringContext=*/true)) >> return; >> >> if (SS.isSet() && Tok.isNot(tok::identifier)) { >> >> Modified: cfe/trunk/lib/Sema/SemaDecl.cpp >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=178502&r1=178501&r2=178502&view=diff >> ============================================================================== >> --- cfe/trunk/lib/Sema/SemaDecl.cpp (original) >> +++ cfe/trunk/lib/Sema/SemaDecl.cpp Mon Apr 1 16:43:41 2013 >> @@ -9387,6 +9387,11 @@ Decl *Sema::ActOnTag(Scope *S, unsigned >> TUK == TUK_Friend, >> isExplicitSpecialization, >> Invalid)) { >> + if (Kind == TTK_Enum) { >> + Diag(KWLoc, diag::err_enum_template); >> + return 0; >> + } >> + >> if (TemplateParams->size() > 0) { >> // This is a declaration or definition of a class template (which may >> // be a member of another template). >> >> Modified: cfe/trunk/test/SemaCXX/enum-scoped.cpp >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/enum-scoped.cpp?rev=178502&r1=178501&r2=178502&view=diff >> ============================================================================== >> --- cfe/trunk/test/SemaCXX/enum-scoped.cpp (original) >> +++ cfe/trunk/test/SemaCXX/enum-scoped.cpp Mon Apr 1 16:43:41 2013 >> @@ -252,3 +252,17 @@ namespace pr13128 { >> enum class E { C }; >> }; >> } >> + >> +namespace PR15633 { >> + template<typename T> struct A { >> + struct B { >> + enum class E : T; >> + enum class E2 : T; >> + }; >> + }; >> + template<typename T> enum class A<T>::B::E { e }; >> + template class A<int>; >> + >> + struct B { enum class E; }; >> + template<typename T> enum class B::E { e }; // expected-error >> {{enumeration cannot be a template}} >> +} >> >> >> _______________________________________________ >> cfe-commits mailing list >> [email protected] >> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits > > >
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
