diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-07-26 04:56:51 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-07-26 04:56:51 +0000 |
| commit | 1728762d5a8cfaf8d64385f47b311e84de1ae7a2 (patch) | |
| tree | 9a13a5ab972313f0f229383acc70f1bebc0385c0 /lib/Lex/Lexer.cpp | |
| parent | 78df836808aee22c3157e1bc23bc4ec569b80568 (diff) | |
Migrate 'Instantiation' data and API bits of SLocEntry to 'Expansion'
etc. With this I think essentially all of the SourceManager APIs are
converted. Comments and random other bits of cleanup should be all thats
left.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136057 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/Lexer.cpp')
| -rw-r--r-- | lib/Lex/Lexer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index 25e61131c3..6c7169f89b 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -713,8 +713,7 @@ bool Lexer::isAtStartOfMacroExpansion(SourceLocation loc, return false; // Does not point at the start of token. SourceLocation expansionLoc = - SM.getSLocEntry(infoLoc.first) - .getInstantiation().getExpansionLocStart(); + SM.getSLocEntry(infoLoc.first).getExpansion().getExpansionLocStart(); if (expansionLoc.isFileID()) return true; // No other macro expansions, this is the first. @@ -744,7 +743,7 @@ bool Lexer::isAtEndOfMacroExpansion(SourceLocation loc, return false; // Still in the same FileID, does not point to the last token. SourceLocation expansionLoc = - SM.getSLocEntry(FID).getInstantiation().getExpansionLocEnd(); + SM.getSLocEntry(FID).getExpansion().getExpansionLocEnd(); if (expansionLoc.isFileID()) return true; // No other macro expansions. |