Skip to content

Migrate value-returning error sites to metacall_error_throw #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ROKUMATE wants to merge 4 commits into
base: develop
Choose a base branch
from
+21 −55
Open

Migrate value-returning error sites to metacall_error_throw #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf29fc7
use metacall_error_throw on invalid handle in 5 metacall.c entrypoints
ROKUMATE Jun 10, 2026
e1161c2
use metacall_error_throw for method-not-implemented errors in metacall.c
ROKUMATE Jun 10, 2026
b33c927
use metacall_error_throw for invalid-arg errors in metacall.c entrypo…
ROKUMATE Jun 10, 2026
55ca874
use metacall_error_throw for member-access errors in rb_loader
ROKUMATE Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions source/loaders/rb_loader/source/rb_loader_impl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include <loader/loader.h>
#include <loader/loader_impl.h>

#include <metacall/metacall_error.h>

#include <portability/portability_path.h>

#include <reflect/reflect_context.h>
Expand Down Expand Up @@ -593,11 +595,9 @@ value rb_object_interface_get(object obj, object_impl impl, struct accessor_type

if (exception != Qnil)
{
log_write("metacall", LOG_LEVEL_ERROR, "Error getting object '%s' member '%s'", object_name(obj), key);

rb_set_errinfo(Qnil);

return NULL;
return metacall_error_throw("rb_loader", -1, NULL, "Error getting object '%s' member '%s'", object_name(obj), key);
}

value result = NULL;
Expand Down Expand Up @@ -772,11 +772,9 @@ value rb_class_interface_static_get(klass cls, class_impl impl, struct accessor_

if (exception != Qnil)
{
log_write("metacall", LOG_LEVEL_ERROR, "Error getting class '%s' member '%s'", class_name(cls), attr_name);

rb_set_errinfo(Qnil);

return NULL;
return metacall_error_throw("rb_loader", -1, NULL, "Error getting class '%s' member '%s'", class_name(cls), attr_name);
}

value result = NULL;
Expand Down
66 changes: 17 additions & 49 deletions source/metacall/source/metacall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,9 +563,7 @@ void *metacallhv(void *handle, const char *name, void *args[])
{
if (loader_impl_handle_validate(handle) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Handle %p passed to metacallhv is not valid", handle);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Handle %p passed to metacallhv is not valid", handle);
}

value f_val = loader_handle_get(handle, name);
Expand All @@ -583,9 +581,7 @@ void *metacallhv_s(void *handle, const char *name, void *args[], size_t size)
{
if (loader_impl_handle_validate(handle) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Handle %p passed to metacallhv_s is not valid", handle);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Handle %p passed to metacallhv_s is not valid", handle);
}

value f_val = loader_handle_get(handle, name);
Expand Down Expand Up @@ -908,9 +904,7 @@ void *metacallht_s(void *handle, const char *name, const enum metacall_value_id
{
if (loader_impl_handle_validate(handle) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Handle %p passed to metacallht_s is not valid", handle);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Handle %p passed to metacallht_s is not valid", handle);
}

value f_val = loader_handle_get(handle, name);
Expand Down Expand Up @@ -1047,9 +1041,7 @@ void *metacall_handle_function(void *handle, const char *name)
{
if (loader_impl_handle_validate(handle) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Handle %p passed to metacall_handle_function is not valid", handle);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Handle %p passed to metacall_handle_function is not valid", handle);
}

value f_val = loader_handle_get(handle, name);
Expand Down Expand Up @@ -1147,9 +1139,7 @@ void *metacall_handle_export(void *handle)
{
if (loader_impl_handle_validate(handle) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Handle %p passed to metacall_handle_export is not valid", handle);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Handle %p passed to metacall_handle_export is not valid", handle);
}

return loader_handle_export(handle);
Expand Down Expand Up @@ -1185,9 +1175,7 @@ void *metacallfv_s(void *func, void *args[], size_t size)
{
if (value_validate(args[iterator]) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Invalid argument at position %" PRIuS " when calling to metacallfv_s", iterator);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Invalid argument at position %" PRIuS " when calling to metacallfv_s", iterator);
}

type t = signature_get_type(s, iterator);
Expand Down Expand Up @@ -1438,16 +1426,12 @@ void *metacallfmv(void *func, void *keys[], void *values[])
{
if (value_validate(keys[iterator]) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Invalid key at position %" PRIuS " when calling to metacallfmv", iterator);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Invalid key at position %" PRIuS " when calling to metacallfmv", iterator);
}

if (value_validate(values[iterator]) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Invalid value at position %" PRIuS " when calling to metacallfmv", iterator);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Invalid value at position %" PRIuS " when calling to metacallfmv", iterator);
}

type_id key_id = value_type_id((value)keys[iterator]);
Expand Down Expand Up @@ -1781,16 +1765,12 @@ void *metacallfmv_await_s(void *func, void *keys[], void *values[], size_t size,
{
if (value_validate(keys[iterator]) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Invalid key at position %" PRIuS " when calling to metacallfmv_await_s", iterator);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Invalid key at position %" PRIuS " when calling to metacallfmv_await_s", iterator);
}

if (value_validate(values[iterator]) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Invalid value at position %" PRIuS " when calling to metacallfmv_await_s", iterator);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Invalid value at position %" PRIuS " when calling to metacallfmv_await_s", iterator);
}

type_id key_id = value_type_id((value)keys[iterator]);
Expand Down Expand Up @@ -2153,35 +2133,27 @@ void *metacallv_method(void *target, const char *name, method_invoke_ptr call, v
{
if (v == NULL)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Method %s in %p is not implemented (bad allocation)", name, target);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Method %s in %p is not implemented (bad allocation)", name, target);
}

if (vector_size(v) == 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Method %s in %p is not implemented", name, target);
vector_destroy(v);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Method %s in %p is not implemented", name, target);
}

if (vector_size(v) > 1)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Method %s in %p is overloaded, you should use 'metacallt_class' instead for disambiguate the call", name, target);
vector_destroy(v);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Method %s in %p is overloaded, you should use 'metacallt_class' instead for disambiguate the call", name, target);
}

method m = vector_at_type(v, 0, method);

if (m == NULL)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Method %s in %p is invalid (NULL)", name, target);
vector_destroy(v);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Method %s in %p is invalid (NULL)", name, target);
}

signature s = method_signature(m);
Expand All @@ -2191,10 +2163,8 @@ void *metacallv_method(void *target, const char *name, method_invoke_ptr call, v
{
if (value_validate(args[iterator]) != 0)
{
// TODO: Implement type error return a value
log_write("metacall", LOG_LEVEL_ERROR, "Invalid argument at position %" PRIuS " when calling to metacallv_method", iterator);
vector_destroy(v);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Invalid argument at position %" PRIuS " when calling to metacallv_method", iterator);
}

type t = signature_get_type(s, iterator);
Expand Down Expand Up @@ -2277,8 +2247,7 @@ void *metacallt_class(void *cls, const char *name, const enum metacall_value_id

if (m == NULL)
{
log_write("metacall", LOG_LEVEL_ERROR, "Method %s in class <%p> is not implemented with the parameter types being received", name, cls);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Method %s in class <%p> is not implemented with the parameter types being received", name, cls);
}

return class_static_call(cls, m, args, size);
Expand Down Expand Up @@ -2315,8 +2284,7 @@ void *metacallt_object(void *obj, const char *name, const enum metacall_value_id

if (m == NULL)
{
log_write("metacall", LOG_LEVEL_ERROR, "Method %s in object <%p> is not implemented with the parameter types being received", name, obj);
return NULL;
return metacall_error_throw("metacall", -1, NULL, "Method %s in object <%p> is not implemented with the parameter types being received", name, obj);
}

return object_call(obj, m, args, size);
Expand Down