diff options
| -rw-r--r-- | serialize/packbits-read.hpp | 18 | ||||
| -rw-r--r-- | serialize/packbits-write.hpp | 29 |
2 files changed, 36 insertions, 11 deletions
diff --git a/serialize/packbits-read.hpp b/serialize/packbits-read.hpp index 9c814d22..0fea0ba5 100644 --- a/serialize/packbits-read.hpp +++ b/serialize/packbits-read.hpp @@ -71,14 +71,23 @@ struct input<T, 0> template<size_t N> struct next { - static_assert(N == (size_t)-1, "reading past the end"); - static_assert(N != (size_t)-1); + static_assert(!N, "reading past the end"); + static_assert( N, "reading past the end"); }; }; template<typename T> struct is_input_field : std::bool_constant<false> {}; template<std::unsigned_integral T, size_t N> struct is_input_field<input_field<T, N>> : std::bool_constant<true> { static_assert(N > 0); }; +template<typename Field> +requires requires (Field& x) +{ + { size_t{Field::Length} > 0 }; + sizeof(std::decay_t<decltype(x.value)>); + std::unsigned_integral<std::decay_t<decltype(x.value)>>; +} +struct is_input_field<Field> : std::bool_constant<true> {}; + template<std::unsigned_integral T, typename Tuple, size_t Left, size_t I, size_t... Is> constexpr CORRADE_ALWAYS_INLINE void read_(Tuple&& tuple, input<T, Left> st, std::index_sequence<I, Is...>) { @@ -88,7 +97,7 @@ constexpr CORRADE_ALWAYS_INLINE void read_(Tuple&& tuple, input<T, Left> st, std static_assert(std::tuple_size_v<U> >= sizeof...(Is)+1, "index count larger than tuple element count"); static_assert(I < std::tuple_size_v<U>, "too few tuple elements"); using Field = std::decay_t<std::tuple_element_t<I, U>>; - static_assert(is_input_field<Field>::value, "tuple element must be input<T, N>"); + static_assert(is_input_field<Field>{}, "tuple element must be input_field<T, N>"); constexpr size_t Size = Field::Length; static_assert(Size <= Left, "data type too small"); using next_type = typename input<T, Left>::template next<Size>; @@ -108,8 +117,7 @@ constexpr CORRADE_ALWAYS_INLINE void read_(Tuple&&, input<T, Left> st, std::inde namespace floormat { -template<std::unsigned_integral T, typename Tuple> -constexpr void pack_read(Tuple&& tuple, T value) +template<std::unsigned_integral T, typename Tuple> constexpr void pack_read(Tuple&& tuple, T value) { constexpr size_t nbits = sizeof(T)*8, tuple_size = std::tuple_size_v<std::decay_t<Tuple>>; diff --git a/serialize/packbits-write.hpp b/serialize/packbits-write.hpp index 7cece32b..7df095c1 100644 --- a/serialize/packbits-write.hpp +++ b/serialize/packbits-write.hpp @@ -11,7 +11,6 @@ namespace floormat::Pack_impl { template<std::unsigned_integral T, size_t CAPACITY, size_t LEFT> struct output { - static_assert(std::is_fundamental_v<T>); static_assert(LEFT >= 0); static_assert(LEFT <= CAPACITY); static_assert(CAPACITY <= sizeof(T)*8); @@ -31,6 +30,14 @@ struct output_field template<typename T> struct is_output_field : std::bool_constant<false> {}; template<std::unsigned_integral T, size_t N> struct is_output_field<output_field<T, N>> : std::bool_constant<true> { static_assert(N > 0); }; +template<typename Field> +requires requires (const Field& x) { + { size_t{Field::Length} > 0 }; + sizeof(std::decay_t<decltype(x.value)>); + std::unsigned_integral<std::decay_t<decltype(x.value)>>; +} +struct is_output_field<Field> : std::bool_constant<true> {}; + template<std::unsigned_integral T, size_t Capacity, size_t Left, size_t I, size_t... Is, typename Tuple> constexpr CORRADE_ALWAYS_INLINE T write_(const Tuple& tuple, output<T, Capacity, Left> st, std::index_sequence<I, Is...>) { @@ -39,7 +46,8 @@ constexpr CORRADE_ALWAYS_INLINE T write_(const Tuple& tuple, output<T, Capacity, static_assert(Left > 0, "too many bits to write"); static_assert(Left <= Capacity, "too many bits to write"); static_assert(I < std::tuple_size_v<Tuple>, "too few tuple elements"); - static_assert(is_output_field<std::decay_t<decltype(std::get<I>(tuple))>>{}, "tuple element must be output<T,N>"); + static_assert(is_output_field<std::decay_t<std::tuple_element_t<0, Tuple>>>{}, + "tuple element must be output_field<T,N>"); constexpr size_t N = std::tuple_element_t<I, Tuple>::Length; static_assert(N <= Left, "too many bits to write"); @@ -61,11 +69,20 @@ constexpr CORRADE_ALWAYS_INLINE T write_(const Tuple&, output<T, Capacity, Left> namespace floormat { -template<std::unsigned_integral T, size_t... Sizes> -[[nodiscard]] constexpr T pack_write(const std::tuple<Pack_impl::output_field<T, Sizes>...>& tuple) +template<typename Tuple> +requires requires (const Tuple& tuple) { + std::tuple_size_v<Tuple> > size_t{0}; + Pack_impl::is_output_field<std::decay_t<decltype(std::get<0>(tuple))>>::value; +} +[[nodiscard]] constexpr auto pack_write(const Tuple& tuple) { - constexpr size_t nbits = sizeof(T)*8; - return Pack_impl::write_(tuple, Pack_impl::output<T, nbits, nbits>{T{0}}, make_reverse_index_sequence<sizeof...(Sizes)>{}); + using Field = std::decay_t<std::tuple_element_t<0, Tuple>>; + static_assert(Pack_impl::is_output_field<Field>{}); + using T = std::decay_t<decltype(std::declval<Field>().value)>; + constexpr size_t nbits = sizeof(T)*8, tuple_size = std::tuple_size_v<Tuple>; + return Pack_impl::write_(tuple, + Pack_impl::output<T, nbits, nbits>{T{0}}, + make_reverse_index_sequence<tuple_size>{}); } constexpr uint8_t pack_write(const std::tuple<>&) = delete; |