diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-11 22:57:52 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-11-11 22:57:52 +0900 |
| commit | feb9b3debd1ce75795e8eaf31641f2a485ec3e33 (patch) | |
| tree | c89e05a9e867222fb8dda2a57af10810893cafe5 /src/class.c | |
| parent | 752ca514f6e3d9435a8af345fa2481e733a5ddca (diff) | |
| parent | efe4f30b3982e8ff85a9142933955d6fa0bdebc7 (diff) | |
| download | mruby-feb9b3debd1ce75795e8eaf31641f2a485ec3e33.tar.gz mruby-feb9b3debd1ce75795e8eaf31641f2a485ec3e33.zip | |
Merge pull request #3224 from ksss/define_method
Module#define_method supports proc argument
Diffstat (limited to 'src/class.c')
| -rw-r--r-- | src/class.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/class.c b/src/class.c index b81859ab8..7097a593a 100644 --- a/src/class.c +++ b/src/class.c @@ -1783,9 +1783,21 @@ mod_define_method(mrb_state *mrb, mrb_value self) struct RClass *c = mrb_class_ptr(self); struct RProc *p; mrb_sym mid; + mrb_value proc = mrb_undef_value(); mrb_value blk; - mrb_get_args(mrb, "n&", &mid, &blk); + mrb_get_args(mrb, "n|o&", &mid, &proc, &blk); + switch (mrb_type(proc)) { + case MRB_TT_PROC: + blk = proc; + break; + case MRB_TT_UNDEF: + /* ignored */ + break; + default: + mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %S (expected Proc)", mrb_obj_value(mrb_obj_class(mrb, proc))); + break; + } if (mrb_nil_p(blk)) { mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given"); } |