a

4 files changed, 127 insertions, 107 deletions

diff --git a/serialize/packbits-read.hpp b/serialize/packbits-read.hpp
new file mode 100644
index 00000000..32eca8df
--- /dev/null
+++ b/serialize/packbits-read.hpp
@@ -0,0 +1,92 @@
+#pragma once
+#include "packbits.hpp"
+#include <type_traits>
+#include <concepts>
+#include <tuple>
+#include "compat/assert.hpp"
+
+namespace floormat::detail_Pack {
+
+template<std::unsigned_integral T, size_t CAPACITY>
+struct input
+{
+    static_assert(CAPACITY <= sizeof(T)*8);
+
+    using Type = T;
+    static constexpr size_t Capacity = CAPACITY;
+    T value;
+
+    template<size_t N>
+    constexpr T get() const
+    {
+        static_assert(N > 0);
+        static_assert(N <= sizeof(T)*8);
+        static_assert(N <= Capacity);
+        return T(value & (T(1) << N) - T(1));
+    }
+
+    template<size_t N>
+    constexpr T advance() const
+    {
+        static_assert(N <= sizeof(T)*8);
+        static_assert(N <= Capacity);
+        return T(value >> N);
+    }
+
+    constexpr bool operator==(const input&) const noexcept = default;
+    [[nodiscard]] constexpr inline bool check_zero() const { return value == T(0); }
+
+    template<size_t N> using next = input<T, Capacity - N>;
+};
+
+template<std::unsigned_integral T>
+struct input<T, 0>
+{
+    using Type = T;
+    static constexpr size_t Capacity = 0;
+    T value;
+
+    template<size_t N> [[maybe_unused]] constexpr T get() const = delete;
+    template<size_t N> [[maybe_unused]] constexpr T advance() const = delete;
+    constexpr bool operator==(const input&) const noexcept = default;
+    [[nodiscard]] constexpr inline bool check_zero() const { return true; }
+
+    template<size_t N> struct next
+    {
+        static_assert(N == 0, "reading past the end");
+        static_assert(N != 0, "reading past the end");
+    };
+};
+
+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<bits<T, Size>, Sizes...>)
+{
+    static_assert(sizeof...(Is) == sizeof...(Sizes));
+    static_assert(Size <= Left, "too many bits requested");
+    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>();
+    T next_value = st.template advance<Size>();
+    read(p, next_type{ next_value }, std::index_sequence<Is...>{}, empty_pack_tuple<Sizes...>{});
+}
+
+template<std::unsigned_integral T, typename Place, size_t Left>
+constexpr void read(Place&, input<T, Left> st, std::index_sequence<>, empty_pack_tuple<>)
+{
+    fm_assert(st.check_zero());
+}
+
+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<bits<T, Ns>...>;
+
+} // namespace floormat::detail_Pack
+
+namespace floormat::Pack {
+
+
+
+} // namespace floormat::Pack
diff --git a/serialize/packbits-write.hpp b/serialize/packbits-write.hpp
new file mode 100644
index 00000000..4741a462
--- /dev/null
+++ b/serialize/packbits-write.hpp
@@ -0,0 +1,8 @@
+#pragma once
+#include "packbits.hpp"
+
+namespace floormat::detail_Pack {
+
+
+
+} // namespace floormat::detail_Pack
diff --git a/serialize/packbits.cpp b/serialize/packbits.cpp
index c22c621e..84d91c28 100644
--- a/serialize/packbits.cpp
+++ b/serialize/packbits.cpp
@@ -1,4 +1,4 @@
-#include "packbits.hpp"
+#include "packbits-read.hpp"
 #include "compat/assert.hpp"
 
 namespace floormat {
@@ -8,35 +8,34 @@ using namespace floormat::detail_Pack;
 namespace {
 
 template<std::unsigned_integral T, size_t N> constexpr inline T lowbits = (T{1} << N)-T{1};
-template<size_t Val> using us_bits = Bits<uint16_t, Val>;
+template<size_t Val> using us_bits = bits<uint16_t, Val>;
 
-static_assert(!pack_input<uint32_t, 3>{65535}.check_zero());
-static_assert(pack_input<uint32_t, 30>{65535}.advance<16>() == 0);
+static_assert(!input<uint32_t, 3>{65535}.check_zero());
+static_assert(input<uint32_t, 30>{65535}.advance<16>() == 0);
 
-static_assert(pack_input<uint32_t, 30>::next<16>{
-    pack_input<uint32_t, 30>{65535}.advance<16>()
+static_assert(input<uint32_t, 30>::next<16>{ input<uint32_t, 30>{65535}.advance<16>()
 }.check_zero());
-static_assert(pack_input<uint32_t, 30>::next<16>{}.Capacity == 14);
+static_assert(input<uint32_t, 30>::next<16>{}.Capacity == 14);
 
 constexpr bool test1()
 {
     constexpr size_t bits[] = { 5, 2, 1 };
     constexpr size_t vals[] = { 8, 3, 1, 0 };
 
-    constexpr auto S0 = pack_input<uint8_t, vals[0]>{0b10111011};
-    constexpr auto S1 = pack_input<uint8_t, vals[1]>{0b00000101};
-    constexpr auto S2 = pack_input<uint8_t, vals[2]>{0b00000001};
-    constexpr auto S3 = pack_input<uint8_t, vals[3]>{0b00000000};
+    constexpr auto S0 = input<uint8_t, vals[0]>{0b10111011};
+    constexpr auto S1 = input<uint8_t, vals[1]>{0b00000101};
+    constexpr auto S2 = input<uint8_t, vals[2]>{0b00000001};
+    constexpr auto S3 = input<uint8_t, vals[3]>{0b00000000};
 
     using P0 = std::decay_t<decltype(S0)>;
     using P1 = P0::next<bits[0]>;
     using P2 = P1::next<bits[1]>;
     using P3 = P2::next<bits[2]>;
 
-    static_assert(std::is_same_v<P0, pack_input<uint8_t, vals[0]>>);
-    static_assert(std::is_same_v<P1, pack_input<uint8_t, vals[1]>>);
-    static_assert(std::is_same_v<P2, pack_input<uint8_t, vals[2]>>);
-    static_assert(std::is_same_v<P3, pack_input<uint8_t, vals[3]>>);
+    static_assert(std::is_same_v<P0, input<uint8_t, vals[0]>>);
+    static_assert(std::is_same_v<P1, input<uint8_t, vals[1]>>);
+    static_assert(std::is_same_v<P2, input<uint8_t, vals[2]>>);
+    static_assert(std::is_same_v<P3, input<uint8_t, vals[3]>>);
 
     static_assert(S0.advance<      0>() == S0.value);
     static_assert(S0.advance<bits[0]>() == S1.value);
@@ -54,9 +53,9 @@ static_assert(test1());
 
 constexpr bool test3()
 {
-    constexpr auto S0 = pack_input<uint16_t, 16>{0b1110100110001011};
-    constexpr auto S1 = pack_input<uint16_t,  4>{0b1110};
-    constexpr auto S2 = pack_input<uint16_t,  1>{0b1};
+    constexpr auto S0 = input<uint16_t, 16>{0b1110100110001011};
+    constexpr auto S1 = input<uint16_t,  4>{0b1110};
+    constexpr auto S2 = input<uint16_t,  1>{0b1};
 
     static_assert(S0.get<12>() == 0b100110001011);
     static_assert(S0.advance<12>() == S1.value);
@@ -81,7 +80,7 @@ constexpr bool test4()
     {
         Tuple_u32 tuple{};
         static_assert(lowbits<uint32_t, 17> == 0x1ffffU);
-        read_pack(tuple, pack_input<uint32_t, 32>{(uint32_t)-1}, std::make_index_sequence<3>{}, make_pack<uint32_t, 17, 14, 1>{});
+        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;
         fm_assert(a == lowbits<uint32_t, 17>);
         fm_assert(b == lowbits<uint32_t, 14>);
@@ -89,7 +88,7 @@ constexpr bool test4()
     }
     {
         Tuple_u8 tuple{};
-        read_pack(tuple, pack_input<uint8_t, 8>{0b101011}, std::make_index_sequence<3>{}, make_pack<uint8_t, 1, 3, 2>{});
+        read(tuple, input<uint8_t, 8>{0b101011}, std::make_index_sequence<3>{}, make_pack<uint8_t, 1, 3, 2>{});
         auto [a, b, c] = tuple;
         fm_assert(a == 0b1);
         fm_assert(b == 0b101);
@@ -97,13 +96,13 @@ constexpr bool test4()
     }
     {
         std::tuple<> empty_tuple;
-        read_pack(empty_tuple, pack_input<uint8_t, 8>{0}, std::index_sequence<>{}, make_pack<uint8_t>{});
+        read(empty_tuple, input<uint8_t, 8>{0}, std::index_sequence<>{}, make_pack<uint8_t>{});
         Tuple_u8 tuple{}; (void)tuple;
-        //read_pack(empty_tuple, pack_input<uint8_t, 8>{1}, std::index_sequence<>{}, make_tuple<uint8_t>{});
-        //read_pack(tuple, pack_input<uint8_t, 5>{0b11111}, std::make_index_sequence<3>{}, make_tuple<uint8_t, 2, 2, 2>{});
-        //(void)pack_input<uint8_t, 9>{};
-        //read_pack(empty_tuple, pack_input<uint8_t, 8>{}, std::index_sequence<0>{}, make_tuple<uint8_t, 1>{});
-        //read_pack(empty_tuple, pack_input<uint8_t, 8>{1}, std::index_sequence<>{}, make_tuple<uint8_t, 1>{});
+        //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>{});
+        //(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>{});
     }
 
     return true;
diff --git a/serialize/packbits.hpp b/serialize/packbits.hpp
index 81971c71..ee8aeaec 100644
--- a/serialize/packbits.hpp
+++ b/serialize/packbits.hpp
@@ -1,71 +1,17 @@
 #pragma once
-#include <type_traits>
 #include <concepts>
-#include <tuple>
-#include "compat/assert.hpp"
+#include <utility>
 
 namespace floormat::detail_Pack {
 
 template<std::unsigned_integral T, size_t N>
-struct Bits final
+struct bits final
 {
     static_assert(std::is_fundamental_v<T>);
     static_assert(N > 0);
     static_assert(N < sizeof(T)*8);
 
     using type = T;
-    static constexpr auto bits = N;
-};
-
-template<std::unsigned_integral T, size_t CAPACITY>
-struct pack_input
-{
-    static_assert(CAPACITY <= sizeof(T)*8);
-
-    using Type = T;
-    static constexpr size_t Capacity = CAPACITY;
-    T value;
-
-    template<size_t N>
-    constexpr T get() const
-    {
-        static_assert(N > 0);
-        static_assert(N <= sizeof(T)*8);
-        static_assert(N <= Capacity);
-        return T(value & (T(1) << N) - T(1));
-    }
-
-    template<size_t N>
-    constexpr T advance() const
-    {
-        static_assert(N <= sizeof(T)*8);
-        static_assert(N <= Capacity);
-        return T(value >> N);
-    }
-
-    constexpr bool operator==(const pack_input&) const noexcept = default;
-    [[nodiscard]] constexpr inline bool check_zero() const { return value == T(0); }
-
-    template<size_t N> using next = pack_input<T, Capacity - N>;
-};
-
-template<std::unsigned_integral T>
-struct pack_input<T, 0>
-{
-    using Type = T;
-    static constexpr size_t Capacity = 0;
-    T value;
-
-    template<size_t N> [[maybe_unused]] constexpr T get() const = delete;
-    template<size_t N> [[maybe_unused]] constexpr T advance() const = delete;
-    constexpr bool operator==(const pack_input&) const noexcept = default;
-    [[nodiscard]] constexpr inline bool check_zero() const { return true; }
-
-    template<size_t N> struct next
-    {
-        static_assert(N == 0, "reading past the end");
-        static_assert(N != 0, "reading past the end");
-    };
 };
 
 template<std::unsigned_integral T, size_t N>
@@ -84,31 +30,6 @@ template<std::unsigned_integral T, size_t N> using make_tuple_type = typename ma
 
 template<typename... Ts> struct empty_pack_tuple {};
 
-template<std::unsigned_integral T, typename Place, size_t Left, size_t I, size_t... Is, size_t Size, typename... Sizes>
-requires requires() { sizeof...(Is) == sizeof...(Sizes); }
-constexpr void read_pack(Place& p, pack_input<T, Left> st, std::index_sequence<I, Is...>, empty_pack_tuple<Bits<T, Size>, Sizes...>)
-{
-    static_assert(Size <= Left, "too many bits requested");
-    static_assert(I < std::tuple_size_v<Place>, "too few tuple members");
-    using S = pack_input<T, Left>;
-    using next_type = typename S::template next<Size>;
-    get<I>(p) = st.template get<Size>();
-    T next_value = st.template advance<Size>();
-    read_pack(p, next_type{next_value}, std::index_sequence<Is...>{}, empty_pack_tuple<Sizes...>{});
-}
-
-template<std::unsigned_integral T, typename Place, size_t Left>
-constexpr void read_pack(Place&, pack_input<T, Left> st, std::index_sequence<>, empty_pack_tuple<>)
-{
-    fm_assert(st.check_zero());
-}
-
-template<std::unsigned_integral T, typename Place, size_t Left, size_t... Is, typename... Sizes>
-requires(sizeof...(Is) != sizeof...(Sizes))
-constexpr void read_pack(Place&, pack_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<Bits<T, Ns>...>;
-
 } // namespace floormat::detail_Pack
 
 namespace floormat::Pack {