diff options
author | David Robillard <d@drobilla.net> | 2025-02-10 19:35:43 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2025-02-10 19:35:43 -0500 |
commit | d466d59fab9086bafeb8c5d3208580a639b6bdbf (patch) | |
tree | 4c34d574b29110c6dbe2e8e82e89e28d8bd8cc9d | |
parent | d4d7c64a7b03093d62fca36a0b73c550d69d8a94 (diff) | |
download | chilbert-d466d59fab9086bafeb8c5d3208580a639b6bdbf.tar.gz chilbert-d466d59fab9086bafeb8c5d3208580a639b6bdbf.tar.bz2 chilbert-d466d59fab9086bafeb8c5d3208580a639b6bdbf.zip |
Fully parenthesize expressions
-rw-r--r-- | include/chilbert/detail/BitVecIndex.hpp | 2 | ||||
-rw-r--r-- | include/chilbert/detail/MultiBitVec.hpp | 2 | ||||
-rw-r--r-- | test/test_utils.hpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/chilbert/detail/BitVecIndex.hpp b/include/chilbert/detail/BitVecIndex.hpp index a514c21..7eb128d 100644 --- a/include/chilbert/detail/BitVecIndex.hpp +++ b/include/chilbert/detail/BitVecIndex.hpp @@ -21,7 +21,7 @@ struct BitVecIndex { explicit BitVecIndex(const size_t bits) : rack{bits / bits_per_rack} - , bit{bits - rack * bits_per_rack} + , bit{bits - (rack * bits_per_rack)} { assert(bit < bits_per_rack); } diff --git a/include/chilbert/detail/MultiBitVec.hpp b/include/chilbert/detail/MultiBitVec.hpp index e3a305d..1317d3b 100644 --- a/include/chilbert/detail/MultiBitVec.hpp +++ b/include/chilbert/detail/MultiBitVec.hpp @@ -111,7 +111,7 @@ public: /// Clear any bits in storage outside the valid range if necessary void truncate() { - if (const auto pad = num_racks() * bits_per_rack - size()) { + if (const auto pad = (num_racks() * bits_per_rack) - size()) { rack(num_racks() - 1) &= ~Rack{0} >> pad; } } diff --git a/test/test_utils.hpp b/test/test_utils.hpp index 5f4c03f..cc9c1f8 100644 --- a/test/test_utils.hpp +++ b/test/test_utils.hpp @@ -44,7 +44,7 @@ static inline size_t rand_between(Context& ctx, const size_t min, const size_t max) { assert(max >= min); - const size_t r = (max == min) ? min : ctx.dist(ctx.rng) % (max - min) + min; + const size_t r = (max == min) ? min : (ctx.dist(ctx.rng) % (max - min)) + min; assert(r >= min && r < max); return r; } @@ -58,7 +58,7 @@ make_random_precisions(Context& ctx) size_t bits_left = N; for (size_t i = 0; i < D; ++i) { - ms[i] = rand_between(ctx, 1, std::min(Max, bits_left / (D - i) + 1)); + ms[i] = rand_between(ctx, 1, std::min(Max, (bits_left / (D - i)) + 1)); bits_left -= ms[i]; } |