Move adjacent view header to mimic STL files structure

SerhiiMalyi · SerhiiMalyi · commit 1d75849b07e3 · 2025-06-11T13:28:59.000+03:00
diff --git a/include/kf/stl/backport/ranges/detail/adjacent_view.h b/include/kf/stl/backport/ranges/detail/adjacent_view.h
@@ -23,20 +23,29 @@ namespace kf
 
         constexpr auto end()
         {
-            return Iterator{ AsSentinel{}, std::ranges::end(m_base) };
+            return Iterator{ std::ranges::end(m_base) };
         }
 
     private:
-        struct AsSentinel
-        {
-            explicit AsSentinel() = default;
-        };
-
-        struct Iterator
+        class Iterator
         {
+        private:
             using BaseIterator = std::ranges::iterator_t<Range>;
             std::array<BaseIterator, N> m_current{};
 
+        private:
+            constexpr auto transformToTuple(const decltype(m_current)& arr) const
+            {
+                return arrayToTuple(arr, std::make_index_sequence<N>{});
+            }
+
+            template <std::size_t... I>
+            constexpr auto arrayToTuple(const decltype(m_current)& arr, std::index_sequence<I...>) const
+            {
+                return std::tie((*arr[I])...);
+            }
+
+        public:
             constexpr Iterator(BaseIterator first, std::ranges::sentinel_t<Range> last)
             {
                 m_current.front() = first;
@@ -47,7 +56,7 @@ namespace kf
                 }
             }
 
-            constexpr Iterator(AsSentinel, BaseIterator last)
+            constexpr Iterator(BaseIterator last)
             {
                 if constexpr (!std::ranges::bidirectional_range<Range>)
                 {
@@ -64,17 +73,6 @@ namespace kf
                 }
             }
 
-            template <std::size_t... I>
-            constexpr auto arrayToTuple(const decltype(m_current)& arr, std::index_sequence<I...>) const
-            {
-                return std::tie((*arr[I])...);
-            }
-
-            constexpr auto transformToTuple(const decltype(m_current)& arr) const
-            {
-                return arrayToTuple(arr, std::make_index_sequence<N>{});
-            }
-
             constexpr auto operator*() const
             {
                 return transformToTuple(m_current);
diff --git a/include/kf/stl/backport/ranges/ranges b/include/kf/stl/backport/ranges/ranges
@@ -0,0 +1,2 @@
+#pragma once
+#include "detail\adjacent_view.h"

Original file line number	Diff line number	Diff line change
`@@ -23,20 +23,29 @@ namespace kf`
`23`	`23`
`24`	`24`	`constexpr auto end()`
`25`	`25`	`{`
`26`		`- return Iterator{ AsSentinel{}, std::ranges::end(m_base) };`
	`26`	`+ return Iterator{ std::ranges::end(m_base) };`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private:`
`30`		`- struct AsSentinel`
`31`		`- {`
`32`		`- explicit AsSentinel() = default;`
`33`		`- };`
`34`		`-`
`35`		`- struct Iterator`
	`30`	`+ class Iterator`
`36`	`31`	`{`
	`32`	`+ private:`
`37`	`33`	`using BaseIterator = std::ranges::iterator_t<Range>;`
`38`	`34`	`std::array<BaseIterator, N> m_current{};`
`39`	`35`
	`36`	`+ private:`
	`37`	`+ constexpr auto transformToTuple(const decltype(m_current)& arr) const`
	`38`	`+ {`
	`39`	`+ return arrayToTuple(arr, std::make_index_sequence<N>{});`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ template <std::size_t... I>`
	`43`	`+ constexpr auto arrayToTuple(const decltype(m_current)& arr, std::index_sequence<I...>) const`
	`44`	`+ {`
	`45`	`+ return std::tie((*arr[I])...);`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ public:`
`40`	`49`	`constexpr Iterator(BaseIterator first, std::ranges::sentinel_t<Range> last)`
`41`	`50`	`{`
`42`	`51`	`m_current.front() = first;`
`@@ -47,7 +56,7 @@ namespace kf`
`47`	`56`	`}`
`48`	`57`	`}`
`49`	`58`
`50`		`- constexpr Iterator(AsSentinel, BaseIterator last)`
	`59`	`+ constexpr Iterator(BaseIterator last)`
`51`	`60`	`{`
`52`	`61`	`if constexpr (!std::ranges::bidirectional_range<Range>)`
`53`	`62`	`{`
`@@ -64,17 +73,6 @@ namespace kf`
`64`	`73`	`}`
`65`	`74`	`}`
`66`	`75`
`67`		`- template <std::size_t... I>`
`68`		`- constexpr auto arrayToTuple(const decltype(m_current)& arr, std::index_sequence<I...>) const`
`69`		`- {`
`70`		`- return std::tie((*arr[I])...);`
`71`		`- }`
`72`		`-`
`73`		`- constexpr auto transformToTuple(const decltype(m_current)& arr) const`
`74`		`- {`
`75`		`- return arrayToTuple(arr, std::make_index_sequence<N>{});`
`76`		`- }`
`77`		`-`
`78`	`76`	`constexpr auto operator*() const`
`79`	`77`	`{`
`80`	`78`	`return transformToTuple(m_current);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#pragma once`
	`2`	`+#include "detail\adjacent_view.h"`