Add new register API for accessing to the function pointer when it is created.

Author: viferga

source/loader/include/loader/loader.h

@@ -60,7 +60,7 @@ LOADER_API void loader_initialize(void);
 
 LOADER_API int loader_is_initialized(const loader_naming_tag tag);
 
-LOADER_API int loader_register(const char * name, loader_register_invoke invoke, type_id return_type, size_t arg_size, type_id args_type_id[]);
+LOADER_API int loader_register(const char * name, loader_register_invoke invoke, function * func, type_id return_type, size_t arg_size, type_id args_type_id[]);
 
 LOADER_API int loader_load_path(const loader_naming_path path);
 

source/loader/source/loader.c

@@ -206,7 +206,7 @@ function_interface loader_register_interface_proxy(void)
 	return &interface;
 }
 
-int loader_register(const char * name, loader_register_invoke invoke, type_id return_type, size_t arg_size, type_id args_type_id[])
+int loader_register(const char * name, loader_register_invoke invoke, function * func, type_id return_type, size_t arg_size, type_id args_type_id[])
 {
 	static const char register_holder_str[] = "__metacall_register__";
 
@@ -247,7 +247,15 @@ int loader_register(const char * name, loader_register_invoke invoke, type_id re
 
 	signature_set_return(s, type_create(return_type, register_holder_str, NULL, NULL));
 
-	scope_define(sp, name, f);
+	if (name != NULL)
+	{
+		scope_define(sp, name, f);
+	}
+
+	if (func != NULL)
+	{
+		*func = f;
+	}
 
 	return 0;
 }

source/metacall/include/metacall/metacall.h

@@ -482,6 +482,9 @@ METACALL_API void * metacallfms(void * func, const char * buffer, size_t size, v
 *  @param[in] invoke
 *    Pointer to function invoke interface (argc, argv, data)
 *
+*  @param[out] func
+*    Will set the pointer to the function if the parameter is not null
+*
 *  @param[in] return_type
 *    Type of return value
 *
@@ -494,7 +497,7 @@ METACALL_API void * metacallfms(void * func, const char * buffer, size_t size, v
 *  @return
 *    Pointer to value containing the result of the call
 */
-METACALL_API int metacall_register(const char * name, void * (*invoke)(size_t, void * [], void *), enum metacall_value_id return_type, size_t size, ...);
+METACALL_API int metacall_register(const char * name, void * (*invoke)(size_t, void * [], void *), void ** func, enum metacall_value_id return_type, size_t size, ...);
 
 /**
 *  @brief

source/metacall/source/metacall.c

@@ -965,7 +965,7 @@ void * metacallfms(void * func, const char * buffer, size_t size, void * allocat
 	return NULL;
 }
 
-int metacall_register(const char * name, void * (*invoke)(size_t, void * [], void *), enum metacall_value_id return_type, size_t size, ...)
+int metacall_register(const char * name, void * (*invoke)(size_t, void * [], void *), void ** func, enum metacall_value_id return_type, size_t size, ...)
 {
 	type_id types[METACALL_ARGS_SIZE];
 
@@ -982,7 +982,7 @@ int metacall_register(const char * name, void * (*invoke)(size_t, void * [], voi
 
 	va_end(va);
 
-	return loader_register(name, (loader_register_invoke)invoke, (type_id)return_type, size, (type_id *)types);
+	return loader_register(name, (loader_register_invoke)invoke, (function *)func, (type_id)return_type, size, (type_id *)types);
 }
 
 void * metacall_await(const char * name, void * args[], void * (*resolve_callback)(void *, void *), void * (*reject_callback)(void *, void *), void * data)

source/tests/metacall_function_test/source/metacall_function_test.cpp

@@ -63,8 +63,8 @@ TEST_F(metacall_function_test, DefaultConstructor)
 	ASSERT_EQ((int) 0, (int) metacall_initialize());
 
 	/* Native register */
-	ASSERT_EQ((int) 0, (int) metacall_register("c_callback", c_callback, METACALL_LONG, 0));
-	ASSERT_EQ((int) 0, (int) metacall_register("c_callback_with_args", c_callback_with_args, METACALL_LONG, 2, METACALL_LONG, METACALL_LONG));
+	ASSERT_EQ((int) 0, (int) metacall_register("c_callback", c_callback, NULL, METACALL_LONG, 0));
+	ASSERT_EQ((int) 0, (int) metacall_register("c_callback_with_args", c_callback_with_args, NULL, METACALL_LONG, 2, METACALL_LONG, METACALL_LONG));
 
 	/* Create function types */
 	void * c_callback_value = metacall_value_create_function(metacall_function("c_callback"));

source/tests/metacall_python_pointer_test/source/metacall_python_pointer_test.cpp

@@ -83,11 +83,11 @@ TEST_F(metacall_python_pointer_test, DefaultConstructor)
 
 	/* Native register */
 	{
-		metacall_register("native_set_value", native_set_value, METACALL_PTR, 2, METACALL_PTR, METACALL_LONG);
+		metacall_register("native_set_value", native_set_value, NULL, METACALL_PTR, 2, METACALL_PTR, METACALL_LONG);
 
 		EXPECT_NE((void *) NULL, (void *) metacall_function("native_set_value"));
 
-		metacall_register("native_get_value", native_get_value, METACALL_ARRAY, 1, METACALL_PTR);
+		metacall_register("native_get_value", native_get_value, NULL, METACALL_ARRAY, 1, METACALL_PTR);
 
 		EXPECT_NE((void *) NULL, (void *) metacall_function("native_get_value"));
 	}

source/tests/metacall_test/source/metacall_test.cpp

@@ -104,7 +104,7 @@ TEST_F(metacall_test, DefaultConstructor)
 
 		int result = 0;
 
-		ASSERT_EQ((int) 0, (int) metacall_register("c_print", c_function, METACALL_INT, 1, METACALL_STRING));
+		ASSERT_EQ((int) 0, (int) metacall_register("c_print", c_function, NULL, METACALL_INT, 1, METACALL_STRING));
 
 		ret = metacall("c_print", "Hello native function!");
 

source/tests/py_loader_port_test/source/py_loader_port_test.cpp

@@ -50,7 +50,7 @@ TEST_F(py_loader_port_test, DefaultConstructor)
 
 	/* Native register */
 	{
-		metacall_register("callback_host", callback_host, METACALL_INT, 1, METACALL_STRING);
+		metacall_register("callback_host", callback_host, NULL, METACALL_INT, 1, METACALL_STRING);
 
 		EXPECT_NE((void *) NULL, (void *) metacall_function("callback_host"));
 	}