Parse: Get rid of tok::cxx_defaultarg_end, use EOF instead
I added setEofData/getEofData to solve this sort of problem back in
r224505. Use the Param's decl to tell us if this is *our* EOF token.
llvm-svn: 225619
diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp
index ccd0517..375041e 100644
--- a/clang/lib/Parse/ParseCXXInlineMethods.cpp
+++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp
@@ -342,7 +342,9 @@
Actions.ActOnParamDefaultArgumentError(LM.DefaultArgs[I].Param,
EqualLoc);
else {
- if (!TryConsumeToken(tok::cxx_defaultarg_end)) {
+ if (Tok.is(tok::eof) && Tok.getEofData() == LM.DefaultArgs[I].Param) {
+ ConsumeAnyToken();
+ } else {
// The last two tokens are the terminator and the saved value of
// Tok; the last token in the default argument is the one before
// those.
@@ -360,8 +362,11 @@
"ParseAssignmentExpression went over the default arg tokens!");
// There could be leftover tokens (e.g. because of an error).
// Skip through until we reach the original token position.
- while (Tok.getLocation() != origLoc && Tok.isNot(tok::eof))
+ while (Tok.getLocation() != origLoc) {
+ if (Tok.is(tok::eof) && Tok.getEofData() != LM.DefaultArgs[I].Param)
+ break;
ConsumeAnyToken();
+ }
delete Toks;
LM.DefaultArgs[I].Toks = nullptr;
@@ -652,7 +657,6 @@
switch (Tok.getKind()) {
case tok::eof:
- case tok::cxx_defaultarg_end:
case tok::annot_module_begin:
case tok::annot_module_end:
case tok::annot_module_include: