From bf340e452339e374ea6eef78c1f0a2abdd16c5a3 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 26 Jul 2011 03:03:05 +0000 Subject: Rename create(MacroArg)InstantiationLoc to create(MacroArg)ExpansionLoc. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136054 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/SourceManager.cpp | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'lib/Basic/SourceManager.cpp') diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index c7de18252a..ba2dcdf7c2 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -406,7 +406,7 @@ void SourceManager::clearIDTables() { // The highest possible offset is 2^31-1, so CurrentLoadedOffset starts at // 2^31. CurrentLoadedOffset = 1U << 31U; - createInstantiationLoc(SourceLocation(),SourceLocation(),SourceLocation(), 1); + createExpansionLoc(SourceLocation(),SourceLocation(),SourceLocation(), 1); } /// getOrCreateContentCache - Create or return a cached ContentCache for the @@ -518,30 +518,32 @@ FileID SourceManager::createFileID(const ContentCache *File, } SourceLocation -SourceManager::createMacroArgInstantiationLoc(SourceLocation SpellingLoc, - SourceLocation ILoc, - unsigned TokLength) { +SourceManager::createMacroArgExpansionLoc(SourceLocation SpellingLoc, + SourceLocation ExpansionLoc, + unsigned TokLength) { InstantiationInfo II = - InstantiationInfo::createForMacroArg(SpellingLoc, ILoc); - return createInstantiationLocImpl(II, TokLength); + InstantiationInfo::createForMacroArg(SpellingLoc, ExpansionLoc); + return createExpansionLocImpl(II, TokLength); } -SourceLocation SourceManager::createInstantiationLoc(SourceLocation SpellingLoc, - SourceLocation ILocStart, - SourceLocation ILocEnd, - unsigned TokLength, - int LoadedID, - unsigned LoadedOffset) { +SourceLocation +SourceManager::createExpansionLoc(SourceLocation SpellingLoc, + SourceLocation ExpansionLocStart, + SourceLocation ExpansionLocEnd, + unsigned TokLength, + int LoadedID, + unsigned LoadedOffset) { InstantiationInfo II = - InstantiationInfo::create(SpellingLoc, ILocStart, ILocEnd); - return createInstantiationLocImpl(II, TokLength, LoadedID, LoadedOffset); + InstantiationInfo::create(SpellingLoc, ExpansionLocStart, + ExpansionLocEnd); + return createExpansionLocImpl(II, TokLength, LoadedID, LoadedOffset); } SourceLocation -SourceManager::createInstantiationLocImpl(const InstantiationInfo &II, - unsigned TokLength, - int LoadedID, - unsigned LoadedOffset) { +SourceManager::createExpansionLocImpl(const InstantiationInfo &II, + unsigned TokLength, + int LoadedID, + unsigned LoadedOffset) { if (LoadedID < 0) { assert(LoadedID != -1 && "Loading sentinel FileID"); unsigned Index = unsigned(-LoadedID) - 2; -- cgit v1.2.3-18-g5258