From f7e76cc9f12396477747f87e5319522a97b6833a Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 30 Jun 2022 12:22:14 -0700
Subject: [PATCH] ircd::json: Reuse ircd::util abstract tuple tools.

---
 include/ircd/json/tuple/for_each.h  | 56 ++++++-----------------------
 include/ircd/json/tuple/rfor_each.h | 50 +++++---------------------
 2 files changed, 18 insertions(+), 88 deletions(-)

diff --git a/include/ircd/json/tuple/for_each.h b/include/ircd/json/tuple/for_each.h
index 7ec6773f8..f0ec4c8ce 100644
--- a/include/ircd/json/tuple/for_each.h
+++ b/include/ircd/json/tuple/for_each.h
@@ -14,66 +14,30 @@
 namespace ircd {
 namespace json {
 
-template<size_t i = 0,
-         class tuple,
+template<class tuple,
          class function>
 inline enable_if_tuple<tuple, bool>
 for_each(const tuple &t,
          function&& f)
 {
-	if constexpr(i < size<tuple>())
+	return util::for_each(t, [&f]
+	(const auto &prop)
 	{
-		using closure_result = std::invoke_result_t
-		<
-			decltype(f), decltype(key<i>(t)), decltype(val<i>(t))
-		>;
-
-		constexpr bool terminable
-		{
-			std::is_same<closure_result, bool>()
-		};
-
-		if constexpr(terminable)
-		{
-			if(!f(key<i>(t), val<i>(t)))
-				return false;
-		}
-		else f(key<i>(t), val<i>(t));
-
-		return for_each<i + 1>(t, std::forward<function>(f));
-	}
-	else return true;
+		return f(prop.key, prop.value);
+	});
 }
 
-template<size_t i = 0,
-         class tuple,
+template<class tuple,
          class function>
 inline enable_if_tuple<tuple, bool>
 for_each(tuple &t,
          function&& f)
 {
-	if constexpr(i < size<tuple>())
+	return util::for_each(t, [&f]
+	(auto &prop)
 	{
-		using closure_result = std::invoke_result_t
-		<
-			decltype(f), decltype(key<i>(t)), decltype(val<i>(t))
-		>;
-
-		constexpr bool terminable
-		{
-			std::is_same<closure_result, bool>()
-		};
-
-		if constexpr(terminable)
-		{
-			if(!f(key<i>(t), val<i>(t)))
-				return false;
-		}
-		else f(key<i>(t), val<i>(t));
-
-		return for_each<i + 1>(t, std::forward<function>(f));
-	}
-	else return true;
+		return f(prop.key, prop.value);
+	});
 }
 
 template<class tuple,
diff --git a/include/ircd/json/tuple/rfor_each.h b/include/ircd/json/tuple/rfor_each.h
index 97eb25059..fe5c9d515 100644
--- a/include/ircd/json/tuple/rfor_each.h
+++ b/include/ircd/json/tuple/rfor_each.h
@@ -21,28 +21,11 @@ inline enable_if_tuple<tuple, bool>
 rfor_each(const tuple &t,
           function&& f)
 {
-	if constexpr(i >= 0)
+	return util::rfor_each(t, [&f]
+	(const auto &prop)
 	{
-		using closure_result = std::invoke_result_t
-		<
-			decltype(f), decltype(key<i>(t)), decltype(val<i>(t))
-		>;
-
-		constexpr bool terminable
-		{
-			std::is_same<closure_result, bool>()
-		};
-
-		if constexpr(terminable)
-		{
-			if(!f(key<i>(t), val<i>(t)))
-				return false;
-		}
-		else f(key<i>(t), val<i>(t));
-
-		return rfor_each<tuple, function, i - 1>(t, std::forward<function>(f));
-	}
-	else return true;
+		return f(prop.key, prop.value);
+	});
 }
 
 template<class tuple,
@@ -52,28 +35,11 @@ inline enable_if_tuple<tuple, bool>
 rfor_each(tuple &t,
           function&& f)
 {
-	if constexpr(i >= 0)
+	return util::rfor_each(t, [&f]
+	(auto &prop)
 	{
-		using closure_result = std::invoke_result_t
-		<
-			decltype(f), decltype(key<i>(t)), decltype(val<i>(t))
-		>;
-
-		constexpr bool terminable
-		{
-			std::is_same<closure_result, bool>()
-		};
-
-		if constexpr(terminable)
-		{
-			if(!f(key<i>(t), val<i>(t)))
-				return false;
-		}
-		else f(key<i>(t), val<i>(t));
-
-		return rfor_each<tuple, function, i - 1>(t, std::forward<function>(f));
-	}
-	else return true;
+		return f(prop.key, prop.value);
+	});
 }
 
 } // namespace json