diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 16:49:02 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 16:49:02 +0000 |
commit | 35f5320d8e3bd080bd6316ef13716adf011d89e9 (patch) | |
tree | a2d1d3609f6570fff401687602ba90163047ef8a /clang/lib/Rewrite/RewriteObjC.cpp | |
parent | 163d675e727086abf65c91f6c898e672ca72ebfe (diff) | |
download | bcm5719-llvm-35f5320d8e3bd080bd6316ef13716adf011d89e9.tar.gz bcm5719-llvm-35f5320d8e3bd080bd6316ef13716adf011d89e9.zip |
Mechanically rename SourceManager::getInstantiationLoc and
FullSourceLoc::getInstantiationLoc to ...::getExpansionLoc. This is part
of the API and documentation update from 'instantiation' as the term for
macros to 'expansion'.
llvm-svn: 135914
Diffstat (limited to 'clang/lib/Rewrite/RewriteObjC.cpp')
-rw-r--r-- | clang/lib/Rewrite/RewriteObjC.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Rewrite/RewriteObjC.cpp b/clang/lib/Rewrite/RewriteObjC.cpp index 524d78e9ce7..64e5309c4bf 100644 --- a/clang/lib/Rewrite/RewriteObjC.cpp +++ b/clang/lib/Rewrite/RewriteObjC.cpp @@ -690,7 +690,7 @@ void RewriteObjC::HandleTopLevelSingleDecl(Decl *D) { // #included file. If the former, rewrite it now. If the later, check to see // if we rewrote the #include/#import. SourceLocation Loc = D->getLocation(); - Loc = SM->getInstantiationLoc(Loc); + Loc = SM->getExpansionLoc(Loc); // If this is for a builtin, ignore it. if (Loc.isInvalid()) return; @@ -2342,13 +2342,13 @@ void RewriteObjC::RewriteTypeOfDecl(VarDecl *ND) { startLoc = ECE->getLParenLoc(); else startLoc = E->getLocStart(); - startLoc = SM->getInstantiationLoc(startLoc); + startLoc = SM->getExpansionLoc(startLoc); const char *endBuf = SM->getCharacterData(startLoc); ReplaceText(DeclLoc, endBuf-startBuf-1, TypeAsString); } else { SourceLocation X = ND->getLocEnd(); - X = SM->getInstantiationLoc(X); + X = SM->getExpansionLoc(X); const char *endBuf = SM->getCharacterData(X); ReplaceText(DeclLoc, endBuf-startBuf-1, TypeAsString); } @@ -5108,7 +5108,7 @@ void RewriteObjC::RewriteByRefVar(VarDecl *ND) { DeclLoc = ND->getLocation(); const char *startBuf = SM->getCharacterData(DeclLoc); SourceLocation X = ND->getLocEnd(); - X = SM->getInstantiationLoc(X); + X = SM->getExpansionLoc(X); const char *endBuf = SM->getCharacterData(X); std::string Name(ND->getNameAsString()); std::string ByrefType; @@ -5203,7 +5203,7 @@ void RewriteObjC::RewriteByRefVar(VarDecl *ND) { startLoc = ECE->getLParenLoc(); else startLoc = E->getLocStart(); - startLoc = SM->getInstantiationLoc(startLoc); + startLoc = SM->getExpansionLoc(startLoc); endBuf = SM->getCharacterData(startLoc); ByrefType += " " + Name; ByrefType += " = {(void*)"; |