TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Return sentinel from segment_object_range_t

Browse source
This commit is contained in:
Kp 2022-10-09 23:15:21 +00:00
parent 5fea863a79
commit a8ecc000bf
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
common/main/segiter.h
View file

@ -20,20 +20,13 @@
#include <cassert> #include <cassert>
#endif #endif
namespace detail
{
template <typename>
struct unspecified_pointer_t;
};
namespace dsx { namespace dsx {
template <typename T> template <typename T>
class segment_object_range_t class segment_object_range_t
{ {
class iterator; class iterator;
class sentinel;
const iterator b; const iterator b;
public: public:
segment_object_range_t(iterator &&o) : segment_object_range_t(iterator &&o) :
@ -41,12 +34,12 @@ public:
{ {
} }
const iterator &begin() const { return b; } const iterator &begin() const { return b; }
static iterator end() { return T(object_none, static_cast<typename T::allow_none_construction *>(nullptr)); } static sentinel end() { return {}; }
template <typename OF, typename SF> template <typename OF, typename SF>
static segment_object_range_t construct(const unique_segment &s, OF &of, SF &sf) static segment_object_range_t construct(const unique_segment &s, OF &of, SF &sf)
{ {
if (s.objects == object_none) if (s.objects == object_none)
return end(); return iterator(T(object_none, static_cast<typename T::allow_none_construction *>(nullptr)));
auto &&opi = of(s.objects); auto &&opi = of(s.objects);
const object_base &o = opi; const object_base &o = opi;
#if DXX_SEGITER_DEBUG_OBJECT_LINKAGE #if DXX_SEGITER_DEBUG_OBJECT_LINKAGE
@ -71,6 +64,11 @@ public:
} }
}; };
template <typename T>
class segment_object_range_t<T>::sentinel
{
};
template <typename T> template <typename T>
class segment_object_range_t<T>::iterator : class segment_object_range_t<T>::iterator :
T T
@ -119,10 +117,14 @@ public:
} }
return *this; return *this;
} }
bool operator==(const iterator &rhs) const constexpr bool operator==(const iterator &rhs) const
{ {
return m_idx == rhs.m_idx; return m_idx == rhs.m_idx;
} }
constexpr bool operator==(const sentinel &) const
{
return m_idx == object_none;
}
}; };
template <typename OF, typename SF, typename R = segment_object_range_t<decltype(std::declval<OF &>()(object_first))>> template <typename OF, typename SF, typename R = segment_object_range_t<decltype(std::declval<OF &>()(object_first))>>