Move iterator convertors back to helper file

Author: franzpoeschel

CMakeLists.txt

@@ -420,6 +420,7 @@ set(CORE_SOURCE
         src/helper/list_series.cpp
         src/snapshots/ContainerImpls.cpp
         src/snapshots/ContainerTraits.cpp
+        src/snapshots/IteratorHelpers.cpp
         src/snapshots/IteratorTraits.cpp
         src/snapshots/RandomAccessIterator.cpp
         src/snapshots/Snapshots.cpp

include/openPMD/snapshots/ContainerTraits.hpp

@@ -33,14 +33,6 @@ class OpaqueSeriesIterator
 protected:
     using Self_t = OpaqueSeriesIterator<value_type_in>;
 
-    template <typename ChildClass, typename... ConstructorArgs>
-    static auto from_concrete_iterator(ConstructorArgs &&...args) -> Self_t
-    {
-        return OpaqueSeriesIterator<value_type_in>(
-            std::unique_ptr<DynamicSeriesIterator<value_type_in>>{
-                new ChildClass(std::forward<ConstructorArgs>(args)...)});
-    }
-
     template <typename ChildClass>
     auto to_concrete_iterator() -> std::optional<ChildClass>
     {

include/openPMD/snapshots/IteratorHelpers.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "openPMD/Iteration.hpp"
+#include "openPMD/snapshots/StatefulIterator.hpp"
+
+namespace openPMD
+{
+auto stateful_to_opaque(StatefulIterator const &it) -> OpaqueSeriesIterator<
+    Container<Iteration, Iteration::IterationIndex_t>::value_type>;
+
+template <
+    typename ConcreteIteratorClass,
+    typename ValueType,
+    typename... ConstructorArgs>
+auto from_concrete_iterator(ConstructorArgs &&...args)
+    -> OpaqueSeriesIterator<ValueType>
+{
+    return OpaqueSeriesIterator<ValueType>(
+        std::unique_ptr<DynamicSeriesIterator<ValueType>>{
+            new ConcreteIteratorClass(std::forward<ConstructorArgs>(args)...)});
+}
+} // namespace openPMD

include/openPMD/snapshots/RandomAccessIterator.hpp

@@ -51,6 +51,13 @@ class RandomAccessIterator
     friend class RandomAccessIteratorContainer;
     template <typename>
     friend class OpaqueSeriesIterator;
+    template <
+        typename ConcreteIteratorClass,
+        typename ValueType,
+        typename... ConstructorArgs>
+    friend auto from_concrete_iterator(ConstructorArgs &&...args)
+        -> OpaqueSeriesIterator<ValueType>;
+
     using parent_t = AbstractSeriesIterator<
         RandomAccessIterator<iterator_t>,
         detail::iterator_to_value_type<iterator_t>>;

src/snapshots/ContainerImpls.cpp

@@ -2,6 +2,7 @@
 #include "openPMD/Error.hpp"
 #include "openPMD/IO/Access.hpp"
 #include "openPMD/snapshots/ContainerTraits.hpp"
+#include "openPMD/snapshots/IteratorHelpers.hpp"
 #include "openPMD/snapshots/RandomAccessIterator.hpp"
 #include "openPMD/snapshots/StatefulIterator.hpp"
 #include <memory>
@@ -43,8 +44,7 @@ auto StatefulSnapshotsContainer::get() const -> StatefulIterator const *
 auto StatefulSnapshotsContainer::stateful_to_opaque(StatefulIterator const &it)
     -> OpaqueSeriesIterator<value_type>
 {
-    return OpaqueSeriesIterator<value_type>::from_concrete_iterator<
-        StatefulIterator>(it);
+    return from_concrete_iterator<StatefulIterator, value_type>(it);
 }
 
 auto StatefulSnapshotsContainer::currentIteration() const
@@ -329,43 +329,49 @@ auto RandomAccessIteratorContainer::currentIteration() const
 
 auto RandomAccessIteratorContainer::begin() -> iterator
 {
-    return iterator::from_concrete_iterator<concrete_iterator_type>(
+    return from_concrete_iterator<concrete_iterator_type, iterator::value_type>(
         m_cont.begin());
 }
 auto RandomAccessIteratorContainer::end() -> iterator
 {
-    return iterator::from_concrete_iterator<concrete_iterator_type>(
+    return from_concrete_iterator<concrete_iterator_type, iterator::value_type>(
         m_cont.end());
 }
 auto RandomAccessIteratorContainer::begin() const -> const_iterator
 {
-    return const_iterator::from_concrete_iterator<concrete_const_iterator_type>(
-        m_cont.begin());
+    return from_concrete_iterator<
+        concrete_const_iterator_type,
+        const_iterator::value_type>(m_cont.begin());
 }
 auto RandomAccessIteratorContainer::end() const -> const_iterator
 {
-    return const_iterator::from_concrete_iterator<concrete_const_iterator_type>(
-        m_cont.end());
+    return from_concrete_iterator<
+        concrete_const_iterator_type,
+        const_iterator::value_type>(m_cont.end());
 }
 auto RandomAccessIteratorContainer::rbegin() -> reverse_iterator
 {
-    return reverse_iterator::from_concrete_iterator<
-        concrete_reverse_iterator_type>(m_cont.rbegin());
+    return from_concrete_iterator<
+        concrete_reverse_iterator_type,
+        reverse_iterator::value_type>(m_cont.rbegin());
 }
 auto RandomAccessIteratorContainer::rend() -> reverse_iterator
 {
-    return reverse_iterator::from_concrete_iterator<
-        concrete_reverse_iterator_type>(m_cont.rend());
+    return from_concrete_iterator<
+        concrete_reverse_iterator_type,
+        reverse_iterator::value_type>(m_cont.rend());
 }
 auto RandomAccessIteratorContainer::rbegin() const -> const_reverse_iterator
 {
-    return const_reverse_iterator::from_concrete_iterator<
-        concrete_const_reverse_iterator_type>(m_cont.rbegin());
+    return from_concrete_iterator<
+        concrete_const_reverse_iterator_type,
+        const_reverse_iterator::value_type>(m_cont.rbegin());
 }
 auto RandomAccessIteratorContainer::rend() const -> const_reverse_iterator
 {
-    return const_reverse_iterator::from_concrete_iterator<
-        concrete_const_reverse_iterator_type>(m_cont.rend());
+    return from_concrete_iterator<
+        concrete_const_reverse_iterator_type,
+        const_reverse_iterator::value_type>(m_cont.rend());
 }
 
 auto RandomAccessIteratorContainer::empty() const -> bool
@@ -396,14 +402,15 @@ auto RandomAccessIteratorContainer::clear() -> void
 
 auto RandomAccessIteratorContainer::find(key_type const &key) -> iterator
 {
-    return iterator::from_concrete_iterator<concrete_iterator_type>(
+    return from_concrete_iterator<concrete_iterator_type, iterator::value_type>(
         m_cont.find(key));
 }
 auto RandomAccessIteratorContainer::find(key_type const &key) const
     -> const_iterator
 {
-    return const_iterator::from_concrete_iterator<concrete_const_iterator_type>(
-        m_cont.find(key));
+    return from_concrete_iterator<
+        concrete_const_iterator_type,
+        const_iterator::value_type>(m_cont.find(key));
 }
 
 auto RandomAccessIteratorContainer::contains(key_type const &key) const -> bool
@@ -423,17 +430,17 @@ auto RandomAccessIteratorContainer::erase(iterator it) -> iterator
         throw std::runtime_error(
             "[RandomAccessIteratorContainer] Illegal dynamic iterator type.");
     }
-    return iterator::from_concrete_iterator<concrete_iterator_type>(
+    return from_concrete_iterator<concrete_iterator_type, iterator::value_type>(
         m_cont.erase(bare_iterator->m_it));
 }
 
 auto RandomAccessIteratorContainer::emplace(value_type &&value)
     -> std::pair<iterator, bool>
 {
-    throw std::runtime_error("EMPLACCIINNGGGG");
     auto [tmp_iterator, newly_emplaced] = m_cont.emplace(std::move(value));
     return std::make_pair(
-        iterator::from_concrete_iterator<concrete_iterator_type>(tmp_iterator),
+        from_concrete_iterator<concrete_iterator_type, iterator::value_type>(
+            tmp_iterator),
         newly_emplaced);
 }
 

src/snapshots/IteratorHelpers.cpp

@@ -0,0 +1,14 @@
+#include "openPMD/snapshots/IteratorHelpers.hpp"
+
+namespace openPMD
+{
+using value_type =
+    Container<Iteration, Iteration::IterationIndex_t>::value_type;
+auto stateful_to_opaque(StatefulIterator const &it) -> OpaqueSeriesIterator<
+    Container<Iteration, Iteration::IterationIndex_t>::value_type>
+{
+    return from_concrete_iterator<
+        StatefulIterator,
+        Container<Iteration, Iteration::IterationIndex_t>::value_type>(it);
+}
+} // namespace openPMD