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

Make sure to give an error for template argument lists followed by junk. 

llvm-svn: 92177
This commit is contained in:
Eli Friedman 2009-12-27 22:31:18 +00:00
parent 73d50b9141
commit affd5fdf37
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Parse/ParseTemplate.cpp
View File

@ -643,8 +643,10 @@ Parser::ParseTemplateIdAfterTemplateName(TemplateTy Template,
}
}
if (Tok.isNot(tok::greater) && Tok.isNot(tok::greatergreater))
if (Tok.isNot(tok::greater) && Tok.isNot(tok::greatergreater)) {
Diag(Tok.getLocation(), diag::err_expected_greater);
return true;
}
// Determine the location of the '>' or '>>'. Only consume this
// token if the caller asked us to.
@ -989,7 +991,7 @@ Parser::ParseTemplateArgumentList(TemplateArgList &TemplateArgs) {
ConsumeToken();
}
return Tok.isNot(tok::greater) && Tok.isNot(tok::greatergreater);
return false;
}
/// \brief Parse a C++ explicit template instantiation

9
clang/test/Parser/cxx-template-argument.cpp Normal file
View File

@ -0,0 +1,9 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
template<typename T> struct A {};
// Check for template argument lists followed by junk
// FIXME: The diagnostics here aren't great...
A<int+> int x; // expected-error {{expected '>'}} expected-error {{expected unqualified-id}}
A<int x; // expected-error {{expected '>'}} expected-error {{C++ requires a type specifier for all declarations}}