diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-07-26 04:41:47 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-07-26 04:41:47 +0000 |
| commit | 78df836808aee22c3157e1bc23bc4ec569b80568 (patch) | |
| tree | 5926da53f488f2c290367f3ffac1f16207aee847 /lib/Lex/Lexer.cpp | |
| parent | bf340e452339e374ea6eef78c1f0a2abdd16c5a3 (diff) | |
Convert InstantiationInfo and much of the related code to ExpansionInfo
and various other 'expansion' based terms. I've tried to reformat where
appropriate and catch as many references in comments but I'm going to do
several more passes. Also I've tried to expand parameter names to be
more clear where appropriate.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136056 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/Lexer.cpp')
| -rw-r--r-- | lib/Lex/Lexer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index f5aa134788..25e61131c3 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -714,7 +714,7 @@ bool Lexer::isAtStartOfMacroExpansion(SourceLocation loc, SourceLocation expansionLoc = SM.getSLocEntry(infoLoc.first) - .getInstantiation().getInstantiationLocStart(); + .getInstantiation().getExpansionLocStart(); if (expansionLoc.isFileID()) return true; // No other macro expansions, this is the first. @@ -744,7 +744,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().getInstantiationLocEnd(); + SM.getSLocEntry(FID).getInstantiation().getExpansionLocEnd(); if (expansionLoc.isFileID()) return true; // No other macro expansions. |