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

add BucketRange instead of abusing HashRange

master
Daniel Kolesa 2015-06-15 22:10:44 +01:00
parent c456843f59
commit aa2a0afcc1
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
octa/internal/hashtable.h
View File

@ -82,6 +82,36 @@ public:
T &front() const { return p_node->value; }
};
template<typename T>
struct BucketRange: octa::InputRange<BucketRange<T>, octa::ForwardRangeTag, T> {
private:
using Chain = octa::detail::HashChain<T>;
Chain *p_node;
public:
BucketRange(): p_node() {}
BucketRange(Chain *node): p_node(node) {}
BucketRange(const BucketRange &v): p_node(v.p_node) {}
BucketRange &operator=(const BucketRange &v) {
p_node = v.p_node;
return *this;
}
bool empty() const { return !p_node; }
bool pop_front() {
if (!p_node) return false;
p_node = p_node->next;
return true;
}
bool equals_front(const BucketRange &v) const {
return p_node == v.p_node;
}
T &front() const { return p_node->value; }
};
namespace detail {
template<
typename B, /* contains methods specific to each ht type */
@ -117,8 +147,8 @@ namespace detail {
using Range = octa::HashRange<E>;
using ConstRange = octa::HashRange<const E>;
using LocalRange = Range;
using ConstLocalRange = ConstRange;
using LocalRange = octa::BucketRange<E>;
using ConstLocalRange = octa::BucketRange<const E>;
DataPair p_data;
@ -321,15 +351,15 @@ namespace detail {
LocalRange each(octa::Size n) {
if (n >= p_size) return LocalRange();
return LocalRange(nullptr, p_data.first()[n], 0);
return LocalRange(p_data.first()[n]);
}
ConstLocalRange each(octa::Size n) const {
if (n >= p_size) return ConstLocalRange();
return ConstLocalRange(nullptr, p_data.first()[n], 0);
return ConstLocalRange(p_data.first()[n]);
}
ConstLocalRange ceach(octa::Size n) const {
if (n >= p_size) return ConstLocalRange();
return ConstLocalRange(nullptr, p_data.first()[n], 0);
return ConstLocalRange(p_data.first()[n]);
}
void swap(Hashtable &h) {

4
octa/map.h
View File

@ -63,8 +63,8 @@ public:
using ConstPointer = octa::AllocatorConstPointer<A>;
using Range = octa::HashRange<octa::Pair<const K, T>>;
using ConstRange = octa::HashRange<const octa::Pair<const K, T>>;
using LocalRange = Range;
using ConstLocalRange = ConstRange;
using LocalRange = octa::BucketRange<octa::Pair<const K, T>>;
using ConstLocalRange = octa::BucketRange<const octa::Pair<const K, T>>;
using Allocator = A;
explicit Map(octa::Size size, const H &hf = H(),