diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-03 05:58:29 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-03 05:58:29 +0000 |
| commit | a83f4d2315dbeb3914868f1ccb8e74fb2ccdbb0c (patch) | |
| tree | 01972dcbc5e3cdb4200246bb904caf75f545d05d /unittests/Lex/LexerTest.cpp | |
| parent | cbf46a0b2bb2b47d6e13437e0d52cc583c5ce539 (diff) | |
| download | clang-a83f4d2315dbeb3914868f1ccb8e74fb2ccdbb0c.tar.gz clang-a83f4d2315dbeb3914868f1ccb8e74fb2ccdbb0c.tar.bz2 clang-a83f4d2315dbeb3914868f1ccb8e74fb2ccdbb0c.tar.xz | |
Change Lexer::makeFileCharRange() to have it accept a CharSourceRange
instead of a SourceRange, and handle the case where the range is
a char (not token) range.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149677 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Lex/LexerTest.cpp')
| -rw-r--r-- | unittests/Lex/LexerTest.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/unittests/Lex/LexerTest.cpp b/unittests/Lex/LexerTest.cpp index 2742f66663..28199c4aac 100644 --- a/unittests/Lex/LexerTest.cpp +++ b/unittests/Lex/LexerTest.cpp @@ -115,13 +115,13 @@ TEST_F(LexerTest, LexAPI) { EXPECT_TRUE(Lexer::isAtEndOfMacroExpansion(rsqrLoc, SourceMgr, LangOpts, &Loc)); EXPECT_EQ(Loc, macroRange.getEnd()); - CharSourceRange range = Lexer::makeFileCharRange(SourceRange(lsqrLoc, idLoc), - SourceMgr, LangOpts); + CharSourceRange range = Lexer::makeFileCharRange( + CharSourceRange::getTokenRange(lsqrLoc, idLoc), SourceMgr, LangOpts); EXPECT_TRUE(range.isInvalid()); - range = Lexer::makeFileCharRange(SourceRange(idLoc, rsqrLoc), + range = Lexer::makeFileCharRange(CharSourceRange::getTokenRange(idLoc, rsqrLoc), SourceMgr, LangOpts); EXPECT_TRUE(range.isInvalid()); - range = Lexer::makeFileCharRange(SourceRange(lsqrLoc, rsqrLoc), + range = Lexer::makeFileCharRange(CharSourceRange::getTokenRange(lsqrLoc, rsqrLoc), SourceMgr, LangOpts); EXPECT_TRUE(!range.isTokenRange()); EXPECT_EQ(range.getAsRange(), @@ -129,8 +129,8 @@ TEST_F(LexerTest, LexAPI) { macroRange.getEnd().getLocWithOffset(1))); StringRef text = Lexer::getSourceText( - CharSourceRange::getTokenRange(SourceRange(lsqrLoc, rsqrLoc)), - SourceMgr, LangOpts); + CharSourceRange::getTokenRange(lsqrLoc, rsqrLoc), + SourceMgr, LangOpts); EXPECT_EQ(text, "M(foo)"); SourceLocation macroLsqrLoc = toks[3].getLocation(); @@ -140,19 +140,21 @@ TEST_F(LexerTest, LexAPI) { SourceLocation fileIdLoc = SourceMgr.getSpellingLoc(macroIdLoc); SourceLocation fileRsqrLoc = SourceMgr.getSpellingLoc(macroRsqrLoc); - range = Lexer::makeFileCharRange(SourceRange(macroLsqrLoc, macroIdLoc), - SourceMgr, LangOpts); + range = Lexer::makeFileCharRange( + CharSourceRange::getTokenRange(macroLsqrLoc, macroIdLoc), + SourceMgr, LangOpts); EXPECT_EQ(SourceRange(fileLsqrLoc, fileIdLoc.getLocWithOffset(3)), range.getAsRange()); - range = Lexer::makeFileCharRange(SourceRange(macroIdLoc, macroRsqrLoc), + range = Lexer::makeFileCharRange(CharSourceRange::getTokenRange(macroIdLoc, macroRsqrLoc), SourceMgr, LangOpts); EXPECT_EQ(SourceRange(fileIdLoc, fileRsqrLoc.getLocWithOffset(1)), range.getAsRange()); macroPair = SourceMgr.getExpansionRange(macroLsqrLoc); - range = Lexer::makeFileCharRange(SourceRange(macroLsqrLoc, macroRsqrLoc), - SourceMgr, LangOpts); + range = Lexer::makeFileCharRange( + CharSourceRange::getTokenRange(macroLsqrLoc, macroRsqrLoc), + SourceMgr, LangOpts); EXPECT_EQ(SourceRange(macroPair.first, macroPair.second.getLocWithOffset(1)), range.getAsRange()); |