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

Introduce Lexer::makeFileCharRange() that accepts a token source range 

and returns a character range with file locations.

llvm-svn: 148480
This commit is contained in:
Argyrios Kyrtzidis 2012-01-19 15:59:14 +00:00
parent 1b07c344b4
commit a99e02d019
3 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/Lex/Lexer.h
View File

@ -331,6 +331,14 @@ public:
const LangOptions &LangOpts,
SourceLocation *MacroEnd = 0);
/// \brief Accepts a token source range and returns a character range with
/// file locations.
/// Returns a null range if a part of the range resides inside a macro
/// expansion or the range does not reside on the same FileID.
static CharSourceRange makeFileCharRange(SourceRange TokenRange,
const SourceManager &SM,
const LangOptions &LangOpts);
/// \brief Retrieve the name of the immediate macro expansion.
///
/// This routine starts from a source location, and finds the name of the macro

29
clang/lib/Lex/Lexer.cpp
View File

@ -792,6 +792,35 @@ bool Lexer::isAtEndOfMacroExpansion(SourceLocation loc,
return isAtEndOfMacroExpansion(expansionLoc, SM, LangOpts, MacroEnd);
}
/// \brief Accepts a token source range and returns a character range with
/// file locations.
/// Returns a null range if a part of the range resides inside a macro
/// expansion or the range does not reside on the same FileID.
CharSourceRange Lexer::makeFileCharRange(SourceRange TokenRange,
const SourceManager &SM,
const LangOptions &LangOpts) {
SourceLocation Begin = TokenRange.getBegin();
if (Begin.isInvalid())
return CharSourceRange();
if (Begin.isMacroID())
if (!isAtStartOfMacroExpansion(Begin, SM, LangOpts, &Begin))
return CharSourceRange();
SourceLocation End = getLocForEndOfToken(TokenRange.getEnd(), 0, SM,LangOpts);
if (End.isInvalid())
return CharSourceRange();
// Break down the source locations.
std::pair<FileID, unsigned> beginInfo = SM.getDecomposedLoc(Begin);
unsigned EndOffs;
if (!SM.isInFileID(End, beginInfo.first, &EndOffs) ||
beginInfo.second > EndOffs)
return CharSourceRange();
return CharSourceRange::getCharRange(Begin, End);
}
StringRef Lexer::getImmediateMacroName(SourceLocation Loc,
const SourceManager &SM,
const LangOptions &LangOpts) {

22
clang/unittests/Lex/LexerTest.cpp
View File

@ -90,14 +90,30 @@ TEST_F(LexerTest, LexAPI) {
SourceLocation lsqrLoc = toks[0].getLocation();
SourceLocation idLoc = toks[1].getLocation();
SourceLocation rsqrLoc = toks[2].getLocation();
std::pair<SourceLocation,SourceLocation>
macroPair = SourceMgr.getExpansionRange(lsqrLoc);
SourceRange macroRange = SourceRange(macroPair.first, macroPair.second);
SourceLocation Loc;
EXPECT_TRUE(Lexer::isAtStartOfMacroExpansion(lsqrLoc, SourceMgr, LangOpts, &Loc));
EXPECT_EQ(SourceMgr.getExpansionLoc(lsqrLoc), Loc);
EXPECT_EQ(Loc, macroRange.getBegin());
EXPECT_FALSE(Lexer::isAtStartOfMacroExpansion(idLoc, SourceMgr, LangOpts));
EXPECT_FALSE(Lexer::isAtEndOfMacroExpansion(idLoc, SourceMgr, LangOpts));
EXPECT_TRUE(Lexer::isAtEndOfMacroExpansion(rsqrLoc, SourceMgr, LangOpts, &Loc));
EXPECT_EQ(SourceMgr.getExpansionRange(rsqrLoc).second, Loc);
EXPECT_EQ(Loc, macroRange.getEnd());
CharSourceRange range = Lexer::makeFileCharRange(SourceRange(lsqrLoc, idLoc),
SourceMgr, LangOpts);
EXPECT_TRUE(range.isInvalid());
range = Lexer::makeFileCharRange(SourceRange(idLoc, rsqrLoc),
SourceMgr, LangOpts);
EXPECT_TRUE(range.isInvalid());
range = Lexer::makeFileCharRange(SourceRange(lsqrLoc, rsqrLoc),
SourceMgr, LangOpts);
EXPECT_TRUE(!range.isTokenRange());
EXPECT_EQ(range.getAsRange(),
SourceRange(macroRange.getBegin(),
macroRange.getEnd().getLocWithOffset(1)));
}
} // anonymous namespace