summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseTemplate.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2009-12-27 22:31:18 +0000
committerEli Friedman <eli.friedman@gmail.com>2009-12-27 22:31:18 +0000
commitaffd5fdf37b1349dbce9a74540f7e7407c3e4a7b (patch)
tree31d22274603ad3bb91aa09d7ceb0d410c6a8c3cc /clang/lib/Parse/ParseTemplate.cpp
parent73d50b91413d2770f0ee767b86bae861229273ef (diff)
downloadbcm5719-llvm-affd5fdf37b1349dbce9a74540f7e7407c3e4a7b.tar.gz
bcm5719-llvm-affd5fdf37b1349dbce9a74540f7e7407c3e4a7b.zip
Make sure to give an error for template argument lists followed by junk.
llvm-svn: 92177
Diffstat (limited to 'clang/lib/Parse/ParseTemplate.cpp')
-rw-r--r--clang/lib/Parse/ParseTemplate.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index cc28541b01f..8b8af99ec6d 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/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
OpenPOWER on IntegriCloud