diff options
| -rw-r--r-- | lib/Parse/ParseTemplate.cpp | 6 | ||||
| -rw-r--r-- | test/Parser/cxx-template-argument.cpp | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp index cc28541b01..8b8af99ec6 100644 --- a/lib/Parse/ParseTemplate.cpp +++ b/lib/Parse/ParseTemplate.cpp @@ -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 diff --git a/test/Parser/cxx-template-argument.cpp b/test/Parser/cxx-template-argument.cpp new file mode 100644 index 0000000000..80389a07b0 --- /dev/null +++ b/test/Parser/cxx-template-argument.cpp @@ -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}} + |