diff options
-rw-r--r-- | include/clang/Lex/Preprocessor.h | 10 | ||||
-rw-r--r-- | lib/Lex/PPDirectives.cpp | 4 | ||||
-rw-r--r-- | lib/Lex/PPLexerChange.cpp | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index a92df2ccc4..925c45f2b9 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -611,7 +611,7 @@ private: - static bool IsNonPragmaNonMacroLexer(const Lexer* L, + static bool IsFileLexer(const Lexer* L, const PreprocessorLexer* P) { if (L) return !L->isPragmaLexer(); @@ -619,12 +619,12 @@ private: return P != 0; } - static bool IsNonPragmaNonMacroLexer(const IncludeStackInfo& I) { - return IsNonPragmaNonMacroLexer(I.TheLexer, I.ThePPLexer); + static bool IsFileLexer(const IncludeStackInfo& I) { + return IsFileLexer(I.TheLexer, I.ThePPLexer); } - bool IsNonPragmaNonMacroLexer() const { - return IsNonPragmaNonMacroLexer(CurLexer.get(), CurPPLexer); + bool IsFileLexer() const { + return IsFileLexer(CurLexer.get(), CurPPLexer); } //===--------------------------------------------------------------------===// diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 42e44a5936..0a7d2dba78 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -317,7 +317,7 @@ const FileEntry *Preprocessor::LookupFile(const char *FilenameStart, // Otherwise, see if this is a subframework header. If so, this is relative // to one of the headers on the #include stack. Walk the list of the current // headers on the #include stack and pass them to HeaderInfo. - if (IsNonPragmaNonMacroLexer()) { + if (IsFileLexer()) { if ((CurFileEnt = SourceMgr.getFileEntryForID(CurPPLexer->getFileID()))) if ((FE = HeaderInfo.LookupSubframeworkHeader(FilenameStart, FilenameEnd, CurFileEnt))) @@ -326,7 +326,7 @@ const FileEntry *Preprocessor::LookupFile(const char *FilenameStart, for (unsigned i = 0, e = IncludeMacroStack.size(); i != e; ++i) { IncludeStackInfo &ISEntry = IncludeMacroStack[e-i-1]; - if (IsNonPragmaNonMacroLexer(ISEntry)) { + if (IsFileLexer(ISEntry)) { if ((CurFileEnt = SourceMgr.getFileEntryForID(ISEntry.ThePPLexer->getFileID()))) if ((FE = HeaderInfo.LookupSubframeworkHeader(FilenameStart, diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp index 973eced1cd..a12309a7bf 100644 --- a/lib/Lex/PPLexerChange.cpp +++ b/lib/Lex/PPLexerChange.cpp @@ -30,14 +30,14 @@ PPCallbacks::~PPCallbacks() {} /// isInPrimaryFile - Return true if we're in the top-level file, not in a /// #include. This looks through macro expansions and active _Pragma lexers. bool Preprocessor::isInPrimaryFile() const { - if (IsNonPragmaNonMacroLexer()) + if (IsFileLexer()) return IncludeMacroStack.empty(); // If there are any stacked lexers, we're in a #include. - assert(IsNonPragmaNonMacroLexer(IncludeMacroStack[0]) && + assert(IsFileLexer(IncludeMacroStack[0]) && "Top level include stack isn't our primary lexer?"); for (unsigned i = 1, e = IncludeMacroStack.size(); i != e; ++i) - if (IsNonPragmaNonMacroLexer(IncludeMacroStack[i])) + if (IsFileLexer(IncludeMacroStack[i])) return false; return true; } @@ -46,13 +46,13 @@ bool Preprocessor::isInPrimaryFile() const { /// that this ignores any potentially active macro expansions and _Pragma /// expansions going on at the time. PreprocessorLexer *Preprocessor::getCurrentFileLexer() const { - if (IsNonPragmaNonMacroLexer()) + if (IsFileLexer()) return CurPPLexer; // Look for a stacked lexer. for (unsigned i = IncludeMacroStack.size(); i != 0; --i) { const IncludeStackInfo& ISI = IncludeMacroStack[i-1]; - if (IsNonPragmaNonMacroLexer(ISI)) + if (IsFileLexer(ISI)) return ISI.ThePPLexer; } return 0; |