Skip to content

Unified implementation of BasicObject#instance_eval and Module#module_eval #6579

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
dearblue wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Unified implementation of BasicObject#instance_eval and Module#module_eval #6579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 24 additions & 38 deletions mrbgems/mruby-eval/src/eval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,28 @@ f_eval(mrb_state *mrb, mrb_value self)
return exec_irep(mrb, self, proc);
}

static mrb_value
object_eval(mrb_state *mrb, mrb_value self, mrb_bool class_eval)
{
if (mrb_block_given_p(mrb)) {
mrb_get_args(mrb, "");
return class_eval ? mrb_mod_module_eval(mrb, self) : mrb_obj_instance_eval(mrb, self);
Copy link

@gemini-code-assist gemini-code-assist bot Jul 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The functions mrb_mod_module_eval and mrb_obj_instance_eval are used here but are not declared in any header file. They appear to be internal functions from src/vm.c. This creates an implicit dependency that is fragile and can lead to build or runtime errors if the function signatures change in the future.

To make this dependency explicit and avoid potential compiler warnings or errors, please add forward declarations for these functions at the top of this file, similar to how it's done for functions from mruby-binding.

/* from src/vm.c */
mrb_value mrb_mod_module_eval(mrb_state *mrb, mrb_value mod);
mrb_value mrb_obj_instance_eval(mrb_state *mrb, mrb_value self);

}

const char *s;
mrb_int len;
const char *file = NULL;
mrb_int line = 1;
mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);

struct RClass *c = class_eval ? mrb_class_ptr(self) : mrb_singleton_class_ptr(mrb, self);
struct RProc *proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
MRB_PROC_SET_TARGET_CLASS(proc, c);
mrb_assert(!MRB_PROC_CFUNC_P(proc));
mrb_vm_ci_target_class_set(mrb->c->ci, c);
return exec_irep(mrb, self, proc);
}

/*
* call-seq:
* obj.instance_eval(string, filename = nil, lineno = 1) -> obj
Expand Down Expand Up @@ -327,26 +349,7 @@ f_eval(mrb_state *mrb, mrb_value self)
static mrb_value
f_instance_eval(mrb_state *mrb, mrb_value self)
{
if (!mrb_block_given_p(mrb)) {
const char *s;
mrb_int len;
const char *file = NULL;
mrb_int line = 1;
struct RClass *c;
struct RProc *proc;

mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
c = mrb_singleton_class_ptr(mrb, self);
proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
MRB_PROC_SET_TARGET_CLASS(proc, c);
mrb_assert(!MRB_PROC_CFUNC_P(proc));
mrb_vm_ci_target_class_set(mrb->c->ci, c);
return exec_irep(mrb, self, proc);
}
else {
mrb_get_args(mrb, "");
return mrb_obj_instance_eval(mrb, self);
}
return object_eval(mrb, self, FALSE);
}

/*
Expand All @@ -373,24 +376,7 @@ f_instance_eval(mrb_state *mrb, mrb_value self)
static mrb_value
f_class_eval(mrb_state *mrb, mrb_value self)
{
if (!mrb_block_given_p(mrb)) {
const char *s;
mrb_int len;
const char *file = NULL;
mrb_int line = 1;
struct RProc *proc;

mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
MRB_PROC_SET_TARGET_CLASS(proc, mrb_class_ptr(self));
mrb_assert(!MRB_PROC_CFUNC_P(proc));
mrb_vm_ci_target_class_set(mrb->c->ci, mrb_class_ptr(self));
return exec_irep(mrb, self, proc);
}
else {
mrb_get_args(mrb, "");
return mrb_mod_module_eval(mrb, self);
}
return object_eval(mrb, self, TRUE);
}

/*
Expand Down
Loading