replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Permit the use of typedefs of class template specializations in 

qualified declarator-ids. This patch is actually due to Cornelius;
fixes PR6179.

llvm-svn: 96082
This commit is contained in:
Douglas Gregor 2010-02-13 05:23:25 +00:00
parent 5e7f705934
commit af050cb73a
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -1108,9 +1108,6 @@ def err_template_tag_noparams : Error<
def err_template_decl_ref : Error<
"cannot refer to class template %0 without a template argument list">;
def err_typedef_in_def_scope : Error<
"cannot use typedef %0 in scope specifier for out-of-line declaration">;
// C++ Template Argument Lists
def err_template_arg_list_different_arity : Error<
"%select{too few|too many}0 template arguments for "

16
clang/lib/Sema/SemaTemplate.cpp
View File

@ -1235,18 +1235,14 @@ Sema::MatchTemplateParametersToScopeSpecifier(SourceLocation DeclStartLoc,
// such a member, the member declaration shall be preceded by a
// template<> for each enclosing class template that is
// explicitly specialized.
// We interpret this as forbidding typedefs of template
// specializations in the scope specifiers of out-of-line decls.
if (const TypedefType *TT = dyn_cast<TypedefType>(T)) {
const Type *UnderlyingT = TT->LookThroughTypedefs().getTypePtr();
if (isa<TemplateSpecializationType>(UnderlyingT))
// FIXME: better source location information.
Diag(DeclStartLoc, diag::err_typedef_in_def_scope) << QualType(T,0);
T = UnderlyingT;
}
//
// Following the existing practice of GNU and EDG, we allow a typedef of a
// template specialization type.
if (const TypedefType *TT = dyn_cast<TypedefType>(T))
T = TT->LookThroughTypedefs().getTypePtr();
if (const TemplateSpecializationType *SpecType
= dyn_cast<TemplateSpecializationType>(T)) {
= dyn_cast<TemplateSpecializationType>(T)) {
TemplateDecl *Template = SpecType->getTemplateName().getAsTemplateDecl();
if (!Template)
continue; // FIXME: should this be an error? probably...

15
clang/test/CXX/temp/temp.spec/temp.expl.spec/p17.cpp
View File

@ -18,7 +18,18 @@ namespace test1 {
};
typedef A<int> AA;
template <> int AA::foo = 0; // expected-error {{cannot use typedef}}
int AA::bar = 1; // expected-error {{cannot use typedef}} expected-error {{template specialization requires 'template<>'}}
template <> int AA::foo = 0;
int AA::bar = 1; // expected-error {{template specialization requires 'template<>'}}
int A<float>::bar = 2; // expected-error {{template specialization requires 'template<>'}}
template <> class A<double> {
public:
static int foo; // expected-note{{attempt to specialize}}
static int bar;
};
typedef A<double> AB;
template <> int AB::foo = 0; // expected-error{{extraneous 'template<>'}} \
// expected-error{{does not specialize}}
int AB::bar = 1;
}