diff options
| -rw-r--r-- | include/mruby/error.h | 8 | ||||
| -rw-r--r-- | mrbgems/mruby-error/mrbgem.rake | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-error/src/exception.c | 91 | ||||
| -rw-r--r-- | src/vm.c | 43 |
4 files changed, 82 insertions, 65 deletions
diff --git a/include/mruby/error.h b/include/mruby/error.h index 1d550e415..0d5b93c7c 100644 --- a/include/mruby/error.h +++ b/include/mruby/error.h @@ -132,6 +132,14 @@ MRB_API mrb_value mrb_rescue_exceptions(mrb_state *mrb, mrb_func_t body, mrb_val mrb_func_t rescue, mrb_value r_data, mrb_int len, struct RClass **classes); +typedef mrb_value mrb_protect_raw_func(mrb_state *mrb, void *userdata); + +/** + * This API function behaves like `mrb_protect()`. + * The advantage is that it avoids objectifying the user data. + */ +MRB_API mrb_value mrb_protect_raw(mrb_state *mrb, mrb_protect_raw_func *body, void *userdata, mrb_bool *error); + MRB_END_DECL #endif /* MRUBY_ERROR_H */ diff --git a/mrbgems/mruby-error/mrbgem.rake b/mrbgems/mruby-error/mrbgem.rake index ff7334744..fe9062089 100644 --- a/mrbgems/mruby-error/mrbgem.rake +++ b/mrbgems/mruby-error/mrbgem.rake @@ -2,9 +2,4 @@ MRuby::Gem::Specification.new('mruby-error') do |spec| spec.license = 'MIT' spec.author = 'mruby developers' spec.summary = 'extensional error handling' - - if build.cxx_exception_enabled? - objs << build.compile_as_cxx("#{spec.dir}/src/exception.c") - objs.delete_if { |v| v == objfile("#{spec.build_dir}/src/exception") } - end end diff --git a/mrbgems/mruby-error/src/exception.c b/mrbgems/mruby-error/src/exception.c index e0ea28ac8..cbc4835d8 100644 --- a/mrbgems/mruby-error/src/exception.c +++ b/mrbgems/mruby-error/src/exception.c @@ -1,57 +1,38 @@ #include <mruby.h> -#include <mruby/throw.h> #include <mruby/error.h> +struct protect_data { + mrb_func_t body; + mrb_value data; +}; + +static mrb_value +protect_body(mrb_state *mrb, void *p) +{ + struct protect_data *dp = (struct protect_data*)p; + return dp->body(mrb, dp->data); +} + MRB_API mrb_value mrb_protect(mrb_state *mrb, mrb_func_t body, mrb_value data, mrb_bool *state) { - struct mrb_jmpbuf *prev_jmp = mrb->jmp; - struct mrb_jmpbuf c_jmp; - mrb_value result = mrb_nil_value(); - int ai = mrb_gc_arena_save(mrb); - - if (state) { *state = FALSE; } - - MRB_TRY(&c_jmp) { - mrb->jmp = &c_jmp; - result = body(mrb, data); - mrb->jmp = prev_jmp; - } MRB_CATCH(&c_jmp) { - mrb->jmp = prev_jmp; - result = mrb_obj_value(mrb->exc); - mrb->exc = NULL; - if (state) { *state = TRUE; } - } MRB_END_EXC(&c_jmp); - - mrb_gc_arena_restore(mrb, ai); - mrb_gc_protect(mrb, result); - return result; + struct protect_data protect_data = { body, data }; + return mrb_protect_raw(mrb, protect_body, &protect_data, state); } MRB_API mrb_value mrb_ensure(mrb_state *mrb, mrb_func_t body, mrb_value b_data, mrb_func_t ensure, mrb_value e_data) { - struct mrb_jmpbuf *prev_jmp = mrb->jmp; - struct mrb_jmpbuf c_jmp; - mrb_value result; int ai = mrb_gc_arena_save(mrb); - - MRB_TRY(&c_jmp) { - mrb->jmp = &c_jmp; - result = body(mrb, b_data); - mrb->jmp = prev_jmp; - } MRB_CATCH(&c_jmp) { - mrb->jmp = prev_jmp; - mrb_gc_arena_restore(mrb, ai); - ensure(mrb, e_data); - MRB_THROW(mrb->jmp); /* rethrow catched exceptions */ - } MRB_END_EXC(&c_jmp); - - mrb_gc_arena_restore(mrb, ai); - mrb_gc_protect(mrb, result); + struct protect_data protect_data = { body, b_data }; + mrb_bool error; + mrb_value result = mrb_protect_raw(mrb, protect_body, &protect_data, &error); ensure(mrb, e_data); mrb_gc_arena_restore(mrb, ai); mrb_gc_protect(mrb, result); + if (error) { + mrb_exc_raise(mrb, result); /* rethrow catched exceptions */ + } return result; } @@ -66,36 +47,26 @@ MRB_API mrb_value mrb_rescue_exceptions(mrb_state *mrb, mrb_func_t body, mrb_value b_data, mrb_func_t rescue, mrb_value r_data, mrb_int len, struct RClass **classes) { - struct mrb_jmpbuf *prev_jmp = mrb->jmp; - struct mrb_jmpbuf c_jmp; - mrb_value result; - mrb_bool error_matched = FALSE; - mrb_int i; int ai = mrb_gc_arena_save(mrb); - - MRB_TRY(&c_jmp) { - mrb->jmp = &c_jmp; - result = body(mrb, b_data); - mrb->jmp = prev_jmp; - } MRB_CATCH(&c_jmp) { - mrb->jmp = prev_jmp; - - for (i = 0; i < len; ++i) { - if (mrb_obj_is_kind_of(mrb, mrb_obj_value(mrb->exc), classes[i])) { + struct protect_data protect_data = { body, b_data }; + mrb_bool error; + mrb_value result = mrb_protect_raw(mrb, protect_body, &protect_data, &error); + if (error) { + mrb_bool error_matched = FALSE; + for (mrb_int i = 0; i < len; ++i) { + if (mrb_obj_is_kind_of(mrb, result, classes[i])) { error_matched = TRUE; break; } } - if (!error_matched) { MRB_THROW(mrb->jmp); } + if (!error_matched) { mrb_exc_raise(mrb, result); } mrb->exc = NULL; - mrb_gc_arena_restore(mrb, ai); result = rescue(mrb, r_data); - } MRB_END_EXC(&c_jmp); - - mrb_gc_arena_restore(mrb, ai); - mrb_gc_protect(mrb, result); + mrb_gc_arena_restore(mrb, ai); + mrb_gc_protect(mrb, result); + } return result; } @@ -306,6 +306,49 @@ cipop(mrb_state *mrb) return c->ci; } +MRB_API mrb_value +mrb_protect_raw(mrb_state *mrb, mrb_protect_raw_func *body, void *userdata, mrb_bool *error) +{ + struct mrb_jmpbuf *prev_jmp = mrb->jmp; + struct mrb_jmpbuf c_jmp; + mrb_value result = mrb_nil_value(); + int ai = mrb_gc_arena_save(mrb); + const struct mrb_context *c = mrb->c; + int ci_index = c->ci - c->cibase; + + if (error) { *error = FALSE; } + + MRB_TRY(&c_jmp) { + mrb->jmp = &c_jmp; + result = body(mrb, userdata); + mrb->jmp = prev_jmp; + } + MRB_CATCH(&c_jmp) { + mrb->jmp = prev_jmp; + result = mrb_obj_value(mrb->exc); + mrb->exc = NULL; + if (error) { *error = TRUE; } + if (mrb->c == c) { + while (c->ci - c->cibase > ci_index) { + cipop(mrb); + } + } + else { + // It was probably switched by mrb_fiber_resume(). + // Simply destroy all successive CI_ACC_DIRECTs once the fiber has been switched. + c = mrb->c; + while (c->ci > c->cibase && c->ci->acc == CI_ACC_DIRECT) { + cipop(mrb); + } + } + } + MRB_END_EXC(&c_jmp); + + mrb_gc_arena_restore(mrb, ai); + mrb_gc_protect(mrb, result); + return result; +} + void mrb_exc_set(mrb_state *mrb, mrb_value exc); static mrb_value mrb_run(mrb_state *mrb, const struct RProc* proc, mrb_value self); |