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

For PPCallbacks::InclusionDirective() add a parameter for the module, whenever 

an inclusion directive was automatically turned into a module import, and
PPCallbacks::moduleImport() for an explicit module import.

llvm-svn: 164874
This commit is contained in:
Argyrios Kyrtzidis 2012-09-29 01:06:10 +00:00
parent 43af5132c5
commit 19d78b743f
9 changed files with 87 additions and 25 deletions

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

@ -16,6 +16,7 @@
#define LLVM_CLANG_LEX_PPCALLBACKS_H
#include "clang/Lex/DirectoryLookup.h"
#include "clang/Lex/ModuleLoader.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/DiagnosticIDs.h"
#include "llvm/ADT/StringRef.h"
@ -99,9 +100,6 @@ public:
/// \param File The actual file that may be included by this inclusion
/// directive.
///
/// \param EndLoc The location of the last token within the inclusion
/// directive.
///
/// \param SearchPath Contains the search path which was used to find the file
/// in the file system. If the file was found via an absolute include path,
/// SearchPath will be empty. For framework includes, the SearchPath and
@ -113,6 +111,10 @@ public:
///
/// \param RelativePath The path relative to SearchPath, at which the include
/// file was found. This is equal to FileName except for framework includes.
///
/// \param Imported The module, whenever an inclusion directive was
/// automatically turned into a module import or null otherwise.
///
virtual void InclusionDirective(SourceLocation HashLoc,
const Token &IncludeTok,
StringRef FileName,
@ -120,7 +122,23 @@ public:
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath) {
StringRef RelativePath,
const Module *Imported) {
}
/// \brief Callback invoked whenever there was an explicit module-import
/// syntax.
///
/// \param ImportLoc The location of import directive token.
///
/// \param Path The identifiers (and their locations) of the module
/// "path", e.g., "std.vector" would be split into "std" and "vector".
///
/// \param Imported The imported module; can be null if importing failed.
///
virtual void moduleImport(SourceLocation ImportLoc,
ModuleIdPath Path,
const Module *Imported) {
}
/// \brief Callback invoked when the end of the main file is reached.
@ -272,11 +290,21 @@ public:
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath) {
StringRef RelativePath,
const Module *Imported) {
First->InclusionDirective(HashLoc, IncludeTok, FileName, IsAngled,
FilenameRange, File, SearchPath, RelativePath);
FilenameRange, File, SearchPath, RelativePath,
Imported);
Second->InclusionDirective(HashLoc, IncludeTok, FileName, IsAngled,
FilenameRange, File, SearchPath, RelativePath);
FilenameRange, File, SearchPath, RelativePath,
Imported);
}
virtual void moduleImport(SourceLocation ImportLoc,
ModuleIdPath Path,
const Module *Imported) {
First->moduleImport(ImportLoc, Path, Imported);
Second->moduleImport(ImportLoc, Path, Imported);
}
virtual void EndOfMainFile() {

3
clang/include/clang/Lex/PreprocessingRecord.h
View File

@ -600,7 +600,8 @@ namespace clang {
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath);
StringRef RelativePath,
const Module *Imported);
virtual void If(SourceLocation Loc, SourceRange ConditionRange);
virtual void Elif(SourceLocation Loc, SourceRange ConditionRange,
SourceLocation IfLoc);

6
clang/lib/Frontend/DependencyFile.cpp
View File

@ -62,7 +62,8 @@ public:
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath);
StringRef RelativePath,
const Module *Imported);
virtual void EndOfMainFile() {
OutputDependencyFile();
@ -135,7 +136,8 @@ void DependencyFileCallback::InclusionDirective(SourceLocation HashLoc,
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath) {
StringRef RelativePath,
const Module *Imported) {
if (!File) {
if (AddMissingHeaderDeps)
AddFilename(FileName);

6
clang/lib/Frontend/DependencyGraph.cpp
View File

@ -54,7 +54,8 @@ public:
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath);
StringRef RelativePath,
const Module *Imported);
virtual void EndOfMainFile() {
OutputGraphFile();
@ -75,7 +76,8 @@ void DependencyGraphCallback::InclusionDirective(SourceLocation HashLoc,
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath) {
StringRef RelativePath,
const Module *Imported) {
if (!File)
return;

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

@ -1314,6 +1314,8 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
return;
}
CharSourceRange FilenameRange
= CharSourceRange::getCharRange(FilenameTok.getLocation(), CharEnd);
StringRef OriginalFilename = Filename;
bool isAngled =
GetIncludeFilenameSpelling(FilenameTok.getLocation(), Filename);
@ -1384,10 +1386,13 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
}
}
// Notify the callback object that we've seen an inclusion directive.
Callbacks->InclusionDirective(HashLoc, IncludeTok, Filename, isAngled,
CharSourceRange::getCharRange(FilenameTok.getLocation(), CharEnd),
File, SearchPath, RelativePath);
if (!SuggestedModule) {
// Notify the callback object that we've seen an inclusion directive.
Callbacks->InclusionDirective(HashLoc, IncludeTok, Filename, isAngled,
FilenameRange, File,
SearchPath, RelativePath,
/*ImportedModule=*/0);
}
}
if (File == 0) {
@ -1485,8 +1490,24 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
"the imported module is different than the suggested one");
// If this header isn't part of the module we're building, we're done.
if (!BuildingImportedModule && Imported)
if (!BuildingImportedModule && Imported) {
if (Callbacks) {
Callbacks->InclusionDirective(HashLoc, IncludeTok, Filename, isAngled,
FilenameRange, File,
SearchPath, RelativePath, Imported);
}
return;
}
}
if (Callbacks && SuggestedModule) {
// We didn't notify the callback object that we've seen an inclusion
// directive before. Now that we are parsing the include normally and not
// turning it to a module import, notify the callback object.
Callbacks->InclusionDirective(HashLoc, IncludeTok, Filename, isAngled,
FilenameRange, File,
SearchPath, RelativePath,
/*ImportedModule=*/0);
}
// The #included file will be considered to be a system header if either it is

3
clang/lib/Lex/PreprocessingRecord.cpp
View File

@ -392,7 +392,8 @@ void PreprocessingRecord::InclusionDirective(
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath) {
StringRef RelativePath,
const Module *Imported) {
InclusionDirective::InclusionKind Kind = InclusionDirective::Include;
switch (IncludeTok.getIdentifierInfo()->getPPKeywordID()) {

12
clang/lib/Lex/Preprocessor.cpp
View File

@ -641,10 +641,14 @@ void Preprocessor::LexAfterModuleImport(Token &Result) {
}
// If we have a non-empty module path, load the named module.
if (!ModuleImportPath.empty())
(void)TheModuleLoader.loadModule(ModuleImportLoc, ModuleImportPath,
Module::MacrosVisible,
/*IsIncludeDirective=*/false);
if (!ModuleImportPath.empty()) {
Module *Imported = TheModuleLoader.loadModule(ModuleImportLoc,
ModuleImportPath,
Module::MacrosVisible,
/*IsIncludeDirective=*/false);
if (Callbacks)
Callbacks->moduleImport(ModuleImportLoc, ModuleImportPath, Imported);
}
}
void Preprocessor::addCommentHandler(CommentHandler *Handler) {

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

@ -60,7 +60,8 @@ private:
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath);
StringRef RelativePath,
const Module *Imported);
void WriteLineInfo(const char *Filename, int Line,
SrcMgr::CharacteristicKind FileType,
StringRef EOL, StringRef Extra = StringRef());
@ -155,7 +156,8 @@ void InclusionRewriter::InclusionDirective(SourceLocation HashLoc,
CharSourceRange /*FilenameRange*/,
const FileEntry * /*File*/,
StringRef /*SearchPath*/,
StringRef /*RelativePath*/) {
StringRef /*RelativePath*/,
const Module */*Imported*/) {
assert(LastInsertedFileChange == FileChanges.end() && "Another inclusion "
"directive was found before the previous one was processed");
std::pair<FileChangeMap::iterator, bool> p = FileChanges.insert(

3
clang/tools/libclang/Indexing.cpp
View File

@ -71,7 +71,8 @@ public:
CharSourceRange FilenameRange,
const FileEntry *File,
StringRef SearchPath,
StringRef RelativePath) {
StringRef RelativePath,
const Module *Imported) {
bool isImport = (IncludeTok.is(tok::identifier) &&
IncludeTok.getIdentifierInfo()->getPPKeywordID() == tok::pp_import);
IndexCtx.ppIncludedFile(HashLoc, FileName, File, isImport, IsAngled);