From ef0fc90cd007d613be6c268cc6adbecc8d7a0a8f Mon Sep 17 00:00:00 2001 From: cremno Date: Tue, 2 Jun 2015 08:56:41 +0200 Subject: remove unnecessary mrb_immediate_p() `!mrb_array_p(ary2)` and `mrb_type(obj) != MRB_TT_DATA` are sufficient. --- src/etc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/etc.c') diff --git a/src/etc.c b/src/etc.c index 635052b67..a8a21e740 100644 --- a/src/etc.c +++ b/src/etc.c @@ -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) { -- cgit v1.2.3 From 96c948d812f06c1ad1024f6db5089e47dbd58d23 Mon Sep 17 00:00:00 2001 From: "go.kikuta" Date: Tue, 11 Aug 2015 18:02:12 +0900 Subject: Remove non-need tmp value --- src/etc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/etc.c') diff --git a/src/etc.c b/src/etc.c index a8a21e740..f5a502795 100644 --- a/src/etc.c +++ b/src/etc.c @@ -67,17 +67,15 @@ mrb_data_get_ptr(mrb_state *mrb, mrb_value obj, const mrb_data_type *type) MRB_API mrb_sym mrb_obj_to_sym(mrb_state *mrb, mrb_value name) { - mrb_value tmp; mrb_sym id; switch (mrb_type(name)) { default: - tmp = mrb_check_string_type(mrb, name); - if (mrb_nil_p(tmp)) { - tmp = mrb_inspect(mrb, name); - mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a symbol", tmp); + name = mrb_check_string_type(mrb, name); + if (mrb_nil_p(name)) { + name = mrb_inspect(mrb, name); + mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a symbol", name); } - name = tmp; /* fall through */ case MRB_TT_STRING: name = mrb_str_intern(mrb, name); -- cgit v1.2.3