[llvm] r235038 - Update for post-commit review comments

Daniel Berlin dberlin at dberlin.org
Wed Apr 15 12:36:11 PDT 2015


Author: dannyb
Date: Wed Apr 15 14:36:10 2015
New Revision: 235038

URL: http://llvm.org/viewvc/llvm-project?rev=235038&view=rev
Log:
Update for post-commit review comments

Modified:
    llvm/trunk/include/llvm/ADT/DepthFirstIterator.h
    llvm/trunk/include/llvm/ADT/PostOrderIterator.h

Modified: llvm/trunk/include/llvm/ADT/DepthFirstIterator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/DepthFirstIterator.h?rev=235038&r1=235037&r2=235038&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/DepthFirstIterator.h (original)
+++ llvm/trunk/include/llvm/ADT/DepthFirstIterator.h Wed Apr 15 14:36:10 2015
@@ -209,7 +209,7 @@ df_iterator<T> df_end(const T& G) {
 // Provide an accessor method to use them in range-based patterns.
 template <class T>
 iterator_range<df_iterator<T>> depth_first(const T& G) {
-  return iterator_range<df_iterator<T>>(df_begin(G), df_end(G));
+  return make_range(df_begin(G), df_end(G));
 }
 
 // Provide global definitions of external depth first iterators...
@@ -232,8 +232,7 @@ df_ext_iterator<T, SetTy> df_ext_end(con
 template <class T, class SetTy>
 iterator_range<df_ext_iterator<T, SetTy>> depth_first_ext(const T& G,
                                                           SetTy &S) {
-  return iterator_range<df_ext_iterator<T, SetTy>>(df_ext_begin(G, S),
-                                                   df_ext_end(G, S));
+  return make_range(df_ext_begin(G, S), df_ext_end(G, S));
 }
 
 
@@ -259,7 +258,7 @@ idf_iterator<T> idf_end(const T& G){
 // Provide an accessor method to use them in range-based patterns.
 template <class T>
 iterator_range<idf_iterator<T>> inverse_depth_first(const T& G) {
-  return iterator_range<idf_iterator<T>>(idf_begin(G), idf_end(G));
+  return make_range(idf_begin(G), idf_end(G));
 }
 
 // Provide global definitions of external inverse depth first iterators...
@@ -284,8 +283,7 @@ idf_ext_iterator<T, SetTy> idf_ext_end(c
 template <class T, class SetTy>
 iterator_range<idf_ext_iterator<T, SetTy>> inverse_depth_first_ext(const T& G,
                                                                    SetTy &S) {
-  return iterator_range<idf_ext_iterator<T, SetTy>>(idf_ext_begin(G, S),
-                                                    idf_ext_end(G, S));
+  return make_range(idf_ext_begin(G, S), idf_ext_end(G, S));
 }
 
 } // End llvm namespace

Modified: llvm/trunk/include/llvm/ADT/PostOrderIterator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/PostOrderIterator.h?rev=235038&r1=235037&r2=235038&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/PostOrderIterator.h (original)
+++ llvm/trunk/include/llvm/ADT/PostOrderIterator.h Wed Apr 15 14:36:10 2015
@@ -175,12 +175,12 @@ public:
 // Provide global constructors that automatically figure out correct types...
 //
 template <class T>
-po_iterator<T> po_begin(T G) { return po_iterator<T>::begin(G); }
+po_iterator<T> po_begin(const T &G) { return po_iterator<T>::begin(G); }
 template <class T>
-po_iterator<T> po_end  (T G) { return po_iterator<T>::end(G); }
+po_iterator<T> po_end  (const T &G) { return po_iterator<T>::end(G); }
 
-template <class T> iterator_range<po_iterator<T>> post_order(T G) {
-  return iterator_range<po_iterator<T>>(po_begin(G), po_end(G));
+template <class T> iterator_range<po_iterator<T>> post_order(const T &G) {
+  return make_range(po_begin(G), po_end(G));
 }
 
 // Provide global definitions of external postorder iterators...
@@ -201,9 +201,8 @@ po_ext_iterator<T, SetType> po_ext_end(T
 }
 
 template <class T, class SetType>
-iterator_range<po_ext_iterator<T, SetType>> post_order_ext(T G, SetType &S) {
-  return iterator_range<po_ext_iterator<T, SetType>>(po_ext_begin(G, S),
-                                                     po_ext_end(G, S));
+iterator_range<po_ext_iterator<T, SetType>> post_order_ext(const T &G, SetType &S) {
+  return make_range(po_ext_begin(G, S), po_ext_end(G, S));
 }
 
 // Provide global definitions of inverse post order iterators...
@@ -216,18 +215,18 @@ struct ipo_iterator : public po_iterator
 };
 
 template <class T>
-ipo_iterator<T> ipo_begin(T G, bool Reverse = false) {
+ipo_iterator<T> ipo_begin(const T &G, bool Reverse = false) {
   return ipo_iterator<T>::begin(G, Reverse);
 }
 
 template <class T>
-ipo_iterator<T> ipo_end(T G){
+ipo_iterator<T> ipo_end(const T &G){
   return ipo_iterator<T>::end(G);
 }
 
 template <class T>
-iterator_range<ipo_iterator<T>> inverse_post_order(T G, bool Reverse = false) {
-  return iterator_range<ipo_iterator<T>>(ipo_begin(G, Reverse), ipo_end(G));
+iterator_range<ipo_iterator<T>> inverse_post_order(const T &G, bool Reverse = false) {
+  return make_range(ipo_begin(G, Reverse), ipo_end(G));
 }
 
 // Provide global definitions of external inverse postorder iterators...
@@ -241,20 +240,19 @@ struct ipo_ext_iterator : public ipo_ite
 };
 
 template <class T, class SetType>
-ipo_ext_iterator<T, SetType> ipo_ext_begin(T G, SetType &S) {
+ipo_ext_iterator<T, SetType> ipo_ext_begin(const T &G, SetType &S) {
   return ipo_ext_iterator<T, SetType>::begin(G, S);
 }
 
 template <class T, class SetType>
-ipo_ext_iterator<T, SetType> ipo_ext_end(T G, SetType &S) {
+ipo_ext_iterator<T, SetType> ipo_ext_end(const T &G, SetType &S) {
   return ipo_ext_iterator<T, SetType>::end(G, S);
 }
 
 template <class T, class SetType>
 iterator_range<ipo_ext_iterator<T, SetType>>
-inverse_post_order_ext(T G, SetType &S) {
-  return iterator_range<ipo_ext_iterator<T, SetType>>(ipo_ext_begin(G, S),
-                                                      ipo_ext_end(G, S));
+inverse_post_order_ext(const T &G, SetType &S) {
+  return make_range(ipo_ext_begin(G, S), ipo_ext_end(G, S));
 }
 
 //===--------------------------------------------------------------------===//





More information about the llvm-commits mailing list