JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more generalized PointerRange (but only optionally)

master
Daniel Kolesa 2015-06-11 00:41:41 +01:00
parent 5608cb97ac
commit 79774efbe6
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
octa/range.h
View File

@ -640,13 +640,20 @@ NumberRange<T> range(T v) {
return NumberRange<T>(v); return NumberRange<T>(v);
} }
template<typename T> template<typename T,
struct PointerRange: InputRange<PointerRange<T>, FiniteRandomAccessRangeTag, T> { typename R = T &, typename P = T *,
typename S = octa::Size, typename D = octa::Ptrdiff
>
struct PointerRange: InputRange<
PointerRange<T, R, P, S, D>, FiniteRandomAccessRangeTag, T, R, S, D
> {
using Pointer = P;
PointerRange(): p_beg(nullptr), p_end(nullptr) {} PointerRange(): p_beg(nullptr), p_end(nullptr) {}
PointerRange(const PointerRange &v): p_beg(v.p_beg), PointerRange(const PointerRange &v): p_beg(v.p_beg),
p_end(v.p_end) {} p_end(v.p_end) {}
PointerRange(T *beg, T *end): p_beg(beg), p_end(end) {} PointerRange(Pointer beg, Pointer end): p_beg(beg), p_end(end) {}
PointerRange(T *beg, octa::Size n): p_beg(beg), p_end(beg + n) {} PointerRange(Pointer beg, octa::Size n): p_beg(beg), p_end(beg + n) {}
PointerRange &operator=(const PointerRange &v) { PointerRange &operator=(const PointerRange &v) {
p_beg = v.p_beg; p_beg = v.p_beg;
@ -666,8 +673,8 @@ struct PointerRange: InputRange<PointerRange<T>, FiniteRandomAccessRangeTag, T>
--p_beg; return true; --p_beg; return true;
} }
octa::Size pop_front_n(octa::Size n) { S pop_front_n(S n) {
octa::Size olen = p_end - p_beg; S olen = p_end - p_beg;
p_beg += n; p_beg += n;
if (p_beg > p_end) { if (p_beg > p_end) {
p_beg = p_end; p_beg = p_end;
@ -676,17 +683,17 @@ struct PointerRange: InputRange<PointerRange<T>, FiniteRandomAccessRangeTag, T>
return n; return n;
} }
octa::Size push_front_n(octa::Size n) { S push_front_n(S n) {
p_beg -= n; return true; p_beg -= n; return true;
} }
T &front() const { return *p_beg; } R front() const { return *p_beg; }
bool equals_front(const PointerRange &range) const { bool equals_front(const PointerRange &range) const {
return p_beg == range.p_beg; return p_beg == range.p_beg;
} }
octa::Ptrdiff distance_front(const PointerRange &range) const { D distance_front(const PointerRange &range) const {
return range.p_beg - p_beg; return range.p_beg - p_beg;
} }
@ -700,8 +707,8 @@ struct PointerRange: InputRange<PointerRange<T>, FiniteRandomAccessRangeTag, T>
++p_end; return true; ++p_end; return true;
} }
octa::Size pop_back_n(octa::Size n) { S pop_back_n(S n) {
octa::Size olen = p_end - p_beg; S olen = p_end - p_beg;
p_end -= n; p_end -= n;
if (p_end < p_beg) { if (p_end < p_beg) {
p_end = p_beg; p_end = p_beg;
@ -710,28 +717,28 @@ struct PointerRange: InputRange<PointerRange<T>, FiniteRandomAccessRangeTag, T>
return n; return n;
} }
octa::Size push_back_n(octa::Size n) { S push_back_n(S n) {
p_end += n; return true; p_end += n; return true;
} }
T &back() const { return *(p_end - 1); } R back() const { return *(p_end - 1); }
bool equals_back(const PointerRange &range) const { bool equals_back(const PointerRange &range) const {
return p_end == range.p_end; return p_end == range.p_end;
} }
octa::Ptrdiff distance_back(const PointerRange &range) const { D distance_back(const PointerRange &range) const {
return range.p_end - p_end; return range.p_end - p_end;
} }
/* satisfy FiniteRandomAccessRange */ /* satisfy FiniteRandomAccessRange */
octa::Size size() const { return p_end - p_beg; } S size() const { return p_end - p_beg; }
PointerRange slice(octa::Size start, octa::Size end) const { PointerRange slice(S start, S end) const {
return PointerRange(p_beg + start, p_beg + end); return PointerRange(p_beg + start, p_beg + end);
} }
T &operator[](octa::Size i) const { return p_beg[i]; } R operator[](S i) const { return p_beg[i]; }
/* satisfy OutputRange */ /* satisfy OutputRange */
void put(const T &v) { void put(const T &v) {
@ -741,12 +748,8 @@ struct PointerRange: InputRange<PointerRange<T>, FiniteRandomAccessRangeTag, T>
*(p_beg++) = octa::move(v); *(p_beg++) = octa::move(v);
} }
/* non-range methods */
T *data() { return p_beg; }
const T *data() const { return p_beg; }
private: private:
T *p_beg, *p_end; P p_beg, p_end;
}; };
template<typename T, octa::Size N> template<typename T, octa::Size N>

8
octa/vector.h
View File

@ -125,8 +125,12 @@ public:
using ConstReference = const T &; using ConstReference = const T &;
using Pointer = octa::AllocatorPointer<A>; using Pointer = octa::AllocatorPointer<A>;
using ConstPointer = octa::AllocatorConstPointer<A>; using ConstPointer = octa::AllocatorConstPointer<A>;
using Range = octa::PointerRange<T>; using Range = octa::PointerRange<Value, Reference, Pointer, Size,
using ConstRange = octa::PointerRange<const T>; Difference
>;
using ConstRange = octa::PointerRange<const Value, ConstReference,
ConstPointer, Size, Difference
>;
using Allocator = A; using Allocator = A;
Vector(const A &a = A()): p_buf(nullptr, a), p_len(0), p_cap(0) {} Vector(const A &a = A()): p_buf(nullptr, a), p_len(0), p_cap(0) {}