diff options
Diffstat (limited to 'include/llvm/ADT/DepthFirstIterator.h')
| -rw-r--r-- | include/llvm/ADT/DepthFirstIterator.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/include/llvm/ADT/DepthFirstIterator.h b/include/llvm/ADT/DepthFirstIterator.h index d79b9acacfa9..c9317b8539b3 100644 --- a/include/llvm/ADT/DepthFirstIterator.h +++ b/include/llvm/ADT/DepthFirstIterator.h @@ -58,7 +58,6 @@ public: SetType &Visited; }; - // Generic Depth First Iterator template<class GraphT, class SetType = llvm::SmallPtrSet<typename GraphTraits<GraphT>::NodeType*, 8>, @@ -76,21 +75,22 @@ class df_iterator : public std::iterator<std::forward_iterator_tag, // VisitStack - Used to maintain the ordering. Top = current block // First element is node pointer, second is the 'next child' to visit // if the int in PointerIntTy is 0, the 'next child' to visit is invalid - std::vector<std::pair<PointerIntTy, ChildItTy> > VisitStack; + std::vector<std::pair<PointerIntTy, ChildItTy>> VisitStack; + private: inline df_iterator(NodeType *Node) { this->Visited.insert(Node); - VisitStack.push_back(std::make_pair(PointerIntTy(Node, 0), - GT::child_begin(Node))); + VisitStack.push_back( + std::make_pair(PointerIntTy(Node, 0), GT::child_begin(Node))); } - inline df_iterator() { - // End is when stack is empty + inline df_iterator() { + // End is when stack is empty } inline df_iterator(NodeType *Node, SetType &S) : df_iterator_storage<SetType, ExtStorage>(S) { if (!S.count(Node)) { - VisitStack.push_back(std::make_pair(PointerIntTy(Node, 0), - GT::child_begin(Node))); + VisitStack.push_back( + std::make_pair(PointerIntTy(Node, 0), GT::child_begin(Node))); this->Visited.insert(Node); } } @@ -115,8 +115,8 @@ private: // Has our next sibling been visited? if (Next && this->Visited.insert(Next).second) { // No, do it now. - VisitStack.push_back(std::make_pair(PointerIntTy(Next, 0), - GT::child_begin(Next))); + VisitStack.push_back( + std::make_pair(PointerIntTy(Next, 0), GT::child_begin(Next))); return; } } @@ -195,7 +195,6 @@ public: } }; - // Provide global constructors that automatically figure out correct types... // template <class T> @@ -237,7 +236,6 @@ iterator_range<df_ext_iterator<T, SetTy>> depth_first_ext(const T& G, return make_range(df_ext_begin(G, S), df_ext_end(G, S)); } - // Provide global definitions of inverse depth first iterators... template <class T, class SetTy = llvm::SmallPtrSet<typename GraphTraits<T>::NodeType*, 8>, |