From e3cdbed1927683f920e14b4fb40bfdc6e2821906 Mon Sep 17 00:00:00 2001
From: Claudius 'keldu' Holeksa <mail@keldu.de>
Date: Mon, 19 Aug 2024 10:53:12 +0200
Subject: Changed generic to proper type and added more info on error

---
 modules/codec-json/c++/json.tmpl.hpp | 4 +++-
 modules/core/c++/error.hpp           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/codec-json/c++/json.tmpl.hpp b/modules/codec-json/c++/json.tmpl.hpp
index 8dbee8c..e73e49d 100644
--- a/modules/codec-json/c++/json.tmpl.hpp
+++ b/modules/codec-json/c++/json.tmpl.hpp
@@ -723,7 +723,9 @@ struct json_decode<schema::Struct<schema::Member<T,Lits>...>, ToDecode> {
 				buff.read_advance(1);
 				return void_t{};
 			}else{
-				return make_error<err::invalid_state>("Struct Separator ',' or Struct '}' ending expected");
+				return build_error([&](){
+					return std::string{"Expect ',' or '}', but got "} + std::string{static_cast<char>(buff.read())};
+				}).template make_error<err::invalid_state>("Struct Separator ',' or Struct '}' ending expected");
 			}
 			json_helper::skip_whitespace(buff);
 			if(buff.read_composite_length() == 0){
diff --git a/modules/core/c++/error.hpp b/modules/core/c++/error.hpp
index e1280d8..dab297e 100644
--- a/modules/core/c++/error.hpp
+++ b/modules/core/c++/error.hpp
@@ -170,7 +170,7 @@ public:
 	{}
 
 	template<typename T>
-	error make_error(const std::string& generic){
+	error make_error(const std::string_view& generic){
 		try{
 			std::string err_str = func_();
 			error::code id = impl::get_template_id<T>();
-- 
cgit v1.2.3