rename HandleEndOfMacro -> HandleEndOfTokenLexer

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@48076 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 10 insertions, 11 deletions

diff --git a/Lex/Preprocessor.cpp b/Lex/Preprocessor.cpp
index d8865441b0..16abbc5fe8 100644
--- a/Lex/Preprocessor.cpp
+++ b/Lex/Preprocessor.cpp
@@ -1333,9 +1333,9 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
   return true;
 }
 
-/// HandleEndOfMacro - This callback is invoked when the lexer hits the end of
-/// the current macro expansion or token stream expansion.
-bool Preprocessor::HandleEndOfMacro(Token &Result) {
+/// HandleEndOfTokenLexer - This callback is invoked when the current TokenLexer
+/// hits the end of its token stream.
+bool Preprocessor::HandleEndOfTokenLexer(Token &Result) {
   assert(CurTokenLexer && !CurLexer &&
          "Ending a macro when currently in a #include file!");
 
@@ -1382,7 +1382,7 @@ void Preprocessor::HandleMicrosoftCommentPaste(Token &Tok) {
   // Okay, we either found and switched over the lexer, or we didn't find a
   // lexer.  In either case, finish off the macro the comment came from, getting
   // the next token.
-  if (!HandleEndOfMacro(Tok)) Lex(Tok);
+  if (!HandleEndOfTokenLexer(Tok)) Lex(Tok);
   
   // Discarding comments as long as we don't have EOF or EOM.  This 'comments
   // out' the rest of the line, including any tokens that came from other macros
diff --git a/Lex/TokenLexer.cpp b/Lex/TokenLexer.cpp
index 2a5d6c5cf5..c91b753b6a 100644
--- a/Lex/TokenLexer.cpp
+++ b/Lex/TokenLexer.cpp
@@ -281,11 +281,11 @@ void TokenLexer::Lex(Token &Tok) {
     // Pop this context off the preprocessors lexer stack and get the next
     // token.  This will delete "this" so remember the PP instance var.
     Preprocessor &PPCache = PP;
-    if (PP.HandleEndOfMacro(Tok))
+    if (PP.HandleEndOfTokenLexer(Tok))
       return;
 
-    // HandleEndOfMacro may not return a token.  If it doesn't, lex whatever is
-    // next.
+    // HandleEndOfTokenLexer may not return a token.  If it doesn't, lex
+    // whatever is next.
     return PPCache.Lex(Tok);
   }
   
diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h
index c11e547b5d..fd12946a46 100644
--- a/include/clang/Lex/Preprocessor.h
+++ b/include/clang/Lex/Preprocessor.h
@@ -360,10 +360,9 @@ public:
   /// client should call lex again.
   bool HandleEndOfFile(Token &Result, bool isEndOfMacro = false);
   
-  /// HandleEndOfMacro - This callback is invoked when the lexer hits the end of
-  /// the current macro line.  It returns true if Result is filled in with a
-  /// token, or false if Lex should be called again.
-  bool HandleEndOfMacro(Token &Result);
+  /// HandleEndOfTokenLexer - This callback is invoked when the current
+  /// TokenLexer hits the end of its token stream.
+  bool HandleEndOfTokenLexer(Token &Result);
   
   /// HandleDirective - This callback is invoked when the lexer sees a # token
   /// at the start of a line.  This consumes the directive, modifies the