From 0825c9869a2ddc86f1daf7314465950b8f1c9265 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Fri, 1 Nov 2019 01:28:29 -0500
Subject: [PATCH] [ox/mc] Add support for individual element readers for arrays

---
 deps/ox/src/ox/mc/read.hpp | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/ox/mc/read.hpp
index 501f9dfa..6b25c267 100644
--- a/deps/ox/src/ox/mc/read.hpp
+++ b/deps/ox/src/ox/mc/read.hpp
@@ -54,6 +54,14 @@ class MetalClawReader {
 		template<typename T>
 		Error field(const char*, T *val, std::size_t len);
 
+		// array handler, with callback to allow handling individual elements
+		template<typename T, typename Handler>
+		Error field(const char*, Handler *val);
+
+		// array handler, with callback to allow handling individual elements
+		template<typename T, typename Handler>
+		Error field(const char*, Handler *val, ArrayLength len);
+
 		template<typename T>
 		Error field(const char*, ox::Vector<T> *val);
 
@@ -145,7 +153,7 @@ Error MetalClawReader::field(const char *name, T *val, std::size_t valLen) {
 			return OxError(MC_BUFFENDED);
 		}
 		std::size_t bytesRead = 0;
-		auto len = mc::decodeInteger<StringLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead);
+		auto len = mc::decodeInteger<ArrayLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead);
 		m_buffIt += bytesRead;
 		oxReturnError(len.error);
 
@@ -164,6 +172,32 @@ Error MetalClawReader::field(const char *name, T *val, std::size_t valLen) {
 	return OxError(0);
 }
 
+template<typename T, typename Handler>
+Error MetalClawReader::field(const char *name, Handler *handler) {
+	auto [arrayLen, err] = arrayLength(true);
+	oxReturnError(err);
+	return field(name, handler, arrayLen);
+}
+
+template<typename T, typename Handler>
+Error MetalClawReader::field(const char*, Handler *handler, ArrayLength len) {
+	if (m_fieldPresence.get(m_field++)) {
+		// read the length
+		if (m_buffIt >= m_buffLen) {
+			return OxError(MC_BUFFENDED);
+		}
+		// read the list
+		auto reader = child();
+		reader.setTypeInfo("List", len);
+		for (std::size_t i = 0; i < len; i++) {
+			T val;
+			oxReturnError(reader.field("", &val));
+			oxReturnError(handler(i, &val));
+		}
+	}
+	return OxError(0);
+}
+
 template<typename T>
 Error MetalClawReader::field(const char* name, ox::Vector<T> *val) {
 	const auto [len, err] = arrayLength(false);