diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 20:52:21 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 20:52:21 +0000 |
commit | 999f739404edf2078cf9f9c28b4dc45c19765842 (patch) | |
tree | 2181c2a8dd9c0fe11e8627b2349cd1640ebbd7e7 /lib/Basic/SourceManager.cpp | |
parent | 5d6d89fef8c7fff8b1a67c943fb5557a2a803468 (diff) |
Rename SourceManager::getImmediateInstantiationRange to
getImmediateExpansionRange.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135960 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Basic/SourceManager.cpp')
-rw-r--r-- | lib/Basic/SourceManager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index aad23ad6db..30ea39e8a4 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -857,10 +857,10 @@ SourceLocation SourceManager::getImmediateSpellingLoc(SourceLocation Loc) const{ } -/// getImmediateInstantiationRange - Loc is required to be an instantiation +/// getImmediateExpansionRange - Loc is required to be an instantiation /// location. Return the start/end of the instantiation information. std::pair<SourceLocation,SourceLocation> -SourceManager::getImmediateInstantiationRange(SourceLocation Loc) const { +SourceManager::getImmediateExpansionRange(SourceLocation Loc) const { assert(Loc.isMacroID() && "Not an instantiation loc!"); const InstantiationInfo &II = getSLocEntry(getFileID(Loc)).getInstantiation(); return II.getInstantiationLocRange(); @@ -873,14 +873,14 @@ SourceManager::getExpansionRange(SourceLocation Loc) const { if (Loc.isFileID()) return std::make_pair(Loc, Loc); std::pair<SourceLocation,SourceLocation> Res = - getImmediateInstantiationRange(Loc); + getImmediateExpansionRange(Loc); // Fully resolve the start and end locations to their ultimate instantiation // points. while (!Res.first.isFileID()) - Res.first = getImmediateInstantiationRange(Res.first).first; + Res.first = getImmediateExpansionRange(Res.first).first; while (!Res.second.isFileID()) - Res.second = getImmediateInstantiationRange(Res.second).second; + Res.second = getImmediateExpansionRange(Res.second).second; return Res; } |