first commit
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
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", "#{spec.build_dir}/src/exception.cxx")
|
||||
@objs.delete_if { |v| v == objfile("#{spec.build_dir}/src/exception") }
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,110 @@
|
||||
#include <mruby.h>
|
||||
#include <mruby/throw.h>
|
||||
#include <mruby/error.h>
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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);
|
||||
ensure(mrb, e_data);
|
||||
mrb_gc_arena_restore(mrb, ai);
|
||||
mrb_gc_protect(mrb, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
MRB_API mrb_value
|
||||
mrb_rescue(mrb_state *mrb, mrb_func_t body, mrb_value b_data,
|
||||
mrb_func_t rescue, mrb_value r_data)
|
||||
{
|
||||
return mrb_rescue_exceptions(mrb, body, b_data, rescue, r_data, 1, &mrb->eStandardError_class);
|
||||
}
|
||||
|
||||
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])) {
|
||||
error_matched = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!error_matched) { MRB_THROW(mrb->jmp); }
|
||||
|
||||
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);
|
||||
return result;
|
||||
}
|
||||
|
||||
void
|
||||
mrb_mruby_error_gem_init(mrb_state *mrb)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
mrb_mruby_error_gem_final(mrb_state *mrb)
|
||||
{
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
#include <mruby.h>
|
||||
#include <mruby/error.h>
|
||||
#include <mruby/array.h>
|
||||
|
||||
static mrb_value
|
||||
protect_cb(mrb_state *mrb, mrb_value b)
|
||||
{
|
||||
return mrb_yield_argv(mrb, b, 0, NULL);
|
||||
}
|
||||
|
||||
static mrb_value
|
||||
run_protect(mrb_state *mrb, mrb_value self)
|
||||
{
|
||||
mrb_value b;
|
||||
mrb_value ret[2];
|
||||
mrb_bool state;
|
||||
mrb_get_args(mrb, "&", &b);
|
||||
ret[0] = mrb_protect(mrb, protect_cb, b, &state);
|
||||
ret[1] = mrb_bool_value(state);
|
||||
return mrb_ary_new_from_values(mrb, 2, ret);
|
||||
}
|
||||
|
||||
static mrb_value
|
||||
run_ensure(mrb_state *mrb, mrb_value self)
|
||||
{
|
||||
mrb_value b, e;
|
||||
mrb_get_args(mrb, "oo", &b, &e);
|
||||
return mrb_ensure(mrb, protect_cb, b, protect_cb, e);
|
||||
}
|
||||
|
||||
static mrb_value
|
||||
run_rescue(mrb_state *mrb, mrb_value self)
|
||||
{
|
||||
mrb_value b, r;
|
||||
mrb_get_args(mrb, "oo", &b, &r);
|
||||
return mrb_rescue(mrb, protect_cb, b, protect_cb, r);
|
||||
}
|
||||
|
||||
static mrb_value
|
||||
run_rescue_exceptions(mrb_state *mrb, mrb_value self)
|
||||
{
|
||||
mrb_value b, r;
|
||||
struct RClass *cls[1];
|
||||
mrb_get_args(mrb, "oo", &b, &r);
|
||||
cls[0] = E_TYPE_ERROR;
|
||||
return mrb_rescue_exceptions(mrb, protect_cb, b, protect_cb, r, 1, cls);
|
||||
}
|
||||
|
||||
void
|
||||
mrb_mruby_error_gem_test(mrb_state *mrb)
|
||||
{
|
||||
struct RClass *cls;
|
||||
|
||||
cls = mrb_define_class(mrb, "ExceptionTest", mrb->object_class);
|
||||
mrb_define_module_function(mrb, cls, "mrb_protect", run_protect, MRB_ARGS_NONE() | MRB_ARGS_BLOCK());
|
||||
mrb_define_module_function(mrb, cls, "mrb_ensure", run_ensure, MRB_ARGS_REQ(2));
|
||||
mrb_define_module_function(mrb, cls, "mrb_rescue", run_rescue, MRB_ARGS_REQ(2));
|
||||
mrb_define_module_function(mrb, cls, "mrb_rescue_exceptions", run_rescue_exceptions, MRB_ARGS_REQ(2));
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
assert 'mrb_protect' do
|
||||
# no failure in protect returns [result, false]
|
||||
assert_equal ['test', false] do
|
||||
ExceptionTest.mrb_protect { 'test' }
|
||||
end
|
||||
# failure in protect returns [exception, true]
|
||||
result = ExceptionTest.mrb_protect { raise 'test' }
|
||||
assert_kind_of RuntimeError, result[0]
|
||||
assert_true result[1]
|
||||
end
|
||||
|
||||
assert 'mrb_ensure' do
|
||||
a = false
|
||||
assert_equal 'test' do
|
||||
ExceptionTest.mrb_ensure Proc.new { 'test' }, Proc.new { a = true }
|
||||
end
|
||||
assert_true a
|
||||
|
||||
a = false
|
||||
assert_raise RuntimeError do
|
||||
ExceptionTest.mrb_ensure Proc.new { raise 'test' }, Proc.new { a = true }
|
||||
end
|
||||
assert_true a
|
||||
end
|
||||
|
||||
assert 'mrb_rescue' do
|
||||
assert_equal 'test' do
|
||||
ExceptionTest.mrb_rescue Proc.new { 'test' }, Proc.new {}
|
||||
end
|
||||
|
||||
class CustomExp < Exception
|
||||
end
|
||||
|
||||
assert_raise CustomExp do
|
||||
ExceptionTest.mrb_rescue Proc.new { raise CustomExp.new 'test' }, Proc.new { 'rescue' }
|
||||
end
|
||||
|
||||
assert_equal 'rescue' do
|
||||
ExceptionTest.mrb_rescue Proc.new { raise 'test' }, Proc.new { 'rescue' }
|
||||
end
|
||||
end
|
||||
|
||||
assert 'mrb_rescue_exceptions' do
|
||||
assert_equal 'test' do
|
||||
ExceptionTest.mrb_rescue_exceptions Proc.new { 'test' }, Proc.new {}
|
||||
end
|
||||
|
||||
assert_raise RangeError do
|
||||
ExceptionTest.mrb_rescue_exceptions Proc.new { raise RangeError.new 'test' }, Proc.new { 'rescue' }
|
||||
end
|
||||
|
||||
assert_equal 'rescue' do
|
||||
ExceptionTest.mrb_rescue_exceptions Proc.new { raise TypeError.new 'test' }, Proc.new { 'rescue' }
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user