Update tests accorign to the new handle API for duplicated names.

Author: viferga

source/metacall/include/metacall/metacall.h

@@ -384,6 +384,30 @@ METACALL_API void *metacallt(const char *name, const enum metacall_value_id ids[
 */
 METACALL_API void *metacallt_s(const char *name, const enum metacall_value_id ids[], size_t size, ...);
 
+/**
+*  @brief
+*    Call a function anonymously by type array @ids and variable arguments @va_args
+*
+*  @param[in] handle
+*    Pointer to the handle returned by metacall_load_from_{file, memory, package}
+*
+*  @param[in] name
+*    Name of the function
+*
+*  @param[in] ids
+*    Array of types refered to @va_args
+*
+*  @param[in] size
+*    Number of elements of the call
+*
+*  @param[in] va_args
+*    Varidic function parameters
+*
+*  @return
+*    Pointer to value containing the result of the call
+*/
+METACALL_API void *metacallht_s(void *handle, const char *name, const enum metacall_value_id ids[], size_t size, ...);
+
 /**
 *  @brief
 *    Get the function by @name

source/metacall/source/metacall.c

@@ -624,6 +624,104 @@ void *metacallt_s(const char *name, const enum metacall_value_id ids[], size_t s
 	return NULL;
 }
 
+void *metacallht_s(void *handle, const char *name, const enum metacall_value_id ids[], size_t size, ...)
+{
+	value f_val = loader_handle_get(handle, name);
+	function f = NULL;
+
+	if (value_type_id(f_val) == TYPE_FUNCTION)
+	{
+		f = value_to_function(f_val);
+	}
+
+	if (f != NULL)
+	{
+		void *args[METACALL_ARGS_SIZE];
+
+		value ret = NULL;
+
+		signature s = function_signature(f);
+
+		size_t iterator;
+
+		va_list va;
+
+		va_start(va, size);
+
+		for (iterator = 0; iterator < size; ++iterator)
+		{
+			type t = signature_get_type(s, iterator);
+
+			type_id id = type_index(t);
+
+			if (t != NULL)
+			{
+				id = type_index(t);
+			}
+			else
+			{
+				id = ids[iterator];
+			}
+
+			if (id == TYPE_BOOL)
+			{
+				args[iterator] = value_create_bool((boolean)va_arg(va, unsigned int));
+			}
+			if (id == TYPE_CHAR)
+			{
+				args[iterator] = value_create_char((char)va_arg(va, int));
+			}
+			else if (id == TYPE_SHORT)
+			{
+				args[iterator] = value_create_short((short)va_arg(va, int));
+			}
+			else if (id == TYPE_INT)
+			{
+				args[iterator] = value_create_int(va_arg(va, int));
+			}
+			else if (id == TYPE_LONG)
+			{
+				args[iterator] = value_create_long(va_arg(va, long));
+			}
+			else if (id == TYPE_FLOAT)
+			{
+				args[iterator] = value_create_float((float)va_arg(va, double));
+			}
+			else if (id == TYPE_DOUBLE)
+			{
+				args[iterator] = value_create_double(va_arg(va, double));
+			}
+			else if (id == TYPE_STRING)
+			{
+				const char *str = va_arg(va, const char *);
+
+				args[iterator] = value_create_string(str, strlen(str));
+			}
+			else if (id == TYPE_PTR)
+			{
+				args[iterator] = value_create_ptr(va_arg(va, const void *));
+			}
+			else
+			{
+				args[iterator] = NULL;
+			}
+		}
+
+		va_end(va);
+
+		ret = function_call(f, args, size);
+
+		for (iterator = 0; iterator < size; ++iterator)
+		{
+			value_destroy(args[iterator]);
+		}
+
+		return ret;
+	}
+
+	return NULL;
+}
+
 void *metacall_function(const char *name)
 {
 	value f_val = loader_get(name);

source/scripts/python/s1/source/s1.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python3
 
-def fn_in_s1():
+def shared_in_s1_and_s2():
 	return 'Hello from s1'
-
-# TODO:
-# def shared_in_s1_and_s2():
-# 	return 'Hello from s1'

source/scripts/python/s2/source/s2.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python3
 
-def fn_in_s2():
+def shared_in_s1_and_s2():
 	return 'Hello from s2'
-
-# TODO:
-# def shared_in_s1_and_s2():
-# 	return 'Hello from s2'

source/tests/metacall_clear_test/source/metacall_clear_test.cpp

@@ -50,14 +50,26 @@ TEST_F(metacall_clear_test, DefaultConstructor)
 
 		ASSERT_EQ((int)0, (int)metacall_load_from_memory(tag, buffer, sizeof(buffer), &handle));
 
-		void *ret = metacall("multmem", 5, 15);
+		void *args[2] = {
+			metacall_value_create_long(5),
+			metacall_value_create_long(15)
+		};
+
+		void *ret = metacallhv(handle, "multmem", args);
 
 		EXPECT_NE((void *)NULL, (void *)ret);
 
 		EXPECT_EQ((long)75, (long)metacall_value_to_long(ret));
 
 		metacall_value_destroy(ret);
 
+		metacall_value_destroy(args[0]);
+		metacall_value_destroy(args[1]);
+
+		EXPECT_EQ((void *)NULL, (void *)metacall_function("multmem"));
+
+		EXPECT_NE((void *)NULL, (void *)metacall_handle_function(handle, "multmem"));
+
 		EXPECT_EQ((int)0, (int)metacall_clear(handle));
 
 		EXPECT_EQ((void *)NULL, (void *)metacall_function("multmem"));

source/tests/metacall_handle_get_test/source/metacall_handle_get_test.cpp

@@ -59,7 +59,7 @@ TEST_F(metacall_handle_get_test, DefaultConstructor)
 			METACALL_DOUBLE, METACALL_DOUBLE
 		};
 
-		void *ret = metacallt("call_test", double_ids, 10.0, 2.0);
+		void *ret = metacallht_s(handle, "call_test", double_ids, 2, 10.0, 2.0);
 
 		EXPECT_NE((void *)NULL, (void *)ret);
 
@@ -103,11 +103,11 @@ TEST_F(metacall_handle_get_test, DefaultConstructor)
 
 		ASSERT_NE((void *)NULL, (void *)handle);
 
-		void *func = metacall_handle_function(handle, "fn_in_s1" /* TODO: shared_in_s1_and_s2 */);
+		void *func = metacall_handle_function(handle, "shared_in_s1_and_s2");
 
 		ASSERT_NE((void *)NULL, (void *)func);
 
-		void *ret = metacallhv_s(handle, "fn_in_s1" /* TODO: shared_in_s1_and_s2 */, metacall_null_args, 0);
+		void *ret = metacallhv_s(handle, "shared_in_s1_and_s2", metacall_null_args, 0);
 
 		EXPECT_NE((void *)NULL, (void *)ret);
 
@@ -123,11 +123,11 @@ TEST_F(metacall_handle_get_test, DefaultConstructor)
 
 		ASSERT_NE((void *)NULL, (void *)handle);
 
-		func = metacall_handle_function(handle, "fn_in_s2" /* TODO: shared_in_s1_and_s2 */);
+		func = metacall_handle_function(handle, "shared_in_s1_and_s2");
 
 		ASSERT_NE((void *)NULL, (void *)func);
 
-		ret = metacallhv_s(handle, "fn_in_s2" /* TODO: shared_in_s1_and_s2 */, metacall_null_args, 0);
+		ret = metacallhv_s(handle, "shared_in_s1_and_s2", metacall_null_args, 0);
 
 		EXPECT_NE((void *)NULL, (void *)ret);
 

source/tests/metacall_rpc_test/source/metacall_rpc_test.cpp

@@ -75,7 +75,7 @@ TEST_F(metacall_rpc_test, DefaultConstructor)
 			METACALL_FLOAT, METACALL_FLOAT
 		};
 
-		void *ret = metacallt("divide", divide_ids, 50.0f, 10.0f);
+		void *ret = metacallht_s(handle, "divide", divide_ids, 2, 50.0f, 10.0f);
 
 		EXPECT_NE((void *)NULL, (void *)ret);