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

[Ted Kremenek]

Author: kremenek
Date: Wed Nov 19 16:55:25 2008
New Revision: 59672

URL: http://llvm.org/viewvc/llvm-project?rev=59672&view=rev
Log:
Use PreprocessorLexer::getFileID() instead of Lexer::getFileLoc().  This is an intermediate step to having getCurrentLexer() return a PreprocessorLexer* instead of a Lexer*.

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

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

==============================================================================
--- cfe/trunk/lib/Lex/PPDirectives.cpp (original)
+++ cfe/trunk/lib/Lex/PPDirectives.cpp Wed Nov 19 16:55:25 2008
@@ -692,7 +692,7 @@
   // header.
   SrcMgr::CharacteristicKind FileCharacter = 
     std::max(HeaderInfo.getFileDirFlavor(File),
-          SourceMgr.getFileCharacteristic(getCurrentFileLexer()->getFileLoc()));
+          SourceMgr.getFileCharacteristic(getCurrentFileLexer()->getFileID()));
   
   // Look up the file, create a File ID for it.
   unsigned FileID = SourceMgr.createFileID(File, FilenameTok.getLocation(),

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

==============================================================================
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Wed Nov 19 16:55:25 2008
@@ -513,7 +513,7 @@
     Lexer *TheLexer = getCurrentFileLexer();
     
     if (TheLexer)
-      CurFile = SourceMgr.getFileEntryForLoc(TheLexer->getFileLoc());
+      CurFile = SourceMgr.getFileEntryForID(TheLexer->getFileID());
     
     // If this file is older than the file it depends on, emit a diagnostic.
     const char *Result;

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

==============================================================================
--- cfe/trunk/lib/Lex/Pragma.cpp (original)
+++ cfe/trunk/lib/Lex/Pragma.cpp Wed Nov 19 16:55:25 2008
@@ -186,10 +186,10 @@
   }
   
   // Get the current file lexer we're looking at.  Ignore _Pragma 'files' etc.
-  SourceLocation FileLoc = getCurrentFileLexer()->getFileLoc();
+  unsigned FileID = getCurrentFileLexer()->getFileID();
   
   // Mark the file as a once-only file now.
-  HeaderInfo.MarkFileIncludeOnce(SourceMgr.getFileEntryForLoc(FileLoc));
+  HeaderInfo.MarkFileIncludeOnce(SourceMgr.getFileEntryForID(FileID));
 }
 
 void Preprocessor::HandlePragmaMark() {
@@ -251,7 +251,7 @@
   Lexer *TheLexer = getCurrentFileLexer();
   
   // Mark the file as a system header.
-  const FileEntry *File = SourceMgr.getFileEntryForLoc(TheLexer->getFileLoc());
+  const FileEntry *File = SourceMgr.getFileEntryForID(TheLexer->getFileID());
   HeaderInfo.MarkFileSystemHeader(File);
   
   // Notify the client, if desired, that we are in a new source file.
@@ -294,8 +294,8 @@
     return;
   }
   
-  SourceLocation FileLoc = getCurrentFileLexer()->getFileLoc();
-  const FileEntry *CurFile = SourceMgr.getFileEntryForLoc(FileLoc);
+  unsigned FileID = getCurrentFileLexer()->getFileID();
+  const FileEntry *CurFile = SourceMgr.getFileEntryForID(FileID);
 
   // If this file is older than the file it depends on, emit a diagnostic.
   if (CurFile && CurFile->getModificationTime() < File->getModificationTime()) {