diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-09-27 00:00:03 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-27 00:00:03 +0900 |
| commit | 5cd6ed4511a0d8d5a19a0cd2beb4cdd97dc3eff5 (patch) | |
| tree | aed35130caaefda715f3db749a506f0bb0787090 /mrbgems/mruby-method | |
| parent | d4be545d54ad53e282637f66ef5b770b9effa918 (diff) | |
| parent | feaf80d8996340bd0316fda72418b1abd774bd59 (diff) | |
| download | mruby-5cd6ed4511a0d8d5a19a0cd2beb4cdd97dc3eff5.tar.gz mruby-5cd6ed4511a0d8d5a19a0cd2beb4cdd97dc3eff5.zip | |
Merge pull request #4733 from shuujii/use-type-predicate-macros-instead-of-mrb_type-if-possible
Use type predicate macros instead of `mrb_type` if possible
Diffstat (limited to 'mrbgems/mruby-method')
| -rw-r--r-- | mrbgems/mruby-method/src/method.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mrbgems/mruby-method/src/method.c b/mrbgems/mruby-method/src/method.c index d95ca1664..1557e60ca 100644 --- a/mrbgems/mruby-method/src/method.c +++ b/mrbgems/mruby-method/src/method.c @@ -14,10 +14,10 @@ method_object_alloc(mrb_state *mrb, struct RClass *mclass) static void bind_check(mrb_state *mrb, mrb_value recv, mrb_value owner) { - if (mrb_type(owner) != MRB_TT_MODULE && + if (!mrb_module_p(owner) && mrb_class_ptr(owner) != mrb_obj_class(mrb, recv) && !mrb_obj_is_kind_of(mrb, recv, mrb_class_ptr(owner))) { - if (mrb_type(owner) == MRB_TT_SCLASS) { + if (mrb_sclass_p(owner)) { mrb_raise(mrb, E_TYPE_ERROR, "singleton method called for a different object"); } else { mrb_raisef(mrb, E_TYPE_ERROR, "bind argument must be an instance of %v", owner); |