Moving forward with basic test for sycl

3 files changed, 36 insertions, 10 deletions

diff --git a/modules/codec/c++/interface.hpp b/modules/codec/c++/interface.hpp
index 0f41f55..e1c9a12 100644
--- a/modules/codec/c++/interface.hpp
+++ b/modules/codec/c++/interface.hpp
@@ -12,28 +12,40 @@ template<typename SchemaFunc, typename Encode, typename Storage, typename Contex
 class function;
 
 namespace impl {
+template<typename DataSchema, typename Encode, typename Storage>
+struct FuncReturnTypeHelper {
+	using Type = data<DataSchema,Encode,Storage>;
+};
+
+template<typename Encode, typename Storage>
+struct FuncReturnTypeHelper<schema::Void, Encode, Storage> {
+	using Type = void;
+};
+
 template<typename Request, typename Response, typename Encode, typename Storage, typename Ctx>
 struct FuncTypeHelper {
-	using Type = std::function<data<Response, Encode, Storage>(data<Request, Encode, Storage>&, Ctx)>;
+	using Type = std::function<error_or<typename FuncReturnTypeHelper<Response,Encode,Storage>::Type>(data<Request, Encode, Storage>&, Ctx)>;
 };
 
 template<typename Request, typename Response, typename Encode, typename Storage>
 struct FuncTypeHelper<Request, Response, Encode, Storage, void_t> {
-	using Type = std::function<data<Response, Encode, Storage>(data<Request, Encode, Storage>&)>;
+	using Type = std::function<error_or<typename FuncReturnTypeHelper<Response, Encode, Storage>::Type>(data<Request, Encode, Storage>&)>;
 };
+
 }
 
 template<typename Request, typename Response, typename Encode, typename Storage, typename Context>
 class function<schema::Function<Request, Response>, Encode, Storage, Context> {
 private:
 	typename impl::FuncTypeHelper<Request, Response, Encode, Storage, Context>::Type func_;
+	using ResponseDataType = typename impl::FuncReturnTypeHelper<Response, Encode, Storage>::Type;
 public:
 	template<typename Func>
 		function(Func func):
 				func_{std::move(func)}
 		{}
 
-		error_or<data<Response, Encode, Storage>> call(data<Request, Encode, Storage>& req, Context ctx = {}){
+		error_or<ResponseDataType> call(data<Request, Encode, Storage>& req, Context ctx = {}){
 			if constexpr (std::is_same_v<Context, void_t>){
 				(void) ctx;
 				return func_(req);
@@ -84,13 +96,13 @@ public:
 
 		template<string_literal Lit>
 		error_or<
-			data<
+			typename impl::FuncReturnTypeHelper<
 				typename parameter_pack_type<
 						parameter_key_pack_index<
 								Lit, Names...
 						>::value
 				, Responses...>::type
-		, Encode, Storage>> call(
+		, Encode, Storage>::Type > call(
 						data<
 								typename parameter_pack_type<
 										parameter_key_pack_index<
diff --git a/modules/codec/c++/schema.hpp b/modules/codec/c++/schema.hpp
index 2ef7c77..6a69425 100644
--- a/modules/codec/c++/schema.hpp
+++ b/modules/codec/c++/schema.hpp
@@ -11,6 +11,12 @@ template <class T> struct is_primitive {
 
 namespace schema {
 // NOLINTBEGIN
+
+/**
+ * Void Type used for function schemas
+ */
+struct Void {};
+
 template <typename T, string_literal Literal> struct Member {
 	static constexpr string_literal name = "Member";
 
diff --git a/modules/codec/tests/codec.cpp b/modules/codec/tests/codec.cpp
index 720b734..1bec214 100644
--- a/modules/codec/tests/codec.cpp
+++ b/modules/codec/tests/codec.cpp
@@ -40,12 +40,15 @@ using TestInt32Pair = Tuple<
 	Int32
 >;
 
+using TestVoidReturnFunction = Function<Int32, Void>;
+
 using TestCalcFunction = Function<TestInt32Pair, Int32>;
 
 using TestInterface = Interface<
 	Member<TestCalcFunction, "add">,
 	Member<TestCalcFunction, "sub">,
-	Member<TestCalcFunction, "multiply">
+	Member<TestCalcFunction, "multiply">,
+	Member<TestVoidReturnFunction, "void">
 >;
 }
 SAW_TEST("One Dimensional Array") {
@@ -378,7 +381,7 @@ SAW_TEST("Interface basics"){
 	data<schema::TestInt32Pair, encode::Native, storage::Default> native;
 
 	auto func_add = 
-		[](data<schema::TestInt32Pair, encode::Native, storage::Default> req){
+		[](data<schema::TestInt32Pair, encode::Native, storage::Default>& req){
 				data<schema::Int32, encode::Native, storage::Default> resp;
 
 				resp.set(req.get<0>().get() + req.get<1>().get());
@@ -386,14 +389,14 @@ SAW_TEST("Interface basics"){
 				return resp;
 		};
 	auto func_sub = 
-		[](data<schema::TestInt32Pair, encode::Native, storage::Default> req){
+		[](data<schema::TestInt32Pair, encode::Native, storage::Default>& req){
 				data<schema::Int32, encode::Native, storage::Default> resp;
 
 				resp.set(req.get<0>().get() - req.get<1>().get());
 
 				return resp;
 		};
-	auto func_multiply = [](data<schema::TestInt32Pair, encode::Native, storage::Default> req){
+	auto func_multiply = [](data<schema::TestInt32Pair, encode::Native, storage::Default>& req){
 				data<schema::Int32, encode::Native, storage::Default> resp;
 
 				resp.set(req.get<0>().get() * req.get<1>().get());
@@ -401,7 +404,12 @@ SAW_TEST("Interface basics"){
 				return resp;
 		};
 
-	auto iface = interface_factory<schema::TestInterface, encode::Native, storage::Default>::create(std::move(func_add), std::move(func_sub), std::move(func_multiply));
+	auto func_void = [](data<schema::Int32>& req) -> error_or<void> {
+		(void) req;
+		return void_t{};
+	};
+
+	auto iface = interface_factory<schema::TestInterface, encode::Native, storage::Default>::create(std::move(func_add), std::move(func_sub), std::move(func_multiply), std::move(func_void));
 
     {
 			data<schema::TestInt32Pair, encode::Native, storage::Default> native;