From 5c51e17156530402f7860a3bf82bd57ac87f49f7 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Tue, 12 Feb 2019 03:58:14 +0000
Subject: [PATCH] [ox/mc] Add Vector handler to DefWriter, add static_assert
 tests

---
 deps/ox/src/ox/mc/defwriter.hpp | 45 ++++++++++++++++++++++++---------
 deps/ox/src/ox/std/vector.hpp   |  7 +++++
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/deps/ox/src/ox/mc/defwriter.hpp b/deps/ox/src/ox/mc/defwriter.hpp
index fab61341..894d68e3 100644
--- a/deps/ox/src/ox/mc/defwriter.hpp
+++ b/deps/ox/src/ox/mc/defwriter.hpp
@@ -31,6 +31,21 @@ static constexpr int indirectionLevels(T *t) {
 	return 1 + indirectionLevels(*t);
 }
 
+static_assert([] {
+	int i = 0;
+	return indirectionLevels(&i) == 1;
+}(), "indirectionLevels broken: indirectionLevels(int*)");
+
+static_assert([] {
+	int i[2] = {};
+	return indirectionLevels(i) == 1;
+}(), "indirectionLevels broken: indirectionLevels(int[])");
+
+static_assert([] {
+	int i[2][2] = {{}};
+	return indirectionLevels(i) == 2;
+}(), "indirectionLevels broken: indirectionLevels(int[][])");
+
 class MetalClawDefWriter {
 
 	private:
@@ -44,16 +59,16 @@ class MetalClawDefWriter {
 		~MetalClawDefWriter();
 
 		template<typename T>
-		int op(const char *name, T *val, std::size_t valLen);
-
-		template<std::size_t L>
-		int op(const char *name, const char *val);
-
-		template<std::size_t L>
-		int op(const char *name, ox::BString<L> *val);
+		ox::Error op(const char *name, T *val, std::size_t valLen);
 
 		template<typename T>
-		constexpr int op(const char *name, T *val);
+		ox::Error op(const char *name, ox::Vector<T> *val);
+
+		template<std::size_t L>
+		ox::Error op(const char *name, ox::BString<L> *val);
+
+		template<typename T>
+		constexpr ox::Error op(const char *name, T *val);
 
 		constexpr void setTypeInfo(const char *name, int fields);
 
@@ -87,22 +102,28 @@ class MetalClawDefWriter {
 
 // array handler
 template<typename T>
-int MetalClawDefWriter::op(const char *name, T *val, std::size_t) {
+ox::Error MetalClawDefWriter::op(const char *name, T *val, std::size_t) {
 	if (m_type) {
 		constexpr typename RemoveIndirection<decltype(val)>::type *p = nullptr;
 		const auto t = type(p);
 		m_type->fieldList.push_back(mc::Field{t, name, subscriptLevels(val)});
+		return 0;
 	}
-	return 0;
+	return OxError(1);
+}
+
+template<typename T>
+ox::Error MetalClawDefWriter::op(const char *name, ox::Vector<T> *val) {
+	return op(name, val->data(), val->size());
 }
 
 template<std::size_t L>
-int MetalClawDefWriter::op(const char *name, ox::BString<L> *val) {
+ox::Error MetalClawDefWriter::op(const char *name, ox::BString<L> *val) {
 	return op(name, val->c_str());
 }
 
 template<typename T>
-constexpr int MetalClawDefWriter::op(const char *name, T *val) {
+constexpr ox::Error MetalClawDefWriter::op(const char *name, T *val) {
 	if (m_type) {
 		const auto t = type(val);
 		m_type->fieldList.push_back(mc::Field{t, name});
diff --git a/deps/ox/src/ox/std/vector.hpp b/deps/ox/src/ox/std/vector.hpp
index 75ed5601..a6fd25ec 100644
--- a/deps/ox/src/ox/std/vector.hpp
+++ b/deps/ox/src/ox/std/vector.hpp
@@ -43,6 +43,8 @@ class Vector {
 
 		void resize(std::size_t size) noexcept;
 
+		T *data();
+
 		bool contains(T) const noexcept;
 
 		void push_back(const T &item) noexcept;
@@ -153,6 +155,11 @@ void Vector<T>::resize(std::size_t size) noexcept {
 	m_size = size;
 }
 
+template<typename T>
+T *Vector<T>::data() {
+	return m_items;
+}
+
 template<typename T>
 bool Vector<T>::contains(T v) const noexcept {
 	for (std::size_t i = 0; i < m_size; i++) {