From e55ff3919242cb83ca5665fa6842426ea931308a Mon Sep 17 00:00:00 2001
From: Claudius Holeksa <mail@keldu.de>
Date: Sat, 18 Dec 2021 20:54:51 +0100
Subject: [PATCH] fixing typo bugs

---
 source/kelgin/message.h           | 28 ++++++++++++++--------------
 source/kelgin/message_container.h | 29 +++++++++++++++++++++--------
 source/kelgin/string_literal.h    |  9 +++++++++
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/source/kelgin/message.h b/source/kelgin/message.h
index 1a77e54..53c3e3b 100644
--- a/source/kelgin/message.h
+++ b/source/kelgin/message.h
@@ -65,14 +65,14 @@ public:
 	public:
 		Builder(MessageType &msg) : message{msg} {}
 
-		Reader asReader() { return Reader{MessageType & message}; }
+		Reader asReader() { return Reader{message}; }
 
 		/*
 		 * Initialize a member by index
 		 */
 		template <size_t i> typename Container::ElementType<i>::Builder init() {
 			return typename Container::ElementType<i>::Builder{
-				message.container.get<i>()};
+				message.container.template get<i>()};
 		}
 
 		/*
@@ -81,10 +81,10 @@ public:
 		 */
 		template <StringLiteral Literal>
 		typename Container::ElementType<
-			MessageParameterKeyIndex<Literal, Keys...>::Value>::Builder
+			MessageParameterKeyPackIndex<Literal, Keys...>::Value>::Builder
 		init() {
 			constexpr size_t i =
-				MessageParameterKeyIndex<Literal, Keys...>::Value;
+				MessageParameterKeyPackIndex<Literal, Keys...>::Value;
 
 			return init<i>();
 		}
@@ -104,7 +104,7 @@ public:
 		 */
 		template <size_t i> typename Container::ElementType<i>::Reader get() {
 			return typename Container::ElementType<i>::Reader{
-				message.container.get<i>()};
+				message.container.template get<i>()};
 		}
 
 		/*
@@ -113,11 +113,11 @@ public:
 		 */
 		template <StringLiteral Literal>
 		typename Container::ElementType<
-			MessageParameterKeyIndex<Literal, Keys...>::Value>::Reader
+			MessageParameterKeyPackIndex<Literal, Keys...>::Value>::Reader
 		get() {
 			// The index of the first match
 			constexpr size_t i =
-				MessageParameterKeyIndex<Literal, Keys...>::Value;
+				MessageParameterKeyPackIndex<Literal, Keys...>::Value;
 
 			return get<i>();
 		}
@@ -159,7 +159,7 @@ public:
 
 		template <size_t i> typename Container::ElementType<i>::Builder init() {
 			return typename Container::ElementType<i>::Builder{
-				message.container.get<i>()};
+				message.container.template get<i>()};
 		}
 	};
 
@@ -174,12 +174,12 @@ public:
 
 		template <size_t i> typename Container::ElementType<i>::Reader get() {
 			return typename Container::ElementType<i>::Reader{
-				message.container.get<i>()};
+				message.container.template get<i>()};
 		}
 
 		template <StringLiteral Literal>
 		constexpr size_t index() const noexcept {
-			return MessageParameterPackIndex<Literal, Keys...>::Value;
+			return MessageParameterKeyPackIndex<Literal, Keys...>::Value;
 		}
 	};
 };
@@ -241,7 +241,7 @@ Container::MessageType::Reader{message.container.get<i>()};
 /*
  * Tuple message class. Wrapper around a tuple schema
  */
-template <class... T>
+template <class... T, class Container>
 class Message<schema::Tuple<T...>, Container> final : public MessageBase {
 private:
 	using SchemaType = schema::Tuple<T...>;
@@ -267,7 +267,7 @@ public:
 
 		template <size_t i> typename Container::MessageType::Builder init() {
 			return typename Container::MessageType::Builder{
-				message.container.get<i>()};
+				message.container.template get<i>()};
 		}
 	};
 	class Reader {
@@ -281,7 +281,7 @@ public:
 
 		template <size_t i> typename Container::MessageType::Reader get() {
 			return typename Container::MessageType::Reader{
-				message.container.get<i>()};
+				message.container.template get<i>()};
 		}
 	};
 };
@@ -369,7 +369,7 @@ public:
 		Builder asBuilder() { return Builder{message}; }
 
 		std::string_view get() { return message.container.get(); }
-	}
+	};
 };
 
 template <class Schema, class Container = MessageContainer<Schema>>
diff --git a/source/kelgin/message_container.h b/source/kelgin/message_container.h
index 6eaf463..2c6c39a 100644
--- a/source/kelgin/message_container.h
+++ b/source/kelgin/message_container.h
@@ -30,17 +30,30 @@ struct MessageParameterPackIndex<T, TL0, TL...> {
 		1u + MessageParameterPackIndex<T, TL...>::Value;
 };
 
-template <StringLiteral... ValueKeys> struct MessageParameterKeyIndex;
-
-template <StringLiteral V, StringLiteral... Keys>
-struct MessageParameterKeyIndex<V, V, Keys...> {
-	static constexpr size_t Value = 0u;
+/*
+ * Nightmare inducing compiler problems found here. Somehow non-type
+ * StringLiterals cannot be resolved as non-type primitive template values can.
+ * This is the workaround
+ */
+template <StringLiteral V, StringLiteral Key0, StringLiteral... Keys>
+struct MessageParameterKeyPackIndexHelper {
+	static constexpr size_t Value =
+		(V == Key0)
+			? (0u)
+			: (1u + MessageParameterKeyPackIndexHelper<V, Keys...>::Value);
 };
 
-template <StringLiteral V, StringLiteral Key0, StringLiteral... Keys>
-struct MessageParameterKeyIndex<V, Key0, Keys...> {
+template <StringLiteral V, StringLiteral Key0>
+struct MessageParameterKeyPackIndexHelper<V, Key0> {
+	static constexpr size_t Value = (V == Key0) ? (0u) : (1u);
+};
+
+template <StringLiteral V, StringLiteral... Keys>
+struct MessageParameterKeyPackIndex {
 	static constexpr size_t Value =
-		1u + MessageParameterKeyIndex<V, Keys...>::Value;
+		MessageParameterKeyPackIndexHelper<V, Keys...>::Value;
+	static_assert(Value < sizeof...(Keys),
+				  "Provided StringLiteral doesn't exist in searched list");
 };
 
 template <class... V, StringLiteral... Keys>
diff --git a/source/kelgin/string_literal.h b/source/kelgin/string_literal.h
index 2deaf2c..3382dd0 100644
--- a/source/kelgin/string_literal.h
+++ b/source/kelgin/string_literal.h
@@ -22,6 +22,15 @@ public:
 	constexpr std::string_view view() const noexcept {
 		return std::string_view{data.data()};
 	}
+
+	constexpr bool operator==(const StringLiteral<CharT, N> &) const
+		noexcept = default;
+
+	template <class CharTR, size_t NR>
+	constexpr bool operator==(const StringLiteral<CharTR, NR> &) const
+		noexcept {
+		return false;
+	}
 };
 
 template <typename T, T... Chars>