Solve issues on ruby port and loader.

Author: viferga

source/loaders/rb_loader/source/rb_loader_impl.c

@@ -1252,17 +1252,13 @@ loader_handle rb_loader_impl_load_from_file(loader_impl impl, const loader_path
 			goto load_error;
 		}
 
-		if (result == Qnil)
+		/* Define module name */
 		{
 			loader_path name;
 			size_t size = portability_path_get_name(paths[0], strnlen(paths[0], LOADER_PATH_SIZE), name, LOADER_PATH_SIZE);
 
 			module_name = rb_str_new(name, size);
 		}
-		else
-		{
-			module_name = rb_funcall(result, rb_intern("name"), 0);
-		}
 
 		rb_module = rb_loader_impl_create_module(module_name, result, module_data, result);
 

source/loaders/rb_loader/source/rb_loader_port.c

@@ -175,7 +175,7 @@ VALUE rb_loader_port_metacall(int argc, VALUE *argv, VALUE self)
 	/* Convert the arguments into MetaCall values */
 	for (iterator = 0; iterator < args_size; ++iterator)
 	{
-		(void)rb_type_deserialize(rb_loader_impl, argv[iterator], &args[iterator]);
+		(void)rb_type_deserialize(rb_loader_impl, argv[iterator + 1], &args[iterator]);
 	}
 
 	/* Execute the call */
@@ -195,6 +195,43 @@ VALUE rb_loader_port_metacall(int argc, VALUE *argv, VALUE self)
 	return rb_type_serialize(result);
 }
 
+VALUE rb_loader_port_inspect(VALUE self)
+{
+	VALUE result;
+	size_t size = 0;
+	char *result_str = NULL, *inspect_str = NULL;
+	struct metacall_allocator_std_type std_ctx = { &malloc, &realloc, &free };
+
+	/* Create the allocator */
+	void *allocator = metacall_allocator_create(METACALL_ALLOCATOR_STD, (void *)&std_ctx);
+
+	(void)self;
+
+	/* Retrieve inspect data */
+	result_str = inspect_str = metacall_inspect(&size, allocator);
+
+	if (inspect_str == NULL || size == 0)
+	{
+		static const char empty[] = "{}";
+
+		result_str = (char *)empty;
+		size = sizeof(empty);
+
+		rb_raise(rb_eArgError, "Inspect returned an invalid size or string");
+	}
+
+	result = rb_str_new(result_str, size - 1);
+
+	if (inspect_str != NULL && size > 0)
+	{
+		metacall_allocator_free(allocator, inspect_str);
+	}
+
+	metacall_allocator_destroy(allocator);
+
+	return result;
+}
+
 int rb_loader_port_initialize(loader_impl impl)
 {
 	VALUE rb_loader_port;
@@ -213,6 +250,7 @@ int rb_loader_port_initialize(loader_impl impl)
 	rb_define_module_function(rb_loader_port, "metacall_load_from_file", rb_loader_port_load_from_file, 2);
 	rb_define_module_function(rb_loader_port, "metacall_load_from_memory", rb_loader_port_load_from_memory, 2);
 	rb_define_module_function(rb_loader_port, "metacall", rb_loader_port_metacall, -1);
+	rb_define_module_function(rb_loader_port, "metacall_inspect", rb_loader_port_inspect, 0);
 
 	rb_loader_impl = impl;
 

source/ports/rb_port/package/lib/metacall.rb

@@ -105,24 +105,25 @@ def metacall_module_load
 		end
 	end
 
+	# Initialize the MetaCall Ruby Port
+	metacall_module_load
+
 	public
 
 	def metacall_load_from_file(tag, paths)
-		metacall_module_load
-
 		MetaCallRbLoaderPort.metacall_load_from_file(tag, paths)
 	end
 
 	def metacall_load_from_memory(tag, script)
-		metacall_module_load
-
 		MetaCallRbLoaderPort.metacall_load_from_memory(tag, script)
 	end
 
 	def metacall(function_name, *args)
-		metacall_module_load
-
 		MetaCallRbLoaderPort.metacall(function_name, *args)
 	end
 
+	def metacall_inspect()
+		MetaCallRbLoaderPort.metacall_inspect()
+	end
+
 end

source/ports/rb_port/test/run.rb

@@ -7,19 +7,19 @@ class RbPortTest < Test::Unit::TestCase
 
 	# MetaCall (Python from memory)
 	def test_python_memory
-		script = '#!/usr/bin/env python3\n' \
-			'def inline_multiply_mem(left: int, right: int) -> int:\n' \
-			'	return left * right;\n'
-			'def inline_hello(left: int, right: int) -> int:\n' \
-			'	print(\'Helloo\', left, \' \', right);\n'
-			'	return;\n'
+		script = <<~SCRIPT
+def inline_multiply_mem(left: int, right: int) -> int:
+	return left * right
+def inline_hello(left: int, right: int) -> int:
+	print('Helloo', left, ' ', right)
+	return left * right
+SCRIPT
 
-		assert_equal(0, MetaCall.metacall_load_from_memory('py', script))
+		assert_equal(0, MetaCall::metacall_load_from_memory('py', script))
 
-		# TODO
-		# assert_equal(4, MetaCall::metacall('inline_multiply_mem', 2, 2))
+		assert_equal(4, MetaCall::metacall('inline_multiply_mem', 2, 2))
 
-		assert_equal(nil, MetaCall::metacall('inline_hello', 10, 20))
+		assert_equal(200, MetaCall::metacall('inline_hello', 10, 20))
 	end
 
 	# MetaCall (Python)
@@ -28,8 +28,7 @@ def test_python
 
 		assert_equal(nil, MetaCall::metacall('hello'))
 
-		# TODO
-		# assert_equal(35, MetaCall::metacall('multiply', 5, 7))
+		assert_equal(35, MetaCall::metacall('multiply', 5, 7))
 	end
 
 	# MetaCall (Ruby)
@@ -38,11 +37,9 @@ def test_ruby
 
 		assert_equal(nil, MetaCall::metacall('say_null'))
 
-		# TODO
-		# assert_equal(12, MetaCall::metacall('say_multiply', 3, 4))
+		assert_equal(12, MetaCall::metacall('say_multiply', 3, 4))
 
-		# TODO
-		# assert_equal('Hello world!', MetaCall::metacall('say_hello', 'world'))
+		assert_equal('Hello world!', MetaCall::metacall('say_hello', 'world'))
 	end
 
 end