From cd72ba97e73f514ccb12212184e1312268b8bebe Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 6 Feb 2009 22:42:48 +0000 Subject: Semantic checking for class template declarations and redeclarations. For example, checks that a class template redeclaration has the same template parameters as previous declarations. Detangled class-template checking from ActOnTag, whose logic was getting rather convoluted because it tried to handle C, C++, and C++ template semantics in one shot. Made some inroads toward eliminating extraneous "declaration does not declare anything" errors by adding an "error" type specifier. llvm-svn: 63973 --- clang/lib/Parse/ParseTemplate.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'clang/lib/Parse/ParseTemplate.cpp') diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index e95c106f28f..8836106e399 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -247,9 +247,9 @@ Parser::ParseTemplateTemplateParameter(unsigned Depth, unsigned Position) { // Handle the template <...> part. SourceLocation TemplateLoc = ConsumeToken(); TemplateParameterList TemplateParams; - SourceLocation LParenLoc, RParenLoc; - if(!ParseTemplateParameters(Depth + 1, TemplateParams, LParenLoc, - RParenLoc)) { + SourceLocation LAngleLoc, RAngleLoc; + if(!ParseTemplateParameters(Depth + 1, TemplateParams, LAngleLoc, + RAngleLoc)) { return 0; } @@ -288,8 +288,15 @@ Parser::ParseTemplateTemplateParameter(unsigned Depth, unsigned Position) { } } + TemplateParamsTy *ParamList = + Actions.ActOnTemplateParameterList(Depth, SourceLocation(), + TemplateLoc, LAngleLoc, + &TemplateParams[0], + TemplateParams.size(), + RAngleLoc); + return Actions.ActOnTemplateTemplateParameter(CurScope, TemplateLoc, - &TemplateParams, ParamName, + ParamList, ParamName, NameLoc, Depth, Position); } -- cgit v1.2.3