From 3a7efa22405dd41893f0f1633a2e308bf041305a Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Thu, 5 Apr 2012 16:56:02 +0000 Subject: Improve & simplify diagnostic for missing 'class' in template template parameter. Change suggested by Sebastian Redl on review feedback from r153887. llvm-svn: 154102 --- clang/lib/Parse/ParseTemplate.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'clang/lib/Parse/ParseTemplate.cpp') diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index 17274337ce2..91a9d723a6c 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -541,14 +541,12 @@ Parser::ParseTemplateTemplateParameter(unsigned Depth, unsigned Position) { // Generate a meaningful error if the user forgot to put class before the // identifier, comma, or greater. if (Tok.is(tok::kw_typename) || Tok.is(tok::kw_struct)) { - Diag(Tok.getLocation(), diag::err_expected_class_instead) - << PP.getSpelling(Tok) + Diag(Tok.getLocation(), diag::err_expected_class_on_template_template_param) << FixItHint::CreateReplacement(Tok.getLocation(), "class"); ConsumeToken(); } else if (!Tok.is(tok::kw_class)) - Diag(Tok.getLocation(), diag::err_expected_class_before) - << PP.getSpelling(Tok) - << FixItHint::CreateInsertion(Tok.getLocation(), "class "); + Diag(Tok.getLocation(), diag::err_expected_class_on_template_template_param) + << FixItHint::CreateInsertion(Tok.getLocation(), "class "); else ConsumeToken(); -- cgit v1.2.3