From e0f1b514d2f78fe5ea17ddf240307cafbf47fccf Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 7 Feb 2019 08:14:09 +0000 Subject: enum.c: hosited out enum_hashify git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enum.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'enum.c') diff --git a/enum.c b/enum.c index a739d33..5ba4092 100644 --- a/enum.c +++ b/enum.c @@ -612,6 +612,15 @@ enum_to_a(int argc, VALUE *argv, VALUE obj) } static VALUE +enum_hashify(VALUE obj, int argc, const VALUE *argv, rb_block_call_func *iter) +{ + VALUE hash = rb_hash_new(); + rb_block_call(obj, id_each, argc, argv, iter, hash); + OBJ_INFECT(hash, obj); + return hash; +} + +static VALUE enum_to_h_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) { ENUM_WANT_SVALUE(); @@ -647,11 +656,8 @@ enum_to_h_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) static VALUE enum_to_h(int argc, VALUE *argv, VALUE obj) { - VALUE hash = rb_hash_new(); rb_block_call_func *iter = rb_block_given_p() ? enum_to_h_ii : enum_to_h_i; - rb_block_call(obj, id_each, argc, argv, iter, hash); - OBJ_INFECT(hash, obj); - return hash; + return enum_hashify(obj, argc, argv, iter); } static VALUE @@ -924,15 +930,9 @@ group_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) static VALUE enum_group_by(VALUE obj) { - VALUE hash; - RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size); - hash = rb_hash_new(); - rb_block_call(obj, id_each, 0, 0, group_by_i, hash); - OBJ_INFECT(hash, obj); - - return hash; + return enum_hashify(obj, 0, 0, group_by_i); } static VALUE -- cgit v1.1