Commit 2040822a authored by Dominik Charousset's avatar Dominik Charousset

Merge pull request #577

parents 338f86ad 463c97dd
......@@ -226,27 +226,64 @@ public:
return convert_apply(dref(), x, tmp, assign);
}
// no better way around this abomination
error consume_range(std::vector<bool>& xs) {
auto i = xs.begin();
auto e = xs.end();
using proxy_iterator = decltype(i);
// Special case to avoid using 1 byte per bool
error apply(std::vector<bool>& x) {
// Convert vector<bool> to a vector<uint64>,
// by packing each block of 64 booleans on a 64-bits integer.
// To not waste up to 63 bits, the last uint64_t
// (ie. the last 'remainder' booleans) is encoded as a var-int
auto remainder = static_cast<uint8_t>(x.size() % 64);
auto err = apply_builtin(u8_v, &remainder);
if (err)
return err;
struct {
void operator()(proxy_iterator& lhs, bool& rhs) const {
*lhs = rhs;
void operator()(std::vector<bool>& lhs, std::vector<uint64_t>& rhs) const {
lhs.resize(rhs.size() * 64, false);
size_t cpt = 0;
for (auto v: rhs) {
for (int k = 0; k < 64; ++k) {
lhs[cpt++] = ((v & (1ul << k)) != 0);
}
}
}
void operator()(std::vector<uint64_t>& lhs, std::vector<bool>& rhs) const {
if (rhs.empty())
return;
size_t len = rhs.size() - rhs.size() % 64;
lhs.resize(len / 64, 0);
for (size_t k = 0; k < len; ++k) {
auto b = rhs[k];
if (b)
lhs[k / 64] |= (1ul << (k % 64));
}
void operator()(bool& lhs, proxy_iterator& rhs) const {
lhs = *rhs;
}
} assign;
bool tmp;
for (; i != e; ++i) {
auto err = convert_apply(dref(), i, tmp, assign);
std::vector<uint64_t> tmp;
err = convert_apply(dref(), x, tmp, assign);
if (err || !remainder)
return err;
// the last uint64_t for 'remainder' bits
if (Derived::reads_state) {
uint64_t encoded = 0;
auto len = x.size();
for (int k = 0; k < remainder; ++k) {
auto b = x[len - remainder + k];
if (b)
encoded |= (1ul << k);
}
return begin_sequence(encoded);
} else {
uint64_t encoded = 0;
err = begin_sequence(encoded);
if (err)
return err;
x.reserve(x.size() + remainder);
for (int k = 0; k < remainder; ++k) {
x.push_back((bool) (encoded & (1ul << k)));
}
return none;
}
}
template <class T>
error consume_range(T& xs) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment