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

exception in instance_eval should not exit mrb_run; fix #2483

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-07-22 07:29:26 +09:00
parent 4cc9e5d8b1
commit 7457da6aa1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-eval/src/eval.c
+5 -3
View File
@@ -175,6 +175,8 @@ f_eval(mrb_state *mrb, mrb_value self)
mrb_value mrb_obj_instance_eval(mrb_state *mrb, mrb_value self);
#define CI_ACC_SKIP -1
static mrb_value
f_instance_eval(mrb_state *mrb, mrb_value self)
{
@@ -190,10 +192,10 @@ f_instance_eval(mrb_state *mrb, mrb_value self)
mrb_int line = 1;
mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
mrb->c->ci->acc = CI_ACC_SKIP;
return mrb_run(mrb, create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line), self);
} else {
mrb_get_args(mrb, "&", &b);
}
else {
return mrb_obj_instance_eval(mrb, self);
}
}