Rename sieve type.

Author: evoskuil

include/bitcoin/database/impl/primitives/sieve.ipp

@@ -56,26 +56,26 @@ constexpr CLASS::sieve() NOEXCEPT
 }
 
 TEMPLATE
-constexpr CLASS::sieve(sieve_t value) NOEXCEPT
+constexpr CLASS::sieve(type value) NOEXCEPT
   : sieve_{ value }
 {
 }
 
 TEMPLATE
-constexpr CLASS::sieve_t CLASS::value() const NOEXCEPT
+constexpr CLASS::type CLASS::value() const NOEXCEPT
 {
     return sieve_;
 }
 
 TEMPLATE
-constexpr CLASS::operator CLASS::sieve_t() const NOEXCEPT
+constexpr CLASS::operator CLASS::type() const NOEXCEPT
 {
     return sieve_;
 }
 
 // protected
 TEMPLATE
-constexpr CLASS::sieve_t CLASS::masks(size_t row, size_t column) const NOEXCEPT
+constexpr CLASS::type CLASS::masks(size_t row, size_t column) const NOEXCEPT
 {
     BC_ASSERT(column <= row);
 
@@ -85,7 +85,7 @@ constexpr CLASS::sieve_t CLASS::masks(size_t row, size_t column) const NOEXCEPT
 }
 
 TEMPLATE
-constexpr bool CLASS::screened(sieve_t fingerprint) const NOEXCEPT
+constexpr bool CLASS::screened(type fingerprint) const NOEXCEPT
 {
     using namespace system;
     if constexpr (is_zero(limit))
@@ -102,7 +102,7 @@ constexpr bool CLASS::screened(sieve_t fingerprint) const NOEXCEPT
     }
 
     // Compare masked fingerprint to masked sieve, for all masks of the screen.
-    for (sieve_t segment{}; segment <= row; ++segment)
+    for (type segment{}; segment <= row; ++segment)
     {
         const auto mask = masks(row, segment);
         if (bit_and(fingerprint, mask) == bit_and(sieve_, mask))
@@ -114,7 +114,7 @@ constexpr bool CLASS::screened(sieve_t fingerprint) const NOEXCEPT
 }
 
 TEMPLATE
-constexpr bool CLASS::screen(sieve_t fingerprint) NOEXCEPT
+constexpr bool CLASS::screen(type fingerprint) NOEXCEPT
 {
     using namespace system;
     if constexpr (is_zero(limit))
@@ -192,7 +192,7 @@ CONSTEVAL CLASS::masks_t CLASS::generate_masks() NOEXCEPT
     masks_t out{};
 
     // Read/write compressed array as if it was a two-dimesional array.
-    const auto masks = [&out](auto row, auto column) NOEXCEPT -> sieve_t&
+    const auto masks = [&out](auto row, auto column) NOEXCEPT -> type&
     {
         BC_ASSERT(column <= row);
         constexpr auto get_offset = generate_offsets();
@@ -209,9 +209,9 @@ CONSTEVAL CLASS::masks_t CLASS::generate_masks() NOEXCEPT
     };
 
     masks(0, 0) = first_mask;
-    for (sieve_t row = 1; row < screens; ++row)
+    for (type row = 1; row < screens; ++row)
     {
-        for (sieve_t col = 0; col < row; ++col)
+        for (type col = 0; col < row; ++col)
             masks(row, col) = masks(sub1(row), col);
 
         for (auto mask = row; !is_zero(mask); --mask)

include/bitcoin/database/primitives/sieve.hpp

@@ -32,41 +32,41 @@ template <size_t SieveBits, size_t SelectorBits,
 class sieve
 {
 public:
-    using sieve_t = unsigned_type<system::to_ceilinged_bytes(SieveBits)>;
+    using type = unsigned_type<system::to_ceilinged_bytes(SieveBits)>;
 
     /// Initialize empty sieve.
     constexpr sieve() NOEXCEPT;
 
     /// Initialize existing sieve.
-    constexpr sieve(sieve_t value) NOEXCEPT;
+    constexpr sieve(type value) NOEXCEPT;
 
     /// The fingerprint value.
-    constexpr sieve_t value() const NOEXCEPT;
+    constexpr type value() const NOEXCEPT;
 
     /// True if fingerprint aligns with sieve screen(s), bucket may contain.
-    constexpr bool screened(sieve_t fingerprint) const NOEXCEPT;
+    constexpr bool screened(type fingerprint) const NOEXCEPT;
 
     /// Add fingerprint to sieve, false if already screened.
-    constexpr bool screen(sieve_t fingerprint) NOEXCEPT;
+    constexpr bool screen(type fingerprint) NOEXCEPT;
 
     /// The fingerprint value.
-    constexpr operator sieve_t() const NOEXCEPT;
+    constexpr operator type() const NOEXCEPT;
 
 protected:
     static constexpr auto sieve_bits = SieveBits;
     static constexpr auto selector_bits = SelectorBits;
     static constexpr auto screen_bits = sieve_bits - selector_bits;
 
-    static constexpr auto empty = system::unmask_right<sieve_t>(sieve_bits);
+    static constexpr auto empty = system::unmask_right<type>(sieve_bits);
     static constexpr auto saturated = system::mask_right(empty, sub1(screen_bits));
-    static constexpr auto first_mask = system::unmask_right<sieve_t>(screen_bits);
+    static constexpr auto first_mask = system::unmask_right<type>(screen_bits);
     static constexpr auto selector_mask = first_mask;
 
     static constexpr auto screens = system::power2(selector_bits);
     static constexpr auto mask_count = to_half(screens * add1(screens));
     static constexpr auto limit = sub1(screens);
-    using masks_t = std_array<sieve_t, mask_count>;
-    using offsets_t = std_array<size_t, screens>;
+    using masks_t = std_array<type, mask_count>;
+    using offsets_t = std_array<type, screens>;
 
     /// Generate compression offsets at compile.
     static CONSTEVAL offsets_t generate_offsets() NOEXCEPT;
@@ -75,13 +75,13 @@ class sieve
     static CONSTEVAL masks_t generate_masks() NOEXCEPT;
 
     /// Read member compressed mask array as if it was a two-dimesional array.
-    constexpr sieve_t masks(size_t row, size_t column) const NOEXCEPT;
+    constexpr type masks(size_t row, size_t column) const NOEXCEPT;
 
 private:
     // Logically sparse, e.g. 16 x 16 = 256 table of uint32_t (1024 bytes).
     // Compressed to one-dimensional 136 element array of uint32_t (544 bytes).
     static constexpr masks_t masks_ = generate_masks();
-    sieve_t sieve_;
+    type sieve_;
 };
 
 } // namespace database