From 4aeae145b4a64e88e3e7a83c09669364eac5491e Mon Sep 17 00:00:00 2001
From: Andreas Reischuk <andreas.reischuck@hicknhack-software.com>
Date: Tue, 18 Jun 2024 20:00:08 +0200
Subject: [PATCH] Serialize19 use indexed tuple access

* allow serialize tuples with multiples of same type
---
 src/serialize19.lib/serialize19/serialize.Tuple.h   |  5 ++++-
 .../serialize19/serialize.Tuple.test.cpp            | 13 +++++++++++++
 .../serialize19/serialize.std_tuple.h               |  7 ++++++-
 .../serialize19/serialize.std_tuple.test.cpp        | 13 +++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/serialize19.lib/serialize19/serialize.Tuple.h b/src/serialize19.lib/serialize19/serialize.Tuple.h
index 624b0a1a..7eb86aca 100644
--- a/src/serialize19.lib/serialize19/serialize.Tuple.h
+++ b/src/serialize19.lib/serialize19/serialize.Tuple.h
@@ -5,8 +5,11 @@
 namespace serialize19 {
 
 template<Archive A, class... Ts> void serialize(A& a, tuple19::Tuple<Ts...>& tuple) {
+    using meta19::nullptr_to;
     using meta19::type;
-    (serialize(a, tuple.amendOf(type<Ts>)), ...);
+    [&]<size_t... Is>(std::index_sequence<Is...>*) {
+        (serialize(a, tuple.template amendAt<Is>()), ...);
+    }(nullptr_to<std::make_index_sequence<sizeof...(Ts)>>);
 }
 
 } // namespace serialize19
diff --git a/src/serialize19.lib/serialize19/serialize.Tuple.test.cpp b/src/serialize19.lib/serialize19/serialize.Tuple.test.cpp
index 50acb654..c62c2930 100644
--- a/src/serialize19.lib/serialize19/serialize.Tuple.test.cpp
+++ b/src/serialize19.lib/serialize19/serialize.Tuple.test.cpp
@@ -21,3 +21,16 @@ TEST(serialize, Tuple) {
 
     EXPECT_EQ(output, input);
 }
+
+TEST(serialize, Tuple_ints) {
+    using T = Tuple<int, int, int>;
+    auto input = T{23, 42, 13};
+
+    auto buffer = dynamicWrite(input);
+
+    auto reader = ReadArchive{buffer.slice()};
+    auto output = T{};
+    serialize(reader, output);
+
+    EXPECT_EQ(output, input);
+}
diff --git a/src/serialize19.lib/serialize19/serialize.std_tuple.h b/src/serialize19.lib/serialize19/serialize.std_tuple.h
index c6ee8374..02f21988 100644
--- a/src/serialize19.lib/serialize19/serialize.std_tuple.h
+++ b/src/serialize19.lib/serialize19/serialize.std_tuple.h
@@ -1,12 +1,17 @@
 #pragma once
 #include "serialize.h"
 
+#include <meta19/Type.h>
 #include <tuple>
 
 namespace serialize19 {
 
 template<Archive A, class... Ts> void serialize(A& a, std::tuple<Ts...>& tuple) {
-    (serialize(a, std::get<Ts>(tuple)), ...);
+    using meta19::nullptr_to;
+    using meta19::type;
+    [&]<size_t... Is>(std::index_sequence<Is...>*) {
+        (serialize(a, std::get<Is>(tuple)), ...);
+    }(nullptr_to<std::make_index_sequence<sizeof...(Ts)>>);
 }
 
 } // namespace serialize19
diff --git a/src/serialize19.lib/serialize19/serialize.std_tuple.test.cpp b/src/serialize19.lib/serialize19/serialize.std_tuple.test.cpp
index f6b86e26..8ebd0f8b 100644
--- a/src/serialize19.lib/serialize19/serialize.std_tuple.test.cpp
+++ b/src/serialize19.lib/serialize19/serialize.std_tuple.test.cpp
@@ -19,3 +19,16 @@ TEST(serialize, std_tuple) {
 
     EXPECT_EQ(output, input);
 }
+
+TEST(serialize, std_tuple_ints) {
+    using T = std::tuple<int, int, int>;
+    auto input = T{23, 13, 42};
+
+    auto buffer = dynamicWrite(input);
+
+    auto reader = ReadArchive{buffer.slice()};
+    auto output = T{};
+    serialize(reader, output);
+
+    EXPECT_EQ(output, input);
+}