a

3 files changed, 59 insertions, 67 deletions

diff --git a/serialize/packbits-read.cpp b/serialize/packbits-read.cpp
index cc3fc3bd..d71d06ac 100644
--- a/serialize/packbits-read.cpp
+++ b/serialize/packbits-read.cpp
@@ -21,7 +21,7 @@ static_assert(!input<uint32_t, 3>{65535}.check_zero());
 static_assert(input<uint32_t, 30>{65535}.advance<16>() == 0);
 
 static_assert(input<uint32_t, 30>::next<16>{ input<uint32_t, 30>{65535}.advance<16>() }.check_zero());
-static_assert(input<uint32_t, 30>::next<16>{}.Capacity == 14);
+static_assert(input<uint32_t, 30>::next<16>{}.Left == 14);
 
 constexpr bool test1()
 {
@@ -76,39 +76,41 @@ constexpr bool test3()
 }
 static_assert(test3());
 
-static_assert(std::is_same_v< make_tuple_type<uint8_t, 3>,  std::tuple<uint8_t, uint8_t, uint8_t> >);
+template<size_t N> using f32 = input_field<uint32_t, N>;
+template<size_t N> using f8 = input_field<uint8_t, N>;
 
 constexpr bool test4()
 {
-    using Tuple_u32 = make_tuple_type<uint32_t, 3>;
-    static_assert(std::is_same_v<Tuple_u32, std::tuple<uint32_t, uint32_t, uint32_t>>);
-    using Tuple_u8  = make_tuple_type<uint8_t, 3>;
+
     {
-        Tuple_u32 tuple{};
         static_assert(lowbits<uint32_t, 17> == 0x1ffffU);
-        read_(tuple, input<uint32_t, 32>{(uint32_t)-1}, std::make_index_sequence<3>{}, make_pack<uint32_t, 17, 14, 1>{});
-        auto [a, b, c] = tuple;
+        f32<17> a;
+        f32<14> b;
+        f32< 1> c;
+        //auto tuple = std::tuple<f32<17>&, f32<14>&, f32<1>&>{a, b, c};
+        auto tuple = std::tie(a, b, c);
+        read_(tuple, input<uint32_t, 32>{(uint32_t)-1}, std::make_index_sequence<3>{});
         fm_assert(a == lowbits<uint32_t, 17>);
         fm_assert(b == lowbits<uint32_t, 14>);
         fm_assert(c & 1);
     }
     {
-        Tuple_u8 tuple{};
-        read_(tuple, input<uint8_t, 8>{0b101011}, std::make_index_sequence<3>{}, make_pack<uint8_t, 1, 3, 2>{});
-        auto [a, b, c] = tuple;
+        f8<1> a;
+        f8<3> b;
+        f8<2> c;
+        read_(std::tie(a, b, c), input<uint8_t, 8>{0b101011}, std::make_index_sequence<3>{});
         fm_assert(a == 0b1);
         fm_assert(b == 0b101);
         fm_assert(c == 0b10);
     }
     {
-        std::tuple<> empty_tuple;
-        read_(empty_tuple, input<uint8_t, 8>{0}, std::index_sequence<>{}, make_pack<uint8_t>{});
-        Tuple_u8 tuple{}; (void)tuple;
-        //read_(empty_tuple, input<uint8_t, 8>{1}, std::index_sequence<>{}, make_tuple<uint8_t>{});
-        //read_(tuple, input<uint8_t, 5>{0b11111}, std::make_index_sequence<3>{}, make_tuple<uint8_t, 2, 2, 2>{});
+        read_(std::tuple<>{}, input<uint8_t, 8>{0}, std::index_sequence<>{});
+        [[maybe_unused]] f32<2> a, b, c;
+        //read_(std::tuple<>{}, input<uint8_t, 8>{1}, std::index_sequence<>{});
+        //read_(std::tie(a, b, c), input<uint8_t, 5>{0b11111}, std::make_index_sequence<3>{});
         //(void)input<uint8_t, 9>{};
-        //read_(empty_tuple, input<uint8_t, 8>{}, std::index_sequence<0>{}, make_tuple<uint8_t, 1>{});
-        //read_(empty_tuple, input<uint8_t, 8>{1}, std::index_sequence<>{}, make_tuple<uint8_t, 1>{});
+        //read_(std::tie(a), input<uint8_t, 8>{3}, std::index_sequence<0>{}); fm_assert(a == 3);
+        //f8<1> d; read_(std::tie(d), input<uint8_t, 8>{1}, std::index_sequence<>{});
     }
 
     return true;
diff --git a/serialize/packbits-read.hpp b/serialize/packbits-read.hpp
index 2ea50848..9e5f0cc8 100644
--- a/serialize/packbits-read.hpp
+++ b/serialize/packbits-read.hpp
@@ -9,45 +9,31 @@
 
 namespace floormat::Pack_impl {
 
-template<std::unsigned_integral T, size_t N>
-struct input_bits final
+template<std::unsigned_integral T, size_t LENGTH>
+struct input_field final
 {
-    static_assert(std::is_fundamental_v<T>);
-    static_assert(N > 0);
-    static_assert(N < sizeof(T)*8);
-
-    using type = T;
-};
-
-template<std::unsigned_integral T, size_t N>
-struct make_tuple_type_
-{
-    template<size_t> using index_to_type = T;
-    template<typename> struct aux;
-    template<size_t... Is> struct aux<std::index_sequence<Is...>>
-    {
-        static_assert(sizeof...(Is) > 0);
-        using type = std::tuple<index_to_type<Is>...>;
-    };
-    using Seq = typename aux<std::make_index_sequence<N>>::type;
+    static_assert(LENGTH > 0);
+    static_assert(LENGTH <= sizeof(T)*8);
+    static constexpr size_t Length = LENGTH;
+    T value;
+    constexpr T operator*() const { return value; }
+    constexpr operator T() const { return value; }
 };
-template<std::unsigned_integral T, size_t N> using make_tuple_type = typename make_tuple_type_<T, N>::Seq;
-
-template<typename... Ts> struct empty_pack_tuple {};
 
-template<std::unsigned_integral T, size_t CAPACITY>
+template<std::unsigned_integral T, size_t LEFT>
 struct input
 {
-    static_assert(CAPACITY <= sizeof(T)*8);
-    static constexpr size_t Capacity = CAPACITY;
+    static_assert(LEFT > 0);
+    static_assert(LEFT <= sizeof(T)*8);
+    static constexpr size_t Left = LEFT;
 
     T value;
 
     template<size_t N>
     struct next_
     {
-        static_assert(N <= Capacity);
-        using type = input<T, Capacity - N>;
+        static_assert(N <= LEFT);
+        using type = input<T, LEFT - N>;
     };
     template<size_t N> using next = typename next_<N>::type;
 
@@ -56,7 +42,7 @@ struct input
     {
         static_assert(N > 0);
         static_assert(N <= sizeof(T)*8);
-        static_assert(N <= Capacity);
+        static_assert(N <= LEFT);
         return T(value & (T{1} << N) - T{1});
     }
 
@@ -64,7 +50,7 @@ struct input
     constexpr T advance() const
     {
         static_assert(N <= sizeof(T)*8);
-        static_assert(N <= Capacity);
+        static_assert(N <= LEFT);
         return T(value >> N);
     }
 
@@ -75,8 +61,8 @@ struct input
 template<std::unsigned_integral T>
 struct input<T, 0>
 {
+    static constexpr size_t Left = 0;
     using Type = T;
-    static constexpr size_t Capacity = 0;
     T value;
 
     template<size_t N> [[maybe_unused]] constexpr T get() const = delete;
@@ -91,32 +77,34 @@ struct input<T, 0>
     };
 };
 
-template<std::unsigned_integral T, typename Place, size_t Left, size_t I, size_t... Is, size_t Size, typename... Sizes>
-constexpr void read_(Place& p, input<T, Left> st, std::index_sequence<I, Is...>, empty_pack_tuple<input_bits<T, Size>, Sizes...>)
+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<std::unsigned_integral T, typename Tuple, size_t Left, size_t I, size_t... Is>
+constexpr void read_(Tuple&& tuple, input<T, Left> st, std::index_sequence<I, Is...>)
 {
-    static_assert(sizeof...(Is) == sizeof...(Sizes));
+    using U = std::decay_t<Tuple>;
+    static_assert(Left <= sizeof(T)*8);
+    static_assert(Left > 0);
+    static_assert(std::tuple_size_v<U> >= sizeof...(Is)+1);
+    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);
+    constexpr size_t Size = Field::Length;
     static_assert(Size <= Left, "data type too small");
-    static_assert(I < std::tuple_size_v<Place>, "too few tuple members");
-    using S = input<T, Left>;
-    using next_type = typename S::template next<Size>;
-    get<I>(p) = st.template get<Size>();
+    using next_type = typename input<T, Left>::template next<Size>;
+    std::get<I>(tuple).value = st.template get<Size>();
     T next_value = st.template advance<Size>();
-    read_(p, next_type{ next_value }, std::index_sequence<Is...>{}, empty_pack_tuple<Sizes...>{});
+    read_(tuple, next_type{ next_value }, std::index_sequence<Is...>{});
 }
 
-template<std::unsigned_integral T, typename Place, size_t Left>
-constexpr void read_(Place&, input<T, Left> st, std::index_sequence<>, empty_pack_tuple<>)
+template<std::unsigned_integral T, typename Tuple, size_t Left>
+constexpr void read_(Tuple&&, input<T, Left> st, std::index_sequence<>)
 {
     if (!st.check_zero()) [[unlikely]]
         throw_on_read_nonzero();
 }
 
-template<std::unsigned_integral T, typename Place, size_t Left, size_t... Is, typename... Sizes>
-requires(sizeof...(Is) != sizeof...(Sizes))
-constexpr void read_(Place&, input<T, Left>, std::index_sequence<Is...>, empty_pack_tuple<Sizes...>) = delete;
-
-template<std::unsigned_integral T, size_t... Ns> using make_pack = empty_pack_tuple<input_bits<T, Ns>...>;
-
 } // namespace floormat::Pack_impl
 
 namespace floormat {
diff --git a/serialize/packbits-write.hpp b/serialize/packbits-write.hpp
index ca18cfbb..234b1632 100644
--- a/serialize/packbits-write.hpp
+++ b/serialize/packbits-write.hpp
@@ -12,9 +12,9 @@ template<std::unsigned_integral T, size_t CAPACITY, size_t LEFT>
 struct output
 {
     static_assert(std::is_fundamental_v<T>);
-    static_assert(CAPACITY > 0);
-    static_assert(CAPACITY <= sizeof(T)*8);
+    static_assert(LEFT >= 0);
     static_assert(LEFT <= CAPACITY);
+    static_assert(CAPACITY <= sizeof(T)*8);
     static constexpr size_t Capacity = CAPACITY, Left = LEFT;
     T value{0};
 };
@@ -23,6 +23,7 @@ template<std::unsigned_integral T, size_t LENGTH>
 struct output_field
 {
     static_assert(LENGTH > 0);
+    static_assert(LENGTH <= sizeof(T)*8);
     static constexpr size_t Length = LENGTH;
     T value;
 };
@@ -37,6 +38,7 @@ constexpr CORRADE_ALWAYS_INLINE T write_(const Tuple& tuple, output<T, Capacity,
     static_assert(Left > 0);
     static_assert(Capacity <= sizeof(T)*8);
     static_assert(Left <= Capacity);
+    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))>>{});
     constexpr size_t N = std::tuple_element_t<I, Tuple>::Length;
     static_assert(N <= Left);