collection_proxy progress

This commit is contained in:
Sascha Kühl 2026-07-20 07:02:16 +02:00
parent d4865e4d10
commit 6ecda781f5
1 changed files with 22 additions and 9 deletions

View File

@ -20,7 +20,11 @@ namespace matador::object {
// relation<OwnerType, ForeignType> // relation<OwnerType, ForeignType>
template < class RelationType > template < class RelationType >
struct relation_iterator_traits; struct relation_iterator_traits {
static RelationType& value(RelationType& item) {
return item;
}
};
template < typename Type, typename OwnerType > template < typename Type, typename OwnerType >
struct relation_iterator_traits<relation<OwnerType, Type>> { struct relation_iterator_traits<relation<OwnerType, Type>> {
@ -39,11 +43,17 @@ public:
using iterator_category = std::forward_iterator_tag; using iterator_category = std::forward_iterator_tag;
collection_proxy_iterator() = default; collection_proxy_iterator() = default;
explicit collection_proxy_iterator(typename std::vector<RelationType>::iterator it) collection_proxy_iterator(typename std::vector<RelationType>::iterator it)
: it_(it) {} : it_(it) {}
reference operator*() { return *it_; } reference operator*() {
pointer operator->() { return &*it_; } return relation_iterator_traits<relation_type>::value(*it_);
}
pointer operator->() {
return &relation_iterator_traits<relation_type>::value(*it_);
}
collection_proxy_iterator& operator++() { collection_proxy_iterator& operator++() {
++it_; ++it_;
return *this; return *this;
@ -55,9 +65,10 @@ public:
return !operator==(other); return !operator==(other);
} }
relation_type& relation() { // relation_type& relation() {
return *it_;
} // return *it_;
// }
private: private:
typename std::vector<RelationType>::iterator it_; typename std::vector<RelationType>::iterator it_;
}; };
@ -67,8 +78,10 @@ class abstract_collection_proxy {
public: public:
using value_type = Type; using value_type = Type;
using relation_type = RelationType; using relation_type = RelationType;
using iterator = typename std::vector<value_type>::iterator; // using iterator = typename std::vector<value_type>::iterator;
using const_iterator = typename std::vector<value_type>::const_iterator; // using const_iterator = typename std::vector<value_type>::const_iterator;
using iterator = collection_proxy_iterator<value_type, relation_type>;
using const_iterator = collection_proxy_iterator<value_type, relation_type>;
virtual ~abstract_collection_proxy() = default; virtual ~abstract_collection_proxy() = default;