maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename SourceManager (and InstantiationInfo) isMacroArgInstantiation API 

to isMacroArgExpansion.

llvm-svn: 136053
This commit is contained in:
Chandler Carruth 2011-07-26 03:03:00 +00:00
parent 5c4df7a4d6
commit aa63153ff7
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/include/clang/Basic/SourceManager.h
View File

@ -259,7 +259,7 @@ namespace SrcMgr {
getInstantiationLocEnd());
}
bool isMacroArgInstantiation() const {
bool isMacroArgExpansion() const {
// Note that this needs to return false for default constructed objects.
return getInstantiationLocStart().isValid() &&
SourceLocation::getFromRawEncoding(InstantiationLocEnd).isInvalid();
@ -803,12 +803,12 @@ public:
return getDecomposedLoc(SpellingLoc).second;
}
/// isMacroArgInstantiation - This method tests whether the given source
/// location represents a macro argument's instantiation into the
/// function-like macro definition. Such source locations only appear inside
/// of the instantiation locations representing where a particular
/// function-like macro was expanded.
bool isMacroArgInstantiation(SourceLocation Loc) const;
/// isMacroArgExpansion - This method tests whether the given source location
/// represents a macro argument's expansion into the function-like macro
/// definition. Such source locations only appear inside of the expansion
/// locations representing where a particular function-like macro was
/// expanded.
bool isMacroArgExpansion(SourceLocation Loc) const;
//===--------------------------------------------------------------------===//
// Queries about the code at a SourceLocation.

4
clang/lib/Basic/SourceManager.cpp
View File

@ -884,13 +884,13 @@ SourceManager::getExpansionRange(SourceLocation Loc) const {
return Res;
}
bool SourceManager::isMacroArgInstantiation(SourceLocation Loc) const {
bool SourceManager::isMacroArgExpansion(SourceLocation Loc) const {
if (!Loc.isMacroID()) return false;
FileID FID = getFileID(Loc);
const SrcMgr::SLocEntry *E = &getSLocEntry(FID);
const SrcMgr::InstantiationInfo &II = E->getInstantiation();
return II.isMacroArgInstantiation();
return II.isMacroArgExpansion();
}

6
clang/lib/Frontend/TextDiagnosticPrinter.cpp
View File

@ -300,7 +300,7 @@ static SourceLocation skipToMacroArgExpansion(const SourceManager &SM,
SourceLocation StartLoc) {
for (SourceLocation L = StartLoc; L.isMacroID();
L = SM.getImmediateSpellingLoc(L)) {
if (SM.isMacroArgInstantiation(L))
if (SM.isMacroArgExpansion(L))
return L;
}
@ -317,7 +317,7 @@ static SourceLocation getImmediateMacroCallerLoc(const SourceManager &SM,
// When we have the location of (part of) an expanded parameter, its spelling
// location points to the argument as typed into the macro call, and
// therefore is used to locate the macro caller.
if (SM.isMacroArgInstantiation(Loc))
if (SM.isMacroArgExpansion(Loc))
return SM.getImmediateSpellingLoc(Loc);
// Otherwise, the caller of the macro is located where this macro is
@ -334,7 +334,7 @@ static SourceLocation getImmediateMacroCalleeLoc(const SourceManager &SM,
// When we have the location of (part of) an expanded parameter, its
// expansion location points to the unexpanded paramater reference within
// the macro definition (or callee).
if (SM.isMacroArgInstantiation(Loc))
if (SM.isMacroArgExpansion(Loc))
return SM.getImmediateExpansionRange(Loc).first;
// Otherwise, the callee of the macro is located where this location was