Work in progress.

Author: viferga

source/loaders/c_loader/source/c_loader_impl.cpp

@@ -530,6 +530,7 @@ class c_loader_pointer_type : public c_loader_type_impl
 		// TODO: This may be too tricky to implement because it is impossible to reconstruct the pointer from the type
 		// easily, as C does not mantain the true memory layout, pointers can be arrays or single elements and we cannot know
 		// We should review this carefully
+		(void)arg_ptr;
 #if 0
 		CXType type_iterator = cx_type;
 		value prev_value = value_create_ptr(NULL);
@@ -743,7 +744,7 @@ function_return function_c_interface_invoke(function func, function_impl impl, f
 	for (size_t args_count = 0; args_count < args_size; ++args_count)
 	{
 		type t = signature_get_type(s, args_count);
-		type_impl impl_type = type_derived(t);
+		/* type_impl impl_type = type_derived(t); */
 		type_id id = type_index(t);
 		type_id value_id = value_type_id((value)args[args_count]);
 
@@ -769,7 +770,10 @@ function_return function_c_interface_invoke(function func, function_impl impl, f
 
 			closures.push_back(closure);
 		}
+#if 0
 		else if (id == TYPE_STRING || (id == TYPE_PTR && impl_type != nullptr))
+#endif
+		else if (id == TYPE_STRING)
 		{
 			/* String requires to be pointer to a string and
 			Pointer requires to be pointer to pointer */
@@ -832,7 +836,7 @@ function_return function_c_interface_invoke(function func, function_impl impl, f
 	for (size_t args_count = 0; args_count < args_size; ++args_count)
 	{
 		type t = signature_get_type(s, args_count);
-		type_impl impl_type = type_derived(t);
+		/* type_impl impl_type = type_derived(t); */
 		type_id id = type_index(t);
 
 		/* This is very tricky, if the type was a pointer to pointer, if it
@@ -846,21 +850,24 @@ function_return function_c_interface_invoke(function func, function_impl impl, f
 		highly unsafe if we mix types because we will use the type info of the
 		underlaying type in order to recreate it, in this example, a string
 		*/
+#if 0
 		if (id == TYPE_PTR && impl_type != nullptr)
 		{
 			// TODO: This may be too tricky to implement because it is impossible to reconstruct the pointer from the type
 			// easily, as C does not mantain the true memory layout, pointers can be arrays or single elements and we cannot know
 			// We should review this carefully
-#if 0
+	#if 0
 			/* Reconstruct the pointer value from the type info */
 			c_loader_pointer_type *pointer_type = static_cast<c_loader_pointer_type *>(impl_type);
 
 			void *arg_value = pointer_type->to_value(value_to_ptr(c_function->values[args_count]));
-#endif
+	#endif
 
 			value_type_destroy(c_function->values[args_count]);
 		}
-		else if (id == TYPE_STRING)
+		else
+#endif
+		if (id == TYPE_STRING)
 		{
 			/* Clear the pointer to string allocated before */
 			value_type_destroy(c_function->values[args_count]);

source/scripts/c/loadtest/source/loadtest.cpp

@@ -1,4 +1,5 @@
 #include "loadtest.h"
+#include <iostream>
 #include <vector>
 
 long call_cpp_func(void)
@@ -23,6 +24,9 @@ int pair_list_init(pair_list **t)
 		(*t)->pairs[i].d = (double)(((double)i) * 1.0);
 	}
 
+	std::cout << "pair_list_init: " << t << std::endl;
+	std::cout << "pair_list_init: *(" << *t << ")" << std::endl;
+
 	return 0;
 }
 

source/scripts/c/loadtest/source/loadtest.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <cstdint>
+#include <stdint.h>
 
 typedef struct
 {

source/tests/metacall_c_lib_test/source/metacall_c_lib_test.cpp

@@ -51,6 +51,9 @@ TEST_F(metacall_c_lib_test, DefaultConstructor)
 
 	ret = metacallv("pair_list_init", args_init);
 
+	std::cout << "args_init: " << args_init[0] << std::endl;
+	std::cout << "args_init: *(" << pair_list << ")" << std::endl;
+
 	EXPECT_NE((void *)NULL, (void *)ret);
 
 	EXPECT_EQ((enum metacall_value_id)metacall_value_id(ret), (enum metacall_value_id)METACALL_INT);