diff options
Diffstat (limited to 'include/clang/Lex')
| -rw-r--r-- | include/clang/Lex/DirectoryLookup.h | 9 | ||||
| -rw-r--r-- | include/clang/Lex/HeaderSearch.h | 10 | ||||
| -rw-r--r-- | include/clang/Lex/Preprocessor.h | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/include/clang/Lex/DirectoryLookup.h b/include/clang/Lex/DirectoryLookup.h index f7da61b0ed..d2764e7edd 100644 --- a/include/clang/Lex/DirectoryLookup.h +++ b/include/clang/Lex/DirectoryLookup.h @@ -14,6 +14,7 @@ #ifndef LLVM_CLANG_LEX_DIRECTORYLOOKUP_H #define LLVM_CLANG_LEX_DIRECTORYLOOKUP_H +#include "clang/Lex/ModuleMap.h" #include "clang/Basic/LLVM.h" #include "clang/Basic/SourceManager.h" @@ -144,13 +145,13 @@ public: /// \param BuildingModule The name of the module we're currently building. /// /// \param SuggestedModule If non-null, and the file found is semantically - /// part of a known module, this will be set to the name of the module that - /// could be imported instead of preprocessing/parsing the file found. + /// part of a known module, this will be set to the module that should + /// be imported instead of preprocessing/parsing the file found. const FileEntry *LookupFile(StringRef Filename, HeaderSearch &HS, SmallVectorImpl<char> *SearchPath, SmallVectorImpl<char> *RelativePath, StringRef BuildingModule, - StringRef *SuggestedModule) const; + ModuleMap::Module **SuggestedModule) const; private: const FileEntry *DoFrameworkLookup( @@ -158,7 +159,7 @@ private: SmallVectorImpl<char> *SearchPath, SmallVectorImpl<char> *RelativePath, StringRef BuildingModule, - StringRef *SuggestedModule) const; + ModuleMap::Module **SuggestedModule) const; }; diff --git a/include/clang/Lex/HeaderSearch.h b/include/clang/Lex/HeaderSearch.h index 21654c16cc..b56fba538a 100644 --- a/include/clang/Lex/HeaderSearch.h +++ b/include/clang/Lex/HeaderSearch.h @@ -258,15 +258,15 @@ public: /// Filename for framework includes. /// /// \param SuggestedModule If non-null, and the file found is semantically - /// part of a known module, this will be set to the name of the module that - /// could be imported instead of preprocessing/parsing the file found. + /// part of a known module, this will be set to the module that should + /// be imported instead of preprocessing/parsing the file found. const FileEntry *LookupFile(StringRef Filename, bool isAngled, const DirectoryLookup *FromDir, const DirectoryLookup *&CurDir, const FileEntry *CurFileEnt, SmallVectorImpl<char> *SearchPath, SmallVectorImpl<char> *RelativePath, - StringRef *SuggestedModule); + ModuleMap::Module **SuggestedModule); /// LookupSubframeworkHeader - Look up a subframework for the specified /// #include file. For example, if #include'ing <HIToolbox/HIToolbox.h> from @@ -366,9 +366,7 @@ public: bool hasModuleMap(StringRef Filename, const DirectoryEntry *Root); /// \brief Retrieve the module that corresponds to the given file, if any. - /// - /// FIXME: This will need to be generalized for submodules. - StringRef findModuleForHeader(const FileEntry *File); + ModuleMap::Module *findModuleForHeader(const FileEntry *File); /// \brief Read the contents of the given module map file. diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index bcd3c4b274..90f64c4554 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -1008,7 +1008,7 @@ public: const DirectoryLookup *&CurDir, SmallVectorImpl<char> *SearchPath, SmallVectorImpl<char> *RelativePath, - StringRef *SuggestedModule); + ModuleMap::Module **SuggestedModule); /// GetCurLookup - The DirectoryLookup structure used to find the current /// FileEntry, if CurLexer is non-null and if applicable. This allows us to |