[cfe-commits] r59482 - in /cfe/trunk/lib/Lex: PPMacroExpansion.cpp Pragma.cpp

[Ted Kremenek]

Author: kremenek
Date: Mon Nov 17 19:12:54 2008
New Revision: 59482

URL: http://llvm.org/viewvc/llvm-project?rev=59482&view=rev
Log:
Replace more uses of 'CurLexer->' with 'CurPPLexer->'.  No performance change.

Modified:
    cfe/trunk/lib/Lex/PPMacroExpansion.cpp
    cfe/trunk/lib/Lex/Pragma.cpp

Modified: cfe/trunk/lib/Lex/PPMacroExpansion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=59482&r1=59481&r2=59482&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Mon Nov 17 19:12:54 2008
@@ -148,7 +148,7 @@
   // If this is a macro exapnsion in the "#if !defined(x)" line for the file,
   // then the macro could expand to different things in other contexts, we need
   // to disable the optimization in this case.
-  if (CurLexer) CurLexer->MIOpt.ExpandedMacro();
+  if (CurPPLexer) CurPPLexer->MIOpt.ExpandedMacro();
   
   // If this is a builtin macro, like __LINE__ or _Pragma, handle it specially.
   if (MI->isBuiltinMacro()) {

Modified: cfe/trunk/lib/Lex/Pragma.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Pragma.cpp?rev=59482&r1=59481&r2=59482&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/Pragma.cpp (original)
+++ cfe/trunk/lib/Lex/Pragma.cpp Mon Nov 17 19:12:54 2008
@@ -89,7 +89,7 @@
   PragmaHandlers->HandlePragma(*this, Tok);
   
   // If the pragma handler didn't read the rest of the line, consume it now.
-  if (CurLexer->ParsingPreprocessorDirective)
+  if (CurPPLexer->ParsingPreprocessorDirective)
     DiscardUntilEndOfDirective();
 }
 
@@ -203,9 +203,9 @@
     // This avoids errors on code like:
     //   #pragma GCC poison X
     //   #pragma GCC poison X
-    if (CurLexer) CurLexer->LexingRawMode = true;
+    if (CurPPLexer) CurPPLexer->LexingRawMode = true;
     LexUnexpandedToken(Tok);
-    if (CurLexer) CurLexer->LexingRawMode = false;
+    if (CurPPLexer) CurPPLexer->LexingRawMode = false;
     
     // If we reached the end of line, we're done.
     if (Tok.is(tok::eom)) return;
@@ -257,7 +257,7 @@
 ///
 void Preprocessor::HandlePragmaDependency(Token &DependencyTok) {
   Token FilenameTok;
-  CurLexer->LexIncludeFilename(FilenameTok);
+  CurPPLexer->LexIncludeFilename(FilenameTok);
 
   // If the token kind is EOM, the error has already been diagnosed.
   if (FilenameTok.is(tok::eom))