maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use PreprocessorLexer::getFileID() instead of Lexer::getFileLoc(). This is an intermediate step to having getCurrentLexer() return a PreprocessorLexer* instead of a Lexer*. 

llvm-svn: 59672
This commit is contained in:
Ted Kremenek 2008-11-19 22:55:25 +00:00
parent a2c3c8d71c
commit 2861cf42fe
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Lex/PPDirectives.cpp
View File

@ -692,7 +692,7 @@ void Preprocessor::HandleIncludeDirective(Token &IncludeTok,
// 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(),

2
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -513,7 +513,7 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
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;

10
clang/lib/Lex/Pragma.cpp
View File

@ -186,10 +186,10 @@ void Preprocessor::HandlePragmaOnce(Token &OnceTok) {
}
// 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 @@ void Preprocessor::HandlePragmaSystemHeader(Token &SysHeaderTok) {
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 @@ void Preprocessor::HandlePragmaDependency(Token &DependencyTok) {
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()) {