From e7b2b6e87dbe5b1207f77b6ff9c210a02f95bb39 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 25 Jul 2011 20:52:32 +0000 Subject: [PATCH] Rename getDecomposedInstantiationLoc to getDecomposedExpansionLoc. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135962 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/SourceManager.h | 8 ++++---- lib/Basic/SourceManager.cpp | 14 +++++++------- lib/Frontend/TextDiagnosticPrinter.cpp | 2 +- lib/Lex/MacroInfo.cpp | 4 ++-- lib/Lex/PPDirectives.cpp | 4 ++-- lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp | 2 +- tools/libclang/CIndex.cpp | 9 ++++----- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index 4db9323559..8d8b5ff17c 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -767,11 +767,11 @@ public: return std::make_pair(FID, Loc.getOffset()-getSLocEntry(FID).getOffset()); } - /// getDecomposedInstantiationLoc - Decompose the specified location into a + /// getDecomposedExpansionLoc - Decompose the specified location into a /// raw FileID + Offset pair. If the location is an instantiation record, /// walk through it until we find the final location instantiated. std::pair - getDecomposedInstantiationLoc(SourceLocation Loc) const { + getDecomposedExpansionLoc(SourceLocation Loc) const { FileID FID = getFileID(Loc); const SrcMgr::SLocEntry *E = &getSLocEntry(FID); @@ -779,7 +779,7 @@ public: if (Loc.isFileID()) return std::make_pair(FID, Offset); - return getDecomposedInstantiationLocSlowCase(E); + return getDecomposedExpansionLocSlowCase(E); } /// getDecomposedSpellingLoc - Decompose the specified location into a raw @@ -1134,7 +1134,7 @@ private: SourceLocation getSpellingLocSlowCase(SourceLocation Loc) const; std::pair - getDecomposedInstantiationLocSlowCase(const SrcMgr::SLocEntry *E) const; + getDecomposedExpansionLocSlowCase(const SrcMgr::SLocEntry *E) const; std::pair getDecomposedSpellingLocSlowCase(const SrcMgr::SLocEntry *E, unsigned Offset) const; diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 63f2364925..ec97defbb6 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -289,7 +289,7 @@ unsigned SourceManager::getLineTableFilenameID(StringRef Name) { /// unspecified. void SourceManager::AddLineNote(SourceLocation Loc, unsigned LineNo, int FilenameID) { - std::pair LocInfo = getDecomposedInstantiationLoc(Loc); + std::pair LocInfo = getDecomposedExpansionLoc(Loc); bool Invalid = false; const SLocEntry &Entry = getSLocEntry(LocInfo.first, &Invalid); @@ -319,7 +319,7 @@ void SourceManager::AddLineNote(SourceLocation Loc, unsigned LineNo, return AddLineNote(Loc, LineNo, FilenameID); } - std::pair LocInfo = getDecomposedInstantiationLoc(Loc); + std::pair LocInfo = getDecomposedExpansionLoc(Loc); bool Invalid = false; const SLocEntry &Entry = getSLocEntry(LocInfo.first, &Invalid); @@ -809,7 +809,7 @@ SourceLocation SourceManager::getSpellingLocSlowCase(SourceLocation Loc) const { std::pair -SourceManager::getDecomposedInstantiationLocSlowCase( +SourceManager::getDecomposedExpansionLocSlowCase( const SrcMgr::SLocEntry *E) const { // If this is an instantiation record, walk through all the instantiation // points. @@ -961,7 +961,7 @@ unsigned SourceManager::getSpellingColumnNumber(SourceLocation Loc, unsigned SourceManager::getInstantiationColumnNumber(SourceLocation Loc, bool *Invalid) const { if (isInvalid(Loc, Invalid)) return 0; - std::pair LocInfo = getDecomposedInstantiationLoc(Loc); + std::pair LocInfo = getDecomposedExpansionLoc(Loc); return getColumnNumber(LocInfo.first, LocInfo.second, Invalid); } @@ -1156,7 +1156,7 @@ unsigned SourceManager::getSpellingLineNumber(SourceLocation Loc, unsigned SourceManager::getInstantiationLineNumber(SourceLocation Loc, bool *Invalid) const { if (isInvalid(Loc, Invalid)) return 0; - std::pair LocInfo = getDecomposedInstantiationLoc(Loc); + std::pair LocInfo = getDecomposedExpansionLoc(Loc); return getLineNumber(LocInfo.first, LocInfo.second); } unsigned SourceManager::getPresumedLineNumber(SourceLocation Loc, @@ -1176,7 +1176,7 @@ unsigned SourceManager::getPresumedLineNumber(SourceLocation Loc, SrcMgr::CharacteristicKind SourceManager::getFileCharacteristic(SourceLocation Loc) const { assert(!Loc.isInvalid() && "Can't get file characteristic of invalid loc!"); - std::pair LocInfo = getDecomposedInstantiationLoc(Loc); + std::pair LocInfo = getDecomposedExpansionLoc(Loc); bool Invalid = false; const SLocEntry &SEntry = getSLocEntry(LocInfo.first, &Invalid); if (Invalid || !SEntry.isFile()) @@ -1223,7 +1223,7 @@ PresumedLoc SourceManager::getPresumedLoc(SourceLocation Loc) const { if (Loc.isInvalid()) return PresumedLoc(); // Presumed locations are always for instantiation points. - std::pair LocInfo = getDecomposedInstantiationLoc(Loc); + std::pair LocInfo = getDecomposedExpansionLoc(Loc); bool Invalid = false; const SLocEntry &Entry = getSLocEntry(LocInfo.first, &Invalid); diff --git a/lib/Frontend/TextDiagnosticPrinter.cpp b/lib/Frontend/TextDiagnosticPrinter.cpp index 473c10deb6..e008dda09d 100644 --- a/lib/Frontend/TextDiagnosticPrinter.cpp +++ b/lib/Frontend/TextDiagnosticPrinter.cpp @@ -519,7 +519,7 @@ void TextDiagnosticPrinter::EmitCaretDiagnostic(SourceLocation Loc, // We have an insertion hint. Determine whether the inserted // code is on the same line as the caret. std::pair HintLocInfo - = SM.getDecomposedInstantiationLoc(Hint->RemoveRange.getBegin()); + = SM.getDecomposedExpansionLoc(Hint->RemoveRange.getBegin()); if (SM.getLineNumber(HintLocInfo.first, HintLocInfo.second) == SM.getLineNumber(FID, FileOffset)) { // Insert the new code into the line just below the code diff --git a/lib/Lex/MacroInfo.cpp b/lib/Lex/MacroInfo.cpp index 0a16a25672..9e682ce306 100644 --- a/lib/Lex/MacroInfo.cpp +++ b/lib/Lex/MacroInfo.cpp @@ -68,9 +68,9 @@ unsigned MacroInfo::getDefinitionLengthSlow(SourceManager &SM) const { assert((macroEnd.isFileID() || lastToken.is(tok::comment)) && "Macro defined in macro?"); std::pair - startInfo = SM.getDecomposedInstantiationLoc(macroStart); + startInfo = SM.getDecomposedExpansionLoc(macroStart); std::pair - endInfo = SM.getDecomposedInstantiationLoc(macroEnd); + endInfo = SM.getDecomposedExpansionLoc(macroEnd); assert(startInfo.first == endInfo.first && "Macro definition spanning multiple FileIDs ?"); assert(startInfo.second <= endInfo.second); diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 7e4b9b2bd6..212ffeef1b 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -825,7 +825,7 @@ static bool ReadLineMarkerFlags(bool &IsFileEntry, bool &IsFileExit, // If we are leaving the current presumed file, check to make sure the // presumed include stack isn't empty! FileID CurFileID = - SM.getDecomposedInstantiationLoc(FlagTok.getLocation()).first; + SM.getDecomposedExpansionLoc(FlagTok.getLocation()).first; PresumedLoc PLoc = SM.getPresumedLoc(FlagTok.getLocation()); if (PLoc.isInvalid()) return true; @@ -834,7 +834,7 @@ static bool ReadLineMarkerFlags(bool &IsFileEntry, bool &IsFileExit, // different physical file, then we aren't in a "1" line marker flag region. SourceLocation IncLoc = PLoc.getIncludeLoc(); if (IncLoc.isInvalid() || - SM.getDecomposedInstantiationLoc(IncLoc).first != CurFileID) { + SM.getDecomposedExpansionLoc(IncLoc).first != CurFileID) { PP.Diag(FlagTok, diag::err_pp_linemarker_invalid_pop); PP.DiscardUntilEndOfDirective(); return true; diff --git a/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp b/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp index 59799ee3ac..8cbccc9203 100644 --- a/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp +++ b/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp @@ -324,7 +324,7 @@ void HTMLDiagnostics::HandlePiece(Rewriter& R, FileID BugFileID, SourceManager &SM = R.getSourceMgr(); assert(&Pos.getManager() == &SM && "SourceManagers are different!"); - std::pair LPosInfo = SM.getDecomposedInstantiationLoc(Pos); + std::pair LPosInfo = SM.getDecomposedExpansionLoc(Pos); if (LPosInfo.first != BugFileID) return; diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 7f8f759ccb..90bb78d1b2 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -439,7 +439,7 @@ bool CursorVisitor::visitPreprocessedEntitiesInRegion() { // FIXME: My kingdom for a proper binary search approach to finding // cursors! std::pair Location - = AU->getSourceManager().getDecomposedInstantiationLoc( + = AU->getSourceManager().getDecomposedExpansionLoc( RegionOfInterest.getBegin()); if (Location.first != AU->getSourceManager().getMainFileID()) OnlyLocalDecls = false; @@ -463,9 +463,9 @@ bool CursorVisitor::visitPreprocessedEntitiesInRegion(InputIterator First, // Find the file in which the region of interest lands. SourceManager &SM = AU->getSourceManager(); std::pair Begin - = SM.getDecomposedInstantiationLoc(RegionOfInterest.getBegin()); + = SM.getDecomposedExpansionLoc(RegionOfInterest.getBegin()); std::pair End - = SM.getDecomposedInstantiationLoc(RegionOfInterest.getEnd()); + = SM.getDecomposedExpansionLoc(RegionOfInterest.getEnd()); // The region of interest spans files; we have to walk everything. if (Begin.first != End.first) @@ -477,8 +477,7 @@ bool CursorVisitor::visitPreprocessedEntitiesInRegion(InputIterator First, // Build the mapping from files to sets of preprocessed entities. for (; First != Last; ++First) { std::pair P - = SM.getDecomposedInstantiationLoc( - (*First)->getSourceRange().getBegin()); + = SM.getDecomposedExpansionLoc((*First)->getSourceRange().getBegin()); ByFileMap[P.first].push_back(*First); } -- 2.40.0