admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-eval: use functions from mruby-binding to simplify the code

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-03-25 19:12:46 +09:00
parent 11af5db1c3
commit 0bbfec3e8b
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-eval/src/eval.c
+4 -9
View File
@@ -10,6 +10,7 @@
#include <mruby/internal.h>
/* provided by mruby-binding */
mrb_bool mrb_binding_p(mrb_state *mrb, mrb_value binding);
const struct RProc * mrb_binding_extract_proc(mrb_state *mrb, mrb_value binding);
struct REnv * mrb_binding_extract_env(mrb_state *mrb, mrb_value binding);
@@ -30,22 +31,16 @@ create_proc_from_string(mrb_state *mrb, const char *s, mrb_int len, mrb_value bi
struct mrb_context *c = mrb->c;
if (!mrb_nil_p(binding)) {
mrb_value scope_obj;
if (!mrb_class_defined_id(mrb, MRB_SYM(Binding))
|| !mrb_obj_is_kind_of(mrb, binding, mrb_class_get_id(mrb, MRB_SYM(Binding)))) {
if (!mrb_binding_p(mrb, binding)) {
mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %C (expected binding)",
mrb_obj_class(mrb, binding));
}
scope_obj = mrb_iv_get(mrb, binding, MRB_SYM(proc));
mrb_check_type(mrb, scope_obj, MRB_TT_PROC);
scope = mrb_proc_ptr(scope_obj);
scope = mrb_binding_extract_proc(mrb, binding);
if (MRB_PROC_CFUNC_P(scope)) {
e = NULL;
}
else {
mrb_value env = mrb_iv_get(mrb, binding, MRB_SYM(env));
mrb_check_type(mrb, env, MRB_TT_ENV);
e = (struct REnv *)mrb_obj_ptr(env);
e = mrb_binding_extract_env(mrb, binding);
mrb_assert(e != NULL);
}
}