replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Recommit simplification first attempted in r232309 (fixed a bit in r232312, with fixes in r232314) 

Messed it up because I didn't realize there were two different iterators
here (& clearly didn't build any of this... ) - still seems easier to
just use the injected class name than introduce a self typedef.

llvm-svn: 232462
This commit is contained in:
David Blaikie 2015-03-17 05:49:45 +00:00
parent 3dfb86b641
commit b326765175
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
llvm/include/llvm/ADT/ImmutableSet.h
View File

@ -654,7 +654,6 @@ public:
Flags=0x3 };
typedef ImutAVLTree<ImutInfo> TreeTy;
typedef ImutAVLTreeGenericIterator<ImutInfo> SelfTy;
ImutAVLTreeGenericIterator() {}
ImutAVLTreeGenericIterator(const TreeTy *Root) {
@ -696,11 +695,15 @@ public:
}
}
bool operator==(const SelfTy &x) const { return stack == x.stack; }
bool operator==(const ImutAVLTreeGenericIterator &x) const {
return stack == x.stack;
}
bool operator!=(const SelfTy &x) const { return !operator==(x); }
bool operator!=(const ImutAVLTreeGenericIterator &x) const {
return !(*this == x);
}
SelfTy &operator++() {
ImutAVLTreeGenericIterator &operator++() {
assert(!stack.empty());
TreeTy* Current = reinterpret_cast<TreeTy*>(stack.back() & ~Flags);
assert(Current);
@ -726,7 +729,7 @@ public:
return *this;
}
SelfTy &operator--() {
ImutAVLTreeGenericIterator &operator--() {
assert(!stack.empty());
TreeTy* Current = reinterpret_cast<TreeTy*>(stack.back() & ~Flags);
assert(Current);
@ -761,7 +764,6 @@ class ImutAVLTreeInOrderIterator
public:
typedef ImutAVLTree<ImutInfo> TreeTy;
typedef ImutAVLTreeInOrderIterator<ImutInfo> SelfTy;
ImutAVLTreeInOrderIterator(const TreeTy* Root) : InternalItr(Root) {
if (Root)
@ -770,16 +772,18 @@ public:
ImutAVLTreeInOrderIterator() : InternalItr() {}
bool operator==(const SelfTy &x) const {
bool operator==(const ImutAVLTreeInOrderIterator &x) const {
return InternalItr == x.InternalItr;
}
bool operator!=(const SelfTy &x) const { return !(*this == x); }
bool operator!=(const ImutAVLTreeInOrderIterator &x) const {
return !(*this == x);
}
TreeTy &operator*() const { return *InternalItr; }
TreeTy *operator->() const { return &*InternalItr; }
SelfTy &operator++() {
ImutAVLTreeInOrderIterator &operator++() {
do ++InternalItr;
while (!InternalItr.atEnd() &&
InternalItr.getVisitState() != InternalIteratorTy::VisitedLeft);
@ -787,7 +791,7 @@ public:
return *this;
}
SelfTy &operator--() {
ImutAVLTreeInOrderIterator &operator--() {
do --InternalItr;
while (!InternalItr.atBeginning() &&
InternalItr.getVisitState() != InternalIteratorTy::VisitedLeft);