* gc.c (should_be_callable): extract duplicate code.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-11-09 15:34:30 +00:00
Родитель bcb4075d9a
Коммит 7a330ba230
1 изменённых файлов: 12 добавлений и 7 удалений

19
gc.c
Просмотреть файл

@ -1863,6 +1863,15 @@ rb_undefine_final(VALUE obj)
return obj;
}
static void
should_be_callable(VALUE block)
{
if (!rb_respond_to(block, rb_intern("call"))) {
rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
rb_obj_classname(block));
}
}
/*
* call-seq:
* ObjectSpace.define_finalizer(obj, aProc=proc())
@ -1882,9 +1891,8 @@ define_final(int argc, VALUE *argv, VALUE os)
if (argc == 1) {
block = rb_block_proc();
}
else if (!rb_respond_to(block, rb_intern("call"))) {
rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
rb_obj_classname(block));
else {
should_be_callable(block);
}
return define_final0(obj, block);
@ -1922,10 +1930,7 @@ VALUE
rb_define_final(VALUE obj, VALUE block)
{
rb_check_frozen(obj);
if (!rb_respond_to(block, rb_intern("call"))) {
rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
rb_obj_classname(block));
}
should_be_callable(block);
return define_final0(obj, block);
}