diff options
| author | cremno <[email protected]> | 2015-06-02 08:56:41 +0200 |
|---|---|---|
| committer | cremno <[email protected]> | 2015-06-02 08:56:41 +0200 |
| commit | ef0fc90cd007d613be6c268cc6adbecc8d7a0a8f (patch) | |
| tree | 190f6f1f4f7b2bce28515fbed128e9a11247a31c | |
| parent | 2f635f56cb701293c59cc2e4f41b653cae2cb3af (diff) | |
| download | mruby-ef0fc90cd007d613be6c268cc6adbecc8d7a0a8f.tar.gz mruby-ef0fc90cd007d613be6c268cc6adbecc8d7a0a8f.zip | |
remove unnecessary mrb_immediate_p()
`!mrb_array_p(ary2)` and `mrb_type(obj) != MRB_TT_DATA` are sufficient.
| -rw-r--r-- | src/array.c | 2 | ||||
| -rw-r--r-- | src/etc.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/array.c b/src/array.c index 1ca7dd2a4..c97e7a53b 100644 --- a/src/array.c +++ b/src/array.c @@ -1052,7 +1052,6 @@ mrb_ary_eq(mrb_state *mrb, mrb_value ary1) mrb_get_args(mrb, "o", &ary2); if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value(); - if (mrb_immediate_p(ary2)) return mrb_false_value(); if (!mrb_array_p(ary2)) { return mrb_false_value(); } @@ -1068,7 +1067,6 @@ mrb_ary_cmp(mrb_state *mrb, mrb_value ary1) mrb_get_args(mrb, "o", &ary2); if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_fixnum_value(0); - if (mrb_immediate_p(ary2)) return mrb_nil_value(); if (!mrb_array_p(ary2)) { return mrb_nil_value(); } @@ -26,7 +26,7 @@ mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const mrb MRB_API void mrb_data_check_type(mrb_state *mrb, mrb_value obj, const mrb_data_type *type) { - if (mrb_immediate_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) { + if (mrb_type(obj) != MRB_TT_DATA) { mrb_check_type(mrb, obj, MRB_TT_DATA); } if (DATA_TYPE(obj) != type) { @@ -48,7 +48,7 @@ mrb_data_check_type(mrb_state *mrb, mrb_value obj, const mrb_data_type *type) MRB_API void* mrb_data_check_get_ptr(mrb_state *mrb, mrb_value obj, const mrb_data_type *type) { - if (mrb_immediate_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) { + if (mrb_type(obj) != MRB_TT_DATA) { return NULL; } if (DATA_TYPE(obj) != type) { |