summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hash.c46
-rw-r--r--internal.h1
-rw-r--r--struct.c17
-rw-r--r--vm_eval.c12
4 files changed, 23 insertions, 53 deletions
diff --git a/hash.c b/hash.c
index 878e215dc5..0e6e3be4ae 100644
--- a/hash.c
+++ b/hash.c
@@ -1775,17 +1775,7 @@ rb_hash_each_key(VALUE hash)
static int
each_pair_i(VALUE key, VALUE value)
{
- rb_yield(rb_assoc_new(key, value));
- return ST_CONTINUE;
-}
-
-static int
-each_pair_i_fast(VALUE key, VALUE value)
-{
- VALUE argv[2];
- argv[0] = key;
- argv[1] = value;
- rb_yield_values2(2, argv);
+ rb_yield_assoc_or_values(key, value);
return ST_CONTINUE;
}
@@ -1815,10 +1805,7 @@ static VALUE
rb_hash_each_pair(VALUE hash)
{
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
- if (rb_block_arity() > 1)
- rb_hash_foreach(hash, each_pair_i_fast, 0);
- else
- rb_hash_foreach(hash, each_pair_i, 0);
+ rb_hash_foreach(hash, each_pair_i, 0);
return hash;
}
@@ -2909,18 +2896,7 @@ rb_init_identtable_with_size(st_index_t size)
static int
any_p_i(VALUE key, VALUE value, VALUE arg)
{
- VALUE ret = rb_yield(rb_assoc_new(key, value));
- if (RTEST(ret)) {
- *(VALUE *)arg = Qtrue;
- return ST_STOP;
- }
- return ST_CONTINUE;
-}
-
-static int
-any_p_i_fast(VALUE key, VALUE value, VALUE arg)
-{
- VALUE ret = rb_yield_values(2, key, value);
+ VALUE ret = rb_yield_assoc_or_values(key, value);
if (RTEST(ret)) {
*(VALUE *)arg = Qtrue;
return ST_STOP;
@@ -2945,10 +2921,7 @@ rb_hash_any_p(VALUE hash)
/* yields pairs, never false */
return Qtrue;
}
- if (rb_block_arity() > 1)
- rb_hash_foreach(hash, any_p_i_fast, (VALUE)&ret);
- else
- rb_hash_foreach(hash, any_p_i, (VALUE)&ret);
+ rb_hash_foreach(hash, any_p_i, (VALUE)&ret);
return ret;
}
@@ -3794,15 +3767,8 @@ env_each_pair(VALUE ehash)
}
FREE_ENVIRON(environ);
- if (rb_block_arity() > 1) {
- for (i=0; i<RARRAY_LEN(ary); i+=2) {
- rb_yield_values(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1));
- }
- }
- else {
- for (i=0; i<RARRAY_LEN(ary); i+=2) {
- rb_yield(rb_assoc_new(RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1)));
- }
+ for (i=0; i<RARRAY_LEN(ary); i+=2) {
+ rb_yield_assoc_or_values(RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1));
}
return ehash;
}
diff --git a/internal.h b/internal.h
index 0b2e6366ee..a3dbbcc1db 100644
--- a/internal.h
+++ b/internal.h
@@ -1768,6 +1768,7 @@ VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv
VALUE rb_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE);
VALUE rb_yield_1(VALUE val);
VALUE rb_yield_force_blockarg(VALUE values);
+VALUE rb_yield_assoc_or_values(VALUE key, VALUE value);
VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv,
rb_block_call_func_t bl_proc, int min_argc, int max_argc,
VALUE data2);
diff --git a/struct.c b/struct.c
index b36dd37e4b..dc4f99396e 100644
--- a/struct.c
+++ b/struct.c
@@ -686,19 +686,10 @@ rb_struct_each_pair(VALUE s)
RETURN_SIZED_ENUMERATOR(s, 0, 0, struct_enum_size);
members = rb_struct_members(s);
- if (rb_block_arity() > 1) {
- for (i=0; i<RSTRUCT_LEN(s); i++) {
- VALUE key = rb_ary_entry(members, i);
- VALUE value = RSTRUCT_GET(s, i);
- rb_yield_values(2, key, value);
- }
- }
- else {
- for (i=0; i<RSTRUCT_LEN(s); i++) {
- VALUE key = rb_ary_entry(members, i);
- VALUE value = RSTRUCT_GET(s, i);
- rb_yield(rb_assoc_new(key, value));
- }
+ for (i=0; i<RSTRUCT_LEN(s); i++) {
+ VALUE key = rb_ary_entry(members, i);
+ VALUE value = RSTRUCT_GET(s, i);
+ rb_yield_assoc_or_values(key, value);
}
return s;
}
diff --git a/vm_eval.c b/vm_eval.c
index 2375e2f34b..c6ed947660 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1010,6 +1010,18 @@ rb_yield_values2(int argc, const VALUE *argv)
}
VALUE
+rb_yield_assoc_or_values(VALUE key, VALUE value)
+{
+ if (rb_block_arity() > 1) {
+ VALUE argv[2] = { key, value };
+ return rb_yield_0(2, argv);
+ }
+ else {
+ return rb_yield_1(rb_assoc_new(key, value));
+ }
+}
+
+VALUE
rb_yield_splat(VALUE values)
{
VALUE tmp = rb_check_array_type(values);