From 6770ce908f1c2a21d73be360bf39b03198b6e916 Mon Sep 17 00:00:00 2001
From: lisyarus <lisyarus@gmail.com>
Date: Wed, 27 Mar 2024 21:37:10 +0300
Subject: [PATCH] Refactor trivial serialization

---
 libs/sir/include/psemek/sir/trivial.hpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/libs/sir/include/psemek/sir/trivial.hpp b/libs/sir/include/psemek/sir/trivial.hpp
index 5ba80333..a621ce60 100644
--- a/libs/sir/include/psemek/sir/trivial.hpp
+++ b/libs/sir/include/psemek/sir/trivial.hpp
@@ -92,21 +92,35 @@ namespace psemek::sir
 	}
 
 	template <typename Stream, typename T>
-	requires (is_ostream_v<Stream> && !is_custom_v<T> && !is_empty_v<T> && is_trivial_v<T>)
-	void write(Stream & s, T const & x)
+	requires (is_ostream_v<Stream>)
+	void write_trivial(Stream & s, T const & x)
 	{
 		write_padding<T>(s);
 		s.write(reinterpret_cast<char const *>(std::addressof(x)), sizeof(x));
 	}
 
 	template <typename Stream, typename T>
-	requires (is_istream_v<Stream> && !is_custom_v<T> && !is_empty_v<T> && is_trivial_v<T>)
-	void read(Stream & s, T & x)
+	requires (is_ostream_v<Stream> && !is_custom_v<T> && !is_empty_v<T> && is_trivial_v<T>)
+	void write(Stream & s, T const & x)
+	{
+		write_trivial(s, x);
+	}
+
+	template <typename Stream, typename T>
+	requires (is_istream_v<Stream>)
+	void read_trivial(Stream & s, T & x)
 	{
 		read_padding<T>(s);
 		s.read(reinterpret_cast<char *>(std::addressof(x)), sizeof(x));
 	}
 
+	template <typename Stream, typename T>
+	requires (is_istream_v<Stream> && !is_custom_v<T> && !is_empty_v<T> && is_trivial_v<T>)
+	void read(Stream & s, T & x)
+	{
+		read_trivial(s, x);
+	}
+
 	template <typename Iterator>
 	void write_sequence(ostream & s, Iterator begin, Iterator end)
 	{