c++: Setting up testing progress

2 files changed, 30 insertions, 27 deletions

diff --git a/src/codec-json/json.h b/src/codec-json/json.h
index f23aff9..c8456b5 100644
--- a/src/codec-json/json.h
+++ b/src/codec-json/json.h
@@ -4,40 +4,43 @@
 #include <forstio/core/common.h>
 #include <forstio/codec/data.h>
 
-#include "json.tmpl.h"
-
 #include <algorithm>
 
 namespace saw {
 namespace encode {
 struct Json {};
 }
+}
+
+#include "json.tmpl.h"
+
+namespace saw {
 
 template<typename Schema>
 class data<Schema, encode::Json> {
 private:
-	own<buffer> buffer_;
+	ring_buffer buffer_;
 public:
-
-	data():
-		buffer_{heap<ring_buffer>()}
-	{}
+	data():buffer_{}{}
 
 	buffer& get_buffer(){
-		assert(buffer_);
-		return *buffer_;
+		return buffer_;
+	}
+
+	void push(uint8_t val){
+		buffer_.push(val);
 	}
 
 	std::size_t get_size() const {
-		return buffer_.size();
+		return buffer_.read_composite_length();
 	}
 
 	uint8_t& at(std::size_t i){
-		return buffer_.at(i);
+		return buffer_.read(i);
 	}
 	
 	const uint8_t& at(std::size_t i) const {
-		return buffer_.at(i);
+		return buffer_.read(i);
 	}
 };
 
@@ -57,7 +60,7 @@ public:
 	/**
 	 * Default constructor
 	 */
-	config(){}
+	codec(){}
 
 	/**
 	 * Constructor
@@ -68,16 +71,15 @@ public:
 	SAW_DEFAULT_MOVE(codec);
 
 	template <typename FromEncoding>
-	ErrorOr<void>  encode(const data<Schema, FromEncoding>& from_encode, data<Schema, encode::Json>& to_encode){
+	error_or<void>  encode(const data<Schema, FromEncoding>& from_encode, data<Schema, encode::Json>& to_encode){
 		// To Be encoded
-		
-		
-		return Void {};
+		return impl::json_encode<Schema, Schema, FromEncoding>::encode(from_encode, to_encode);
 	}
 
 	template <typename ToEncoding>
-	ErrorOr<void> decode(const data<Schema, encode::Json>& from_decode, data<Schema, ToEncoding>& to_decode){
-		return Void {};
+	error_or<void> decode(const data<Schema, encode::Json>& from_decode, data<Schema, ToEncoding>& to_decode){
+		return void_t {};
 	}
 };
 }
+
diff --git a/src/codec-json/json.tmpl.h b/src/codec-json/json.tmpl.h
index 3699e10..a19e3dc 100644
--- a/src/codec-json/json.tmpl.h
+++ b/src/codec-json/json.tmpl.h
@@ -5,23 +5,23 @@
 namespace saw {
 namespace impl {
 template<typename Schema, typename RootSchema, typename FromEncode>
-class json_encode_impl {
+class json_encode {
 	static_assert(always_false<Schema, RootSchema, FromEncode>, "This schema type is not being handle by the json encoding.");
 };
 
 template<typename T, size_t N, typename RootSchema, typename FromEncode>
-class json_encode_impl<saw::schema::Primitive<T,N>, RootSchema, FromEncode>  {
-	static ErrorOr<void> encode(const data<Schema, FromEncode>& from, data<Schema, encode::Json>& to, size_t ptr) {
+struct json_encode<saw::schema::Primitive<T,N>, RootSchema, FromEncode>  {
+	static error_or<void> encode(const data<saw::schema::Primitive<T,N>, FromEncode>& from, data<saw::schema::Primitive<T,N>, encode::Json>& to) {
 		auto val = from.get();
 		std::array<uint8_t, 256> data;
-		auto tc_result = std::to_chars(reinterpret_cast<int8_t>(data.data()), reinrepret_cast<int8_t>(data.data())+data.size(), val);
+		auto tc_result = std::to_chars(reinterpret_cast<char*>(data.data()), reinterpret_cast<char*>(data.data())+data.size(), val);
 
 		if(tc_result.ec != std::errc{}){
 			return make_error<err::critical>();
 		}
 
 		size_t bytes_written = 0;
-		for(auto ptr = data.data(); ptr != tc_result.ptr; ++ptr){
+		for(char* ptr = reinterpret_cast<char*>(data.data()); ptr != tc_result.ptr; ++ptr){
 			++bytes_written;
 		}
 
@@ -31,11 +31,12 @@ class json_encode_impl<saw::schema::Primitive<T,N>, RootSchema, FromEncode>  {
 			return std::move(err);
 		}
 
-		for(auto ptr = data.data(); ptr != tc_result.ptr; ++ptr){
-			buff.push(ptr[0]);
+		for(char* ptr = reinterpret_cast<char*>(data.data()); ptr != tc_result.ptr; ++ptr){
+			uint8_t* un_ptr = reinterpret_cast<uint8_t*>(ptr);
+			buff.push(un_ptr[0]);
 		}
 
-		return Void{};
+		return void_t{};
 	}
 };
 }