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

[clangd] NFC: Improve Dex Iterators debugging traits 

This patch improves `dex::Iterator` string representation by
incorporating the information about the element which is currently being
pointed to by the `DocumentIterator`.

Reviewed by: ioeric

Differential Revision: https://reviews.llvm.org/D50689

llvm-svn: 339877
This commit is contained in:
Kirill Bobyrev 2018-08-16 13:19:43 +00:00
parent ff22b43c7d
commit 51534ab864
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang-tools-extra/clangd/index/dex/Iterator.cpp
View File

@ -49,10 +49,19 @@ public:
llvm::raw_ostream &dump(llvm::raw_ostream &OS) const override {
OS << '[';
auto Separator = "";
for (const auto &ID : Documents) {
OS << Separator << ID;
for (auto It = std::begin(Documents); It != std::end(Documents); ++It) {
OS << Separator;
if (It == Index)
OS << '{' << *It << '}';
else
OS << *It;
Separator = ", ";
}
OS << Separator;
if (Index == std::end(Documents))
OS << "{END}";
else
OS << "END";
OS << ']';
return OS;
}

4
clang-tools-extra/clangd/index/dex/Iterator.h
View File

@ -99,7 +99,9 @@ public:
///
/// Where Type is the iterator type representation: "&" for And, "|" for Or,
/// ChildN is N-th iterator child. Raw iterators over PostingList are
/// represented as "[ID1, ID2, ...]" where IDN is N-th PostingList entry.
/// represented as "[ID1, ID2, ..., {IDN}, ... END]" where IDN is N-th
/// PostingList entry and the element which is pointed to by the PostingList
/// iterator is enclosed in {} braces.
friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
const Iterator &Iterator) {
return Iterator.dump(OS);

5
clang-tools-extra/unittests/clangd/DexIndexTests.cpp
View File

@ -231,13 +231,14 @@ TEST(DexIndexIterators, StringRepresentation) {
const PostingList L4 = {0, 1, 5};
const PostingList L5;
EXPECT_EQ(llvm::to_string(*(create(L0))), "[4, 7, 8, 20, 42, 100]");
EXPECT_EQ(llvm::to_string(*(create(L0))), "[{4}, 7, 8, 20, 42, 100, END]");
auto Nested = createAnd(createAnd(create(L1), create(L2)),
createOr(create(L3), create(L4), create(L5)));
EXPECT_EQ(llvm::to_string(*Nested),
"(& (& [1, 3, 5, 8, 9] [1, 5, 7, 9]) (| [0, 5] [0, 1, 5] []))");
"(& (& [{1}, 3, 5, 8, 9, END] [{1}, 5, 7, 9, END]) (| [0, {5}, "
"END] [0, {1}, 5, END] [{END}]))");
}
TEST(DexIndexIterators, Limit) {