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

Fix misleading parameter name for PPCallbacks::FileSkipped. 

Patch thanks to Vladimir Voskresensky.

llvm-svn: 237115
This commit is contained in:
Nikola Smiljanic 2015-05-12 11:48:05 +00:00
parent 56807c19ac
commit fb891fcef6
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/include/clang/Lex/PPCallbacks.h
View File

@ -55,11 +55,12 @@ public:
/// \brief Callback invoked whenever a source file is skipped as the result /// \brief Callback invoked whenever a source file is skipped as the result
/// of header guard optimization. /// of header guard optimization.
/// ///
/// \param ParentFile The file that \#included the skipped file. /// \param SkippedFile The file that is skipped instead of entering \#include
/// ///
/// \param FilenameTok The token in ParentFile that indicates the /// \param FilenameTok The file name token in \#include "FileName" directive
/// skipped file. /// or macro expanded file name token from \#include MACRO(PARAMS) directive.
virtual void FileSkipped(const FileEntry &ParentFile, /// Note that FilenameTok contains corresponding quotes/angles symbols.
virtual void FileSkipped(const FileEntry &SkippedFile,
const Token &FilenameTok, const Token &FilenameTok,
SrcMgr::CharacteristicKind FileType) { SrcMgr::CharacteristicKind FileType) {
} }
@ -337,11 +338,11 @@ public:
Second->FileChanged(Loc, Reason, FileType, PrevFID); Second->FileChanged(Loc, Reason, FileType, PrevFID);
} }
void FileSkipped(const FileEntry &ParentFile, void FileSkipped(const FileEntry &SkippedFile,
const Token &FilenameTok, const Token &FilenameTok,
SrcMgr::CharacteristicKind FileType) override { SrcMgr::CharacteristicKind FileType) override {
First->FileSkipped(ParentFile, FilenameTok, FileType); First->FileSkipped(SkippedFile, FilenameTok, FileType);
Second->FileSkipped(ParentFile, FilenameTok, FileType); Second->FileSkipped(SkippedFile, FilenameTok, FileType);
} }
bool FileNotFound(StringRef FileName, bool FileNotFound(StringRef FileName,

4
clang/lib/Frontend/Rewrite/InclusionRewriter.cpp
View File

@ -61,7 +61,7 @@ private:
void FileChanged(SourceLocation Loc, FileChangeReason Reason, void FileChanged(SourceLocation Loc, FileChangeReason Reason,
SrcMgr::CharacteristicKind FileType, SrcMgr::CharacteristicKind FileType,
FileID PrevFID) override; FileID PrevFID) override;
void FileSkipped(const FileEntry &ParentFile, const Token &FilenameTok, void FileSkipped(const FileEntry &SkippedFile, const Token &FilenameTok,
SrcMgr::CharacteristicKind FileType) override; SrcMgr::CharacteristicKind FileType) override;
void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok, void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
StringRef FileName, bool IsAngled, StringRef FileName, bool IsAngled,
@ -153,7 +153,7 @@ void InclusionRewriter::FileChanged(SourceLocation Loc,
/// Called whenever an inclusion is skipped due to canonical header protection /// Called whenever an inclusion is skipped due to canonical header protection
/// macros. /// macros.
void InclusionRewriter::FileSkipped(const FileEntry &/*ParentFile*/, void InclusionRewriter::FileSkipped(const FileEntry &/*SkippedFile*/,
const Token &/*FilenameTok*/, const Token &/*FilenameTok*/,
SrcMgr::CharacteristicKind /*FileType*/) { SrcMgr::CharacteristicKind /*FileType*/) {
assert(LastInsertedFileChange != FileChanges.end() && "A file, that wasn't " assert(LastInsertedFileChange != FileChanges.end() && "A file, that wasn't "