summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--enum.c22
1 files changed, 11 insertions, 11 deletions
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