Merge pull request #2535 from gouarin/rename-reverse-storage-iterator

JohanMabille · web-flow · commit 53ad31cf5d11 · 2022-05-13T10:25:39.000+02:00
rename storage_rbegin, storage_rend, ... to linear_rbegin, ...
diff --git a/include/xtensor/xcontainer.hpp b/include/xtensor/xcontainer.hpp
@@ -197,13 +197,13 @@ namespace xt
         const_linear_iterator linear_cbegin() const noexcept;
         const_linear_iterator linear_cend() const noexcept;
 
-        reverse_linear_iterator storage_rbegin() noexcept;
-        reverse_linear_iterator storage_rend() noexcept;
+        reverse_linear_iterator linear_rbegin() noexcept;
+        reverse_linear_iterator linear_rend() noexcept;
 
-        const_reverse_linear_iterator storage_rbegin() const noexcept;
-        const_reverse_linear_iterator storage_rend() const noexcept;
-        const_reverse_linear_iterator storage_crbegin() const noexcept;
-        const_reverse_linear_iterator storage_crend() const noexcept;
+        const_reverse_linear_iterator linear_rbegin() const noexcept;
+        const_reverse_linear_iterator linear_rend() const noexcept;
+        const_reverse_linear_iterator linear_crbegin() const noexcept;
+        const_reverse_linear_iterator linear_crend() const noexcept;
 
         using container_iterator = linear_iterator;
         using const_container_iterator = const_linear_iterator;
@@ -788,37 +788,37 @@ namespace xt
     }
 
     template <class D>
-    inline auto xcontainer<D>::storage_rbegin() noexcept -> reverse_linear_iterator
+    inline auto xcontainer<D>::linear_rbegin() noexcept -> reverse_linear_iterator
     {
         return storage().rbegin();
     }
 
     template <class D>
-    inline auto xcontainer<D>::storage_rend() noexcept -> reverse_linear_iterator
+    inline auto xcontainer<D>::linear_rend() noexcept -> reverse_linear_iterator
     {
         return storage().rend();
     }
 
     template <class D>
-    inline auto xcontainer<D>::storage_rbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xcontainer<D>::linear_rbegin() const noexcept -> const_reverse_linear_iterator
     {
         return storage().rbegin();
     }
 
     template <class D>
-    inline auto xcontainer<D>::storage_rend() const noexcept -> const_reverse_linear_iterator
+    inline auto xcontainer<D>::linear_rend() const noexcept -> const_reverse_linear_iterator
     {
         return storage().rend();
     }
 
     template <class D>
-    inline auto xcontainer<D>::storage_crbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xcontainer<D>::linear_crbegin() const noexcept -> const_reverse_linear_iterator
     {
         return storage().crbegin();
     }
 
     template <class D>
-    inline auto xcontainer<D>::storage_crend() const noexcept -> const_reverse_linear_iterator
+    inline auto xcontainer<D>::linear_crend() const noexcept -> const_reverse_linear_iterator
     {
         return storage().crend();
     }
diff --git a/include/xtensor/xexpression.hpp b/include/xtensor/xexpression.hpp
@@ -579,12 +579,12 @@ namespace xt
         XTENSOR_FORWARD_CONST_METHOD(linear_cbegin)
         XTENSOR_FORWARD_CONST_METHOD(linear_cend)
 
-        XTENSOR_FORWARD_METHOD(storage_rbegin)
-        XTENSOR_FORWARD_METHOD(storage_rend)
-        XTENSOR_FORWARD_CONST_METHOD(storage_rbegin)
-        XTENSOR_FORWARD_CONST_METHOD(storage_rend)
-        XTENSOR_FORWARD_CONST_METHOD(storage_crbegin)
-        XTENSOR_FORWARD_CONST_METHOD(storage_crend)
+        XTENSOR_FORWARD_METHOD(linear_rbegin)
+        XTENSOR_FORWARD_METHOD(linear_rend)
+        XTENSOR_FORWARD_CONST_METHOD(linear_rbegin)
+        XTENSOR_FORWARD_CONST_METHOD(linear_rend)
+        XTENSOR_FORWARD_CONST_METHOD(linear_crbegin)
+        XTENSOR_FORWARD_CONST_METHOD(linear_crend)
 
         template <class T = E>
         std::enable_if_t<has_strides<T>::value, const inner_strides_type&>
diff --git a/include/xtensor/xfunction.hpp b/include/xtensor/xfunction.hpp
@@ -297,10 +297,10 @@ namespace xt
         const_linear_iterator linear_cbegin() const noexcept;
         const_linear_iterator linear_cend() const noexcept;
 
-        const_reverse_linear_iterator storage_rbegin() const noexcept;
-        const_reverse_linear_iterator storage_rend() const noexcept;
-        const_reverse_linear_iterator storage_crbegin() const noexcept;
-        const_reverse_linear_iterator storage_crend() const noexcept;
+        const_reverse_linear_iterator linear_rbegin() const noexcept;
+        const_reverse_linear_iterator linear_rend() const noexcept;
+        const_reverse_linear_iterator linear_crbegin() const noexcept;
+        const_reverse_linear_iterator linear_crend() const noexcept;
 
         template <class S>
         const_stepper stepper_begin(const S& shape) const noexcept;
@@ -712,25 +712,25 @@ namespace xt
     }
 
     template <class F, class... CT>
-    inline auto xfunction<F, CT...>::storage_rbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunction<F, CT...>::linear_rbegin() const noexcept -> const_reverse_linear_iterator
     {
-        return storage_crbegin();
+        return linear_crbegin();
     }
 
     template <class F, class... CT>
-    inline auto xfunction<F, CT...>::storage_rend() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunction<F, CT...>::linear_rend() const noexcept -> const_reverse_linear_iterator
     {
-        return storage_crend();
+        return linear_crend();
     }
 
     template <class F, class... CT>
-    inline auto xfunction<F, CT...>::storage_crbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunction<F, CT...>::linear_crbegin() const noexcept -> const_reverse_linear_iterator
     {
         return const_reverse_linear_iterator(linear_cend());
     }
 
     template <class F, class... CT>
-    inline auto xfunction<F, CT...>::storage_crend() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunction<F, CT...>::linear_crend() const noexcept -> const_reverse_linear_iterator
     {
         return const_reverse_linear_iterator(linear_cbegin());
     }
diff --git a/include/xtensor/xfunctor_view.hpp b/include/xtensor/xfunctor_view.hpp
@@ -301,13 +301,13 @@ namespace xt
         const_linear_iterator linear_cbegin() const noexcept;
         const_linear_iterator linear_cend() const noexcept;
 
-        reverse_linear_iterator storage_rbegin() noexcept;
-        reverse_linear_iterator storage_rend() noexcept;
+        reverse_linear_iterator linear_rbegin() noexcept;
+        reverse_linear_iterator linear_rend() noexcept;
 
-        const_reverse_linear_iterator storage_rbegin() const noexcept;
-        const_reverse_linear_iterator storage_rend() const noexcept;
-        const_reverse_linear_iterator storage_crbegin() const noexcept;
-        const_reverse_linear_iterator storage_crend() const noexcept;
+        const_reverse_linear_iterator linear_rbegin() const noexcept;
+        const_reverse_linear_iterator linear_rend() const noexcept;
+        const_reverse_linear_iterator linear_crbegin() const noexcept;
+        const_reverse_linear_iterator linear_crend() const noexcept;
 
         template <class S>
         stepper stepper_begin(const S& shape) noexcept;
@@ -1257,39 +1257,39 @@ namespace xt
     }
 
     template <class D>
-    inline auto xfunctor_applier_base<D>::storage_rbegin() noexcept -> reverse_linear_iterator
+    inline auto xfunctor_applier_base<D>::linear_rbegin() noexcept -> reverse_linear_iterator
     {
-        return reverse_linear_iterator(m_e.storage_rbegin(), &m_functor);
+        return reverse_linear_iterator(m_e.linear_rbegin(), &m_functor);
     }
 
     template <class D>
-    inline auto xfunctor_applier_base<D>::storage_rend() noexcept -> reverse_linear_iterator
+    inline auto xfunctor_applier_base<D>::linear_rend() noexcept -> reverse_linear_iterator
     {
-        return reverse_linear_iterator(m_e.storage_rend(), &m_functor);
+        return reverse_linear_iterator(m_e.linear_rend(), &m_functor);
     }
 
     template <class D>
-    inline auto xfunctor_applier_base<D>::storage_rbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunctor_applier_base<D>::linear_rbegin() const noexcept -> const_reverse_linear_iterator
     {
-        return const_reverse_linear_iterator(m_e.storage_rbegin(), &m_functor);
+        return const_reverse_linear_iterator(m_e.linear_rbegin(), &m_functor);
     }
 
     template <class D>
-    inline auto xfunctor_applier_base<D>::storage_rend() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunctor_applier_base<D>::linear_rend() const noexcept -> const_reverse_linear_iterator
     {
-        return const_reverse_linear_iterator(m_e.storage_rend(), &m_functor);
+        return const_reverse_linear_iterator(m_e.linear_rend(), &m_functor);
     }
 
     template <class D>
-    inline auto xfunctor_applier_base<D>::storage_crbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunctor_applier_base<D>::linear_crbegin() const noexcept -> const_reverse_linear_iterator
     {
-        return const_reverse_linear_iterator(m_e.storage_crbegin(), &m_functor);
+        return const_reverse_linear_iterator(m_e.linear_crbegin(), &m_functor);
     }
 
     template <class D>
-    inline auto xfunctor_applier_base<D>::storage_crend() const noexcept -> const_reverse_linear_iterator
+    inline auto xfunctor_applier_base<D>::linear_crend() const noexcept -> const_reverse_linear_iterator
     {
-        return const_reverse_linear_iterator(m_e.storage_crend(), &m_functor);
+        return const_reverse_linear_iterator(m_e.linear_crend(), &m_functor);
     }
 
     /***************
diff --git a/include/xtensor/xiterable.hpp b/include/xtensor/xiterable.hpp
@@ -1026,7 +1026,7 @@ namespace xt
     {
         return xtl::mpl::static_if<L == static_layout>([&](auto self)
         {
-            return self(*this).derived_cast().storage_rbegin();
+            return self(*this).derived_cast().linear_rbegin();
         }, /*else*/ [&](auto self)
         {
             return self(*this).iterable_base::template rbegin<L>();
@@ -1044,7 +1044,7 @@ namespace xt
     {
         return xtl::mpl::static_if<L == static_layout>([&](auto self)
         {
-            return self(*this).derived_cast().storage_rend();
+            return self(*this).derived_cast().linear_rend();
         }, /*else*/ [&](auto self)
         {
             return self(*this).iterable_base::template rend<L>();
@@ -1085,7 +1085,7 @@ namespace xt
     {
         return xtl::mpl::static_if<L == static_layout>([&](auto self)
         {
-            return self(*this).derived_cast().storage_crbegin();
+            return self(*this).derived_cast().linear_crbegin();
         }, /*else*/ [&](auto self)
         {
             return self(*this).iterable_base::template crbegin<L>();
@@ -1103,7 +1103,7 @@ namespace xt
     {
         return xtl::mpl::static_if<L == static_layout>([&](auto self)
         {
-            return self(*this).derived_cast().storage_crend();
+            return self(*this).derived_cast().linear_crend();
         }, /*else*/ [&](auto self)
         {
             return self(*this).iterable_base::template crend<L>();
diff --git a/include/xtensor/xoptional_assembly_base.hpp b/include/xtensor/xoptional_assembly_base.hpp
@@ -224,13 +224,13 @@ namespace xt
         const_linear_iterator linear_cbegin() const noexcept;
         const_linear_iterator linear_cend() const noexcept;
 
-        reverse_linear_iterator storage_rbegin() noexcept;
-        reverse_linear_iterator storage_rend() noexcept;
+        reverse_linear_iterator linear_rbegin() noexcept;
+        reverse_linear_iterator linear_rend() noexcept;
 
-        const_reverse_linear_iterator storage_rbegin() const noexcept;
-        const_reverse_linear_iterator storage_rend() const noexcept;
-        const_reverse_linear_iterator storage_crbegin() const noexcept;
-        const_reverse_linear_iterator storage_crend() const noexcept;
+        const_reverse_linear_iterator linear_rbegin() const noexcept;
+        const_reverse_linear_iterator linear_rend() const noexcept;
+        const_reverse_linear_iterator linear_crbegin() const noexcept;
+        const_reverse_linear_iterator linear_crend() const noexcept;
 
         template <class S>
         stepper stepper_begin(const S& shape) noexcept;
@@ -869,37 +869,37 @@ namespace xt
     }
 
     template <class D>
-    inline auto xoptional_assembly_base<D>::storage_rbegin() noexcept -> reverse_linear_iterator
+    inline auto xoptional_assembly_base<D>::linear_rbegin() noexcept -> reverse_linear_iterator
     {
         return reverse_linear_iterator(linear_end());
     }
 
     template <class D>
-    inline auto xoptional_assembly_base<D>::storage_rend() noexcept -> reverse_linear_iterator
+    inline auto xoptional_assembly_base<D>::linear_rend() noexcept -> reverse_linear_iterator
     {
         return reverse_linear_iterator(linear_begin());
     }
 
     template <class D>
-    inline auto xoptional_assembly_base<D>::storage_rbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xoptional_assembly_base<D>::linear_rbegin() const noexcept -> const_reverse_linear_iterator
     {
-        return storage_crbegin();
+        return linear_crbegin();
     }
 
     template <class D>
-    inline auto xoptional_assembly_base<D>::storage_rend() const noexcept -> const_reverse_linear_iterator
+    inline auto xoptional_assembly_base<D>::linear_rend() const noexcept -> const_reverse_linear_iterator
     {
-        return storage_crend();
+        return linear_crend();
     }
 
     template <class D>
-    inline auto xoptional_assembly_base<D>::storage_crbegin() const noexcept -> const_reverse_linear_iterator
+    inline auto xoptional_assembly_base<D>::linear_crbegin() const noexcept -> const_reverse_linear_iterator
     {
         return const_reverse_linear_iterator(linear_cend());
     }
 
     template <class D>
-    inline auto xoptional_assembly_base<D>::storage_crend() const noexcept -> const_reverse_linear_iterator
+    inline auto xoptional_assembly_base<D>::linear_crend() const noexcept -> const_reverse_linear_iterator
     {
         return const_reverse_linear_iterator(linear_cbegin());
     }
diff --git a/include/xtensor/xscalar.hpp b/include/xtensor/xscalar.hpp
@@ -256,13 +256,13 @@ namespace xt
         const_iterator linear_cbegin() const noexcept;
         const_iterator linear_cend() const noexcept;
 
-        reverse_iterator storage_rbegin() noexcept;
-        reverse_iterator storage_rend() noexcept;
+        reverse_iterator linear_rbegin() noexcept;
+        reverse_iterator linear_rend() noexcept;
 
-        const_reverse_iterator storage_rbegin() const noexcept;
-        const_reverse_iterator storage_rend() const noexcept;
-        const_reverse_iterator storage_crbegin() const noexcept;
-        const_reverse_iterator storage_crend() const noexcept;
+        const_reverse_iterator linear_rbegin() const noexcept;
+        const_reverse_iterator linear_rend() const noexcept;
+        const_reverse_iterator linear_crbegin() const noexcept;
+        const_reverse_iterator linear_crend() const noexcept;
 
         template <class S>
         stepper stepper_begin(const S& shape) noexcept;
@@ -838,37 +838,37 @@ namespace xt
     }
 
     template <class CT>
-    inline auto xscalar<CT>::storage_rbegin() noexcept -> reverse_iterator
+    inline auto xscalar<CT>::linear_rbegin() noexcept -> reverse_iterator
     {
         return this->template rbegin<XTENSOR_DEFAULT_LAYOUT>();
     }
 
     template <class CT>
-    inline auto xscalar<CT>::storage_rend() noexcept -> reverse_iterator
+    inline auto xscalar<CT>::linear_rend() noexcept -> reverse_iterator
     {
         return this->template rend<XTENSOR_DEFAULT_LAYOUT>();
     }
 
     template <class CT>
-    inline auto xscalar<CT>::storage_rbegin() const noexcept -> const_reverse_iterator
+    inline auto xscalar<CT>::linear_rbegin() const noexcept -> const_reverse_iterator
     {
         return this->template rbegin<XTENSOR_DEFAULT_LAYOUT>();
     }
 
     template <class CT>
-    inline auto xscalar<CT>::storage_rend() const noexcept -> const_reverse_iterator
+    inline auto xscalar<CT>::linear_rend() const noexcept -> const_reverse_iterator
     {
         return this->template rend<XTENSOR_DEFAULT_LAYOUT>();
     }
 
     template <class CT>
-    inline auto xscalar<CT>::storage_crbegin() const noexcept -> const_reverse_iterator
+    inline auto xscalar<CT>::linear_crbegin() const noexcept -> const_reverse_iterator
     {
         return this->template crbegin<XTENSOR_DEFAULT_LAYOUT>();
     }
 
     template <class CT>
-    inline auto xscalar<CT>::storage_crend() const noexcept -> const_reverse_iterator
+    inline auto xscalar<CT>::linear_crend() const noexcept -> const_reverse_iterator
     {
         return this->template crend<XTENSOR_DEFAULT_LAYOUT>();
     }
diff --git a/include/xtensor/xview.hpp b/include/xtensor/xview.hpp
diff --git a/test/test_xfunction.cpp b/test/test_xfunction.cpp

Original file line number	Diff line number	Diff line change
`@@ -197,13 +197,13 @@ namespace xt`
`197`	`197`	`const_linear_iterator linear_cbegin() const noexcept;`
`198`	`198`	`const_linear_iterator linear_cend() const noexcept;`
`199`	`199`
`200`		`- reverse_linear_iterator storage_rbegin() noexcept;`
`201`		`- reverse_linear_iterator storage_rend() noexcept;`
	`200`	`+ reverse_linear_iterator linear_rbegin() noexcept;`
	`201`	`+ reverse_linear_iterator linear_rend() noexcept;`
`202`	`202`
`203`		`- const_reverse_linear_iterator storage_rbegin() const noexcept;`
`204`		`- const_reverse_linear_iterator storage_rend() const noexcept;`
`205`		`- const_reverse_linear_iterator storage_crbegin() const noexcept;`
`206`		`- const_reverse_linear_iterator storage_crend() const noexcept;`
	`203`	`+ const_reverse_linear_iterator linear_rbegin() const noexcept;`
	`204`	`+ const_reverse_linear_iterator linear_rend() const noexcept;`
	`205`	`+ const_reverse_linear_iterator linear_crbegin() const noexcept;`
	`206`	`+ const_reverse_linear_iterator linear_crend() const noexcept;`
`207`	`207`
`208`	`208`	`using container_iterator = linear_iterator;`
`209`	`209`	`using const_container_iterator = const_linear_iterator;`
`@@ -788,37 +788,37 @@ namespace xt`
`788`	`788`	`}`
`789`	`789`
`790`	`790`	`template <class D>`
`791`		`- inline auto xcontainer<D>::storage_rbegin() noexcept -> reverse_linear_iterator`
	`791`	`+ inline auto xcontainer<D>::linear_rbegin() noexcept -> reverse_linear_iterator`
`792`	`792`	`{`
`793`	`793`	`return storage().rbegin();`
`794`	`794`	`}`
`795`	`795`
`796`	`796`	`template <class D>`
`797`		`- inline auto xcontainer<D>::storage_rend() noexcept -> reverse_linear_iterator`
	`797`	`+ inline auto xcontainer<D>::linear_rend() noexcept -> reverse_linear_iterator`
`798`	`798`	`{`
`799`	`799`	`return storage().rend();`
`800`	`800`	`}`
`801`	`801`
`802`	`802`	`template <class D>`
`803`		`- inline auto xcontainer<D>::storage_rbegin() const noexcept -> const_reverse_linear_iterator`
	`803`	`+ inline auto xcontainer<D>::linear_rbegin() const noexcept -> const_reverse_linear_iterator`
`804`	`804`	`{`
`805`	`805`	`return storage().rbegin();`
`806`	`806`	`}`
`807`	`807`
`808`	`808`	`template <class D>`
`809`		`- inline auto xcontainer<D>::storage_rend() const noexcept -> const_reverse_linear_iterator`
	`809`	`+ inline auto xcontainer<D>::linear_rend() const noexcept -> const_reverse_linear_iterator`
`810`	`810`	`{`
`811`	`811`	`return storage().rend();`
`812`	`812`	`}`
`813`	`813`
`814`	`814`	`template <class D>`
`815`		`- inline auto xcontainer<D>::storage_crbegin() const noexcept -> const_reverse_linear_iterator`
	`815`	`+ inline auto xcontainer<D>::linear_crbegin() const noexcept -> const_reverse_linear_iterator`
`816`	`816`	`{`
`817`	`817`	`return storage().crbegin();`
`818`	`818`	`}`
`819`	`819`
`820`	`820`	`template <class D>`
`821`		`- inline auto xcontainer<D>::storage_crend() const noexcept -> const_reverse_linear_iterator`
	`821`	`+ inline auto xcontainer<D>::linear_crend() const noexcept -> const_reverse_linear_iterator`
`822`	`822`	`{`
`823`	`823`	`return storage().crend();`
`824`	`824`	`}`
Original file line number	Diff line number	Diff line change
`@@ -297,10 +297,10 @@ namespace xt`
`297`	`297`	`const_linear_iterator linear_cbegin() const noexcept;`
`298`	`298`	`const_linear_iterator linear_cend() const noexcept;`
`299`	`299`
`300`		`- const_reverse_linear_iterator storage_rbegin() const noexcept;`
`301`		`- const_reverse_linear_iterator storage_rend() const noexcept;`
`302`		`- const_reverse_linear_iterator storage_crbegin() const noexcept;`
`303`		`- const_reverse_linear_iterator storage_crend() const noexcept;`
	`300`	`+ const_reverse_linear_iterator linear_rbegin() const noexcept;`
	`301`	`+ const_reverse_linear_iterator linear_rend() const noexcept;`
	`302`	`+ const_reverse_linear_iterator linear_crbegin() const noexcept;`
	`303`	`+ const_reverse_linear_iterator linear_crend() const noexcept;`
`304`	`304`
`305`	`305`	`template <class S>`
`306`	`306`	`const_stepper stepper_begin(const S& shape) const noexcept;`
`@@ -712,25 +712,25 @@ namespace xt`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`template <class F, class... CT>`
`715`		`- inline auto xfunction<F, CT...>::storage_rbegin() const noexcept -> const_reverse_linear_iterator`
	`715`	`+ inline auto xfunction<F, CT...>::linear_rbegin() const noexcept -> const_reverse_linear_iterator`
`716`	`716`	`{`
`717`		`- return storage_crbegin();`
	`717`	`+ return linear_crbegin();`
`718`	`718`	`}`
`719`	`719`
`720`	`720`	`template <class F, class... CT>`
`721`		`- inline auto xfunction<F, CT...>::storage_rend() const noexcept -> const_reverse_linear_iterator`
	`721`	`+ inline auto xfunction<F, CT...>::linear_rend() const noexcept -> const_reverse_linear_iterator`
`722`	`722`	`{`
`723`		`- return storage_crend();`
	`723`	`+ return linear_crend();`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`template <class F, class... CT>`
`727`		`- inline auto xfunction<F, CT...>::storage_crbegin() const noexcept -> const_reverse_linear_iterator`
	`727`	`+ inline auto xfunction<F, CT...>::linear_crbegin() const noexcept -> const_reverse_linear_iterator`
`728`	`728`	`{`
`729`	`729`	`return const_reverse_linear_iterator(linear_cend());`
`730`	`730`	`}`
`731`	`731`
`732`	`732`	`template <class F, class... CT>`
`733`		`- inline auto xfunction<F, CT...>::storage_crend() const noexcept -> const_reverse_linear_iterator`
	`733`	`+ inline auto xfunction<F, CT...>::linear_crend() const noexcept -> const_reverse_linear_iterator`
`734`	`734`	`{`
`735`	`735`	`return const_reverse_linear_iterator(linear_cbegin());`
`736`	`736`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,13 +301,13 @@ namespace xt`
`301`	`301`	`const_linear_iterator linear_cbegin() const noexcept;`
`302`	`302`	`const_linear_iterator linear_cend() const noexcept;`
`303`	`303`
`304`		`- reverse_linear_iterator storage_rbegin() noexcept;`
`305`		`- reverse_linear_iterator storage_rend() noexcept;`
	`304`	`+ reverse_linear_iterator linear_rbegin() noexcept;`
	`305`	`+ reverse_linear_iterator linear_rend() noexcept;`
`306`	`306`
`307`		`- const_reverse_linear_iterator storage_rbegin() const noexcept;`
`308`		`- const_reverse_linear_iterator storage_rend() const noexcept;`
`309`		`- const_reverse_linear_iterator storage_crbegin() const noexcept;`
`310`		`- const_reverse_linear_iterator storage_crend() const noexcept;`
	`307`	`+ const_reverse_linear_iterator linear_rbegin() const noexcept;`
	`308`	`+ const_reverse_linear_iterator linear_rend() const noexcept;`
	`309`	`+ const_reverse_linear_iterator linear_crbegin() const noexcept;`
	`310`	`+ const_reverse_linear_iterator linear_crend() const noexcept;`
`311`	`311`
`312`	`312`	`template <class S>`
`313`	`313`	`stepper stepper_begin(const S& shape) noexcept;`
`@@ -1257,39 +1257,39 @@ namespace xt`
`1257`	`1257`	`}`
`1258`	`1258`
`1259`	`1259`	`template <class D>`
`1260`		`- inline auto xfunctor_applier_base<D>::storage_rbegin() noexcept -> reverse_linear_iterator`
	`1260`	`+ inline auto xfunctor_applier_base<D>::linear_rbegin() noexcept -> reverse_linear_iterator`
`1261`	`1261`	`{`
`1262`		`- return reverse_linear_iterator(m_e.storage_rbegin(), &m_functor);`
	`1262`	`+ return reverse_linear_iterator(m_e.linear_rbegin(), &m_functor);`
`1263`	`1263`	`}`
`1264`	`1264`
`1265`	`1265`	`template <class D>`
`1266`		`- inline auto xfunctor_applier_base<D>::storage_rend() noexcept -> reverse_linear_iterator`
	`1266`	`+ inline auto xfunctor_applier_base<D>::linear_rend() noexcept -> reverse_linear_iterator`
`1267`	`1267`	`{`
`1268`		`- return reverse_linear_iterator(m_e.storage_rend(), &m_functor);`
	`1268`	`+ return reverse_linear_iterator(m_e.linear_rend(), &m_functor);`
`1269`	`1269`	`}`
`1270`	`1270`
`1271`	`1271`	`template <class D>`
`1272`		`- inline auto xfunctor_applier_base<D>::storage_rbegin() const noexcept -> const_reverse_linear_iterator`
	`1272`	`+ inline auto xfunctor_applier_base<D>::linear_rbegin() const noexcept -> const_reverse_linear_iterator`
`1273`	`1273`	`{`
`1274`		`- return const_reverse_linear_iterator(m_e.storage_rbegin(), &m_functor);`
	`1274`	`+ return const_reverse_linear_iterator(m_e.linear_rbegin(), &m_functor);`
`1275`	`1275`	`}`
`1276`	`1276`
`1277`	`1277`	`template <class D>`
`1278`		`- inline auto xfunctor_applier_base<D>::storage_rend() const noexcept -> const_reverse_linear_iterator`
	`1278`	`+ inline auto xfunctor_applier_base<D>::linear_rend() const noexcept -> const_reverse_linear_iterator`
`1279`	`1279`	`{`
`1280`		`- return const_reverse_linear_iterator(m_e.storage_rend(), &m_functor);`
	`1280`	`+ return const_reverse_linear_iterator(m_e.linear_rend(), &m_functor);`
`1281`	`1281`	`}`
`1282`	`1282`
`1283`	`1283`	`template <class D>`
`1284`		`- inline auto xfunctor_applier_base<D>::storage_crbegin() const noexcept -> const_reverse_linear_iterator`
	`1284`	`+ inline auto xfunctor_applier_base<D>::linear_crbegin() const noexcept -> const_reverse_linear_iterator`
`1285`	`1285`	`{`
`1286`		`- return const_reverse_linear_iterator(m_e.storage_crbegin(), &m_functor);`
	`1286`	`+ return const_reverse_linear_iterator(m_e.linear_crbegin(), &m_functor);`
`1287`	`1287`	`}`
`1288`	`1288`
`1289`	`1289`	`template <class D>`
`1290`		`- inline auto xfunctor_applier_base<D>::storage_crend() const noexcept -> const_reverse_linear_iterator`
	`1290`	`+ inline auto xfunctor_applier_base<D>::linear_crend() const noexcept -> const_reverse_linear_iterator`
`1291`	`1291`	`{`
`1292`		`- return const_reverse_linear_iterator(m_e.storage_crend(), &m_functor);`
	`1292`	`+ return const_reverse_linear_iterator(m_e.linear_crend(), &m_functor);`
`1293`	`1293`	`}`
`1294`	`1294`
`1295`	`1295`	`/***************`
Original file line number	Diff line number	Diff line change
`@@ -1026,7 +1026,7 @@ namespace xt`
`1026`	`1026`	`{`
`1027`	`1027`	`return xtl::mpl::static_if<L == static_layout>([&](auto self)`
`1028`	`1028`	`{`
`1029`		`- return self(*this).derived_cast().storage_rbegin();`
	`1029`	`+ return self(*this).derived_cast().linear_rbegin();`
`1030`	`1030`	`}, /else/ [&](auto self)`
`1031`	`1031`	`{`
`1032`	`1032`	`return self(*this).iterable_base::template rbegin<L>();`
`@@ -1044,7 +1044,7 @@ namespace xt`
`1044`	`1044`	`{`
`1045`	`1045`	`return xtl::mpl::static_if<L == static_layout>([&](auto self)`
`1046`	`1046`	`{`
`1047`		`- return self(*this).derived_cast().storage_rend();`
	`1047`	`+ return self(*this).derived_cast().linear_rend();`
`1048`	`1048`	`}, /else/ [&](auto self)`
`1049`	`1049`	`{`
`1050`	`1050`	`return self(*this).iterable_base::template rend<L>();`
`@@ -1085,7 +1085,7 @@ namespace xt`
`1085`	`1085`	`{`
`1086`	`1086`	`return xtl::mpl::static_if<L == static_layout>([&](auto self)`
`1087`	`1087`	`{`
`1088`		`- return self(*this).derived_cast().storage_crbegin();`
	`1088`	`+ return self(*this).derived_cast().linear_crbegin();`
`1089`	`1089`	`}, /else/ [&](auto self)`
`1090`	`1090`	`{`
`1091`	`1091`	`return self(*this).iterable_base::template crbegin<L>();`
`@@ -1103,7 +1103,7 @@ namespace xt`
`1103`	`1103`	`{`
`1104`	`1104`	`return xtl::mpl::static_if<L == static_layout>([&](auto self)`
`1105`	`1105`	`{`
`1106`		`- return self(*this).derived_cast().storage_crend();`
	`1106`	`+ return self(*this).derived_cast().linear_crend();`
`1107`	`1107`	`}, /else/ [&](auto self)`
`1108`	`1108`	`{`
`1109`	`1109`	`return self(*this).iterable_base::template crend<L>();`
Original file line number	Diff line number	Diff line change
`@@ -224,13 +224,13 @@ namespace xt`
`224`	`224`	`const_linear_iterator linear_cbegin() const noexcept;`
`225`	`225`	`const_linear_iterator linear_cend() const noexcept;`
`226`	`226`
`227`		`- reverse_linear_iterator storage_rbegin() noexcept;`
`228`		`- reverse_linear_iterator storage_rend() noexcept;`
	`227`	`+ reverse_linear_iterator linear_rbegin() noexcept;`
	`228`	`+ reverse_linear_iterator linear_rend() noexcept;`
`229`	`229`
`230`		`- const_reverse_linear_iterator storage_rbegin() const noexcept;`
`231`		`- const_reverse_linear_iterator storage_rend() const noexcept;`
`232`		`- const_reverse_linear_iterator storage_crbegin() const noexcept;`
`233`		`- const_reverse_linear_iterator storage_crend() const noexcept;`
	`230`	`+ const_reverse_linear_iterator linear_rbegin() const noexcept;`
	`231`	`+ const_reverse_linear_iterator linear_rend() const noexcept;`
	`232`	`+ const_reverse_linear_iterator linear_crbegin() const noexcept;`
	`233`	`+ const_reverse_linear_iterator linear_crend() const noexcept;`
`234`	`234`
`235`	`235`	`template <class S>`
`236`	`236`	`stepper stepper_begin(const S& shape) noexcept;`
`@@ -869,37 +869,37 @@ namespace xt`
`869`	`869`	`}`
`870`	`870`
`871`	`871`	`template <class D>`
`872`		`- inline auto xoptional_assembly_base<D>::storage_rbegin() noexcept -> reverse_linear_iterator`
	`872`	`+ inline auto xoptional_assembly_base<D>::linear_rbegin() noexcept -> reverse_linear_iterator`
`873`	`873`	`{`
`874`	`874`	`return reverse_linear_iterator(linear_end());`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`template <class D>`
`878`		`- inline auto xoptional_assembly_base<D>::storage_rend() noexcept -> reverse_linear_iterator`
	`878`	`+ inline auto xoptional_assembly_base<D>::linear_rend() noexcept -> reverse_linear_iterator`
`879`	`879`	`{`
`880`	`880`	`return reverse_linear_iterator(linear_begin());`
`881`	`881`	`}`
`882`	`882`
`883`	`883`	`template <class D>`
`884`		`- inline auto xoptional_assembly_base<D>::storage_rbegin() const noexcept -> const_reverse_linear_iterator`
	`884`	`+ inline auto xoptional_assembly_base<D>::linear_rbegin() const noexcept -> const_reverse_linear_iterator`
`885`	`885`	`{`
`886`		`- return storage_crbegin();`
	`886`	`+ return linear_crbegin();`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`template <class D>`
`890`		`- inline auto xoptional_assembly_base<D>::storage_rend() const noexcept -> const_reverse_linear_iterator`
	`890`	`+ inline auto xoptional_assembly_base<D>::linear_rend() const noexcept -> const_reverse_linear_iterator`
`891`	`891`	`{`
`892`		`- return storage_crend();`
	`892`	`+ return linear_crend();`
`893`	`893`	`}`
`894`	`894`
`895`	`895`	`template <class D>`
`896`		`- inline auto xoptional_assembly_base<D>::storage_crbegin() const noexcept -> const_reverse_linear_iterator`
	`896`	`+ inline auto xoptional_assembly_base<D>::linear_crbegin() const noexcept -> const_reverse_linear_iterator`
`897`	`897`	`{`
`898`	`898`	`return const_reverse_linear_iterator(linear_cend());`
`899`	`899`	`}`
`900`	`900`
`901`	`901`	`template <class D>`
`902`		`- inline auto xoptional_assembly_base<D>::storage_crend() const noexcept -> const_reverse_linear_iterator`
	`902`	`+ inline auto xoptional_assembly_base<D>::linear_crend() const noexcept -> const_reverse_linear_iterator`
`903`	`903`	`{`
`904`	`904`	`return const_reverse_linear_iterator(linear_cbegin());`
`905`	`905`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,13 +256,13 @@ namespace xt`
`256`	`256`	`const_iterator linear_cbegin() const noexcept;`
`257`	`257`	`const_iterator linear_cend() const noexcept;`
`258`	`258`
`259`		`- reverse_iterator storage_rbegin() noexcept;`
`260`		`- reverse_iterator storage_rend() noexcept;`
	`259`	`+ reverse_iterator linear_rbegin() noexcept;`
	`260`	`+ reverse_iterator linear_rend() noexcept;`
`261`	`261`
`262`		`- const_reverse_iterator storage_rbegin() const noexcept;`
`263`		`- const_reverse_iterator storage_rend() const noexcept;`
`264`		`- const_reverse_iterator storage_crbegin() const noexcept;`
`265`		`- const_reverse_iterator storage_crend() const noexcept;`
	`262`	`+ const_reverse_iterator linear_rbegin() const noexcept;`
	`263`	`+ const_reverse_iterator linear_rend() const noexcept;`
	`264`	`+ const_reverse_iterator linear_crbegin() const noexcept;`
	`265`	`+ const_reverse_iterator linear_crend() const noexcept;`
`266`	`266`
`267`	`267`	`template <class S>`
`268`	`268`	`stepper stepper_begin(const S& shape) noexcept;`
`@@ -838,37 +838,37 @@ namespace xt`
`838`	`838`	`}`
`839`	`839`
`840`	`840`	`template <class CT>`
`841`		`- inline auto xscalar<CT>::storage_rbegin() noexcept -> reverse_iterator`
	`841`	`+ inline auto xscalar<CT>::linear_rbegin() noexcept -> reverse_iterator`
`842`	`842`	`{`
`843`	`843`	`return this->template rbegin<XTENSOR_DEFAULT_LAYOUT>();`
`844`	`844`	`}`
`845`	`845`
`846`	`846`	`template <class CT>`
`847`		`- inline auto xscalar<CT>::storage_rend() noexcept -> reverse_iterator`
	`847`	`+ inline auto xscalar<CT>::linear_rend() noexcept -> reverse_iterator`
`848`	`848`	`{`
`849`	`849`	`return this->template rend<XTENSOR_DEFAULT_LAYOUT>();`
`850`	`850`	`}`
`851`	`851`
`852`	`852`	`template <class CT>`
`853`		`- inline auto xscalar<CT>::storage_rbegin() const noexcept -> const_reverse_iterator`
	`853`	`+ inline auto xscalar<CT>::linear_rbegin() const noexcept -> const_reverse_iterator`
`854`	`854`	`{`
`855`	`855`	`return this->template rbegin<XTENSOR_DEFAULT_LAYOUT>();`
`856`	`856`	`}`
`857`	`857`
`858`	`858`	`template <class CT>`
`859`		`- inline auto xscalar<CT>::storage_rend() const noexcept -> const_reverse_iterator`
	`859`	`+ inline auto xscalar<CT>::linear_rend() const noexcept -> const_reverse_iterator`
`860`	`860`	`{`
`861`	`861`	`return this->template rend<XTENSOR_DEFAULT_LAYOUT>();`
`862`	`862`	`}`
`863`	`863`
`864`	`864`	`template <class CT>`
`865`		`- inline auto xscalar<CT>::storage_crbegin() const noexcept -> const_reverse_iterator`
	`865`	`+ inline auto xscalar<CT>::linear_crbegin() const noexcept -> const_reverse_iterator`
`866`	`866`	`{`
`867`	`867`	`return this->template crbegin<XTENSOR_DEFAULT_LAYOUT>();`
`868`	`868`	`}`
`869`	`869`
`870`	`870`	`template <class CT>`
`871`		`- inline auto xscalar<CT>::storage_crend() const noexcept -> const_reverse_iterator`
	`871`	`+ inline auto xscalar<CT>::linear_crend() const noexcept -> const_reverse_iterator`
`872`	`872`	`{`
`873`	`873`	`return this->template crend<XTENSOR_DEFAULT_LAYOUT>();`
`874`	`874`	`}`