reuse common code

Author: changkhothuychung

libcxx/test/std/ranges/range.adaptors/range.concat/begin.pass.cpp

@@ -14,6 +14,7 @@
 #include <cassert>
 #include "test_iterators.h"
 #include "types.h"
+#include "../range_adaptor_types.h"
 
 template <class T>
 concept HasConstBegin = requires(const T& ct) { ct.begin(); };

libcxx/test/std/ranges/range.adaptors/range.concat/end.pass.cpp

@@ -13,6 +13,7 @@
 
 #include "test_iterators.h"
 #include "types.h"
+#include "../range_adaptor_types.h"
 
 constexpr bool test() {
   int buffer1[5] = {1, 2, 3, 4, 5};

libcxx/test/std/ranges/range.adaptors/range.concat/size.pass.cpp

@@ -13,6 +13,7 @@
 
 #include "test_iterators.h"
 #include "types.h"
+#include "../range_adaptor_types.h"
 
 int buffer[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
 struct View : std::ranges::view_base {

libcxx/test/std/ranges/range.adaptors/range.concat/types.h

@@ -42,143 +42,4 @@ struct minimal_view : std::ranges::view_base {
   decltype(base(std::declval<Sent>())) sent_;
 };
 
-template <class T>
-struct BufferView : std::ranges::view_base {
-  T* buffer_;
-  std::size_t size_;
-
-  template <std::size_t N>
-  constexpr BufferView(T (&b)[N]) : buffer_(b), size_(N) {}
-};
-
-using IntBufferView = BufferView<int>;
-
-template <bool Simple>
-struct Common : IntBufferView {
-  using IntBufferView::IntBufferView;
-
-  constexpr int* begin()
-    requires(!Simple)
-  {
-    return buffer_;
-  }
-  constexpr const int* begin() const { return buffer_; }
-  constexpr int* end()
-    requires(!Simple)
-  {
-    return buffer_ + size_;
-  }
-  constexpr const int* end() const { return buffer_ + size_; }
-};
-
-using SimpleCommon    = Common<true>;
-using NonSimpleCommon = Common<false>;
-
-using SimpleCommonRandomAccessSized    = SimpleCommon;
-using NonSimpleCommonRandomAccessSized = NonSimpleCommon;
-
-template <bool Simple>
-struct NonCommon : IntBufferView {
-  using IntBufferView::IntBufferView;
-  constexpr int* begin()
-    requires(!Simple)
-  {
-    return buffer_;
-  }
-  constexpr const int* begin() const { return buffer_; }
-  constexpr sentinel_wrapper<int*> end()
-    requires(!Simple)
-  {
-    return sentinel_wrapper<int*>(buffer_ + size_);
-  }
-  constexpr sentinel_wrapper<const int*> end() const { return sentinel_wrapper<const int*>(buffer_ + size_); }
-};
-
-using SimpleNonCommon    = NonCommon<true>;
-using NonSimpleNonCommon = NonCommon<false>;
-
-template <bool Simple>
-struct NonCommonSized : IntBufferView {
-  using IntBufferView::IntBufferView;
-  constexpr int* begin()
-    requires(!Simple)
-  {
-    return buffer_;
-  }
-  constexpr const int* begin() const { return buffer_; }
-  constexpr sentinel_wrapper<int*> end()
-    requires(!Simple)
-  {
-    return sentinel_wrapper<int*>(buffer_ + size_);
-  }
-  constexpr sentinel_wrapper<const int*> end() const { return sentinel_wrapper<const int*>(buffer_ + size_); }
-  constexpr std::size_t size() const { return size_; }
-};
-
-using SimpleNonCommonSized                = NonCommonSized<true>;
-using SimpleNonCommonRandomAccessSized    = SimpleNonCommonSized;
-using NonSimpleNonCommonSized             = NonCommonSized<false>;
-using NonSimpleNonCommonRandomAccessSized = NonSimpleNonCommonSized;
-
-template <bool Simple>
-struct NonCommonNonRandom : IntBufferView {
-  using IntBufferView::IntBufferView;
-
-  using const_iterator = forward_iterator<const int*>;
-  using iterator       = forward_iterator<int*>;
-
-  constexpr iterator begin()
-    requires(!Simple)
-  {
-    return iterator(buffer_);
-  }
-  constexpr const_iterator begin() const { return const_iterator(buffer_); }
-  constexpr sentinel_wrapper<iterator> end()
-    requires(!Simple)
-  {
-    return sentinel_wrapper<iterator>(iterator(buffer_ + size_));
-  }
-  constexpr sentinel_wrapper<const_iterator> end() const {
-    return sentinel_wrapper<const_iterator>(const_iterator(buffer_ + size_));
-  }
-};
-
-using SimpleNonCommonNonRandom    = NonCommonNonRandom<true>;
-using NonSimpleNonCommonNonRandom = NonCommonNonRandom<false>;
-
-template <class Iter, class Sent = Iter, class NonConstIter = Iter, class NonConstSent = Sent>
-struct BasicView : IntBufferView {
-  using IntBufferView::IntBufferView;
-
-  constexpr NonConstIter begin()
-    requires(!std::is_same_v<Iter, NonConstIter>)
-  {
-    return NonConstIter(buffer_);
-  }
-  constexpr Iter begin() const { return Iter(buffer_); }
-
-  constexpr NonConstSent end()
-    requires(!std::is_same_v<Sent, NonConstSent>)
-  {
-    if constexpr (std::is_same_v<NonConstIter, NonConstSent>) {
-      return NonConstIter(buffer_ + size_);
-    } else {
-      return NonConstSent(NonConstIter(buffer_ + size_));
-    }
-  }
-
-  constexpr Sent end() const {
-    if constexpr (std::is_same_v<Iter, Sent>) {
-      return Iter(buffer_ + size_);
-    } else {
-      return Sent(Iter(buffer_ + size_));
-    }
-  }
-};
-
-using NonSizedRandomAccessView =
-    BasicView<random_access_iterator<int*>, sentinel_wrapper<random_access_iterator<int*>>>;
-
-using InputCommonView = BasicView<common_input_iterator<int*>>;
-
 #endif // TEST_STD_RANGES_RANGE_ADAPTORS_CONCAT_FILTER_TYPES_H