1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm_eval.c: add rb_yield_assoc_or_values()

Browse Source 
The new function rb_yield_assoc_or_values() will reduce branching.

* vm_eval.c: add rb_yield_assoc_or_values()

* internal.h: ditto

* hash.c: use rb_yield_assoc_or_values()

* struct.c: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2017-10-02 05:29:11 +00:00
parent 487dfb9d22
commit 7ae65b24c2
4 changed files with 23 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hash.c
View File

@ -1775,17 +1775,7 @@ rb_hash_each_key(VALUE hash)
static int static int
each_pair_i(VALUE key, VALUE value) each_pair_i(VALUE key, VALUE value)
{ {
rb_yield(rb_assoc_new(key, value)); rb_yield_assoc_or_values(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);
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -1815,9 +1805,6 @@ static VALUE
rb_hash_each_pair(VALUE hash) rb_hash_each_pair(VALUE hash)
{ {
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size); 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; return hash;
} }
@ -2909,18 +2896,7 @@ rb_init_identtable_with_size(st_index_t size)
static int static int
any_p_i(VALUE key, VALUE value, VALUE arg) any_p_i(VALUE key, VALUE value, VALUE arg)
{ {
VALUE ret = rb_yield(rb_assoc_new(key, value)); VALUE ret = rb_yield_assoc_or_values(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);
if (RTEST(ret)) { if (RTEST(ret)) {
*(VALUE *)arg = Qtrue; *(VALUE *)arg = Qtrue;
return ST_STOP; return ST_STOP;
@ -2945,9 +2921,6 @@ rb_hash_any_p(VALUE hash)
/* yields pairs, never false */ /* yields pairs, never false */
return Qtrue; 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; return ret;
} }
@ -3794,15 +3767,8 @@ env_each_pair(VALUE ehash)
} }
FREE_ENVIRON(environ); FREE_ENVIRON(environ);
if (rb_block_arity() > 1) {
for (i=0; i<RARRAY_LEN(ary); i+=2) { for (i=0; i<RARRAY_LEN(ary); i+=2) {
rb_yield_values(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1)); rb_yield_assoc_or_values(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)));
}
} }
return ehash; return ehash;
} }

1
internal.h
View File

@ -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_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE);
VALUE rb_yield_1(VALUE val); VALUE rb_yield_1(VALUE val);
VALUE rb_yield_force_blockarg(VALUE values); 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, 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, rb_block_call_func_t bl_proc, int min_argc, int max_argc,
VALUE data2); VALUE data2);

11
struct.c
View File

@ -686,19 +686,10 @@ rb_struct_each_pair(VALUE s)
RETURN_SIZED_ENUMERATOR(s, 0, 0, struct_enum_size); RETURN_SIZED_ENUMERATOR(s, 0, 0, struct_enum_size);
members = rb_struct_members(s); members = rb_struct_members(s);
if (rb_block_arity() > 1) {
for (i=0; i<RSTRUCT_LEN(s); i++) { for (i=0; i<RSTRUCT_LEN(s); i++) {
VALUE key = rb_ary_entry(members, i); VALUE key = rb_ary_entry(members, i);
VALUE value = RSTRUCT_GET(s, i); VALUE value = RSTRUCT_GET(s, i);
rb_yield_values(2, key, value); rb_yield_assoc_or_values(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));
}
} }
return s; return s;
} }

12
vm_eval.c
View File

@ -1009,6 +1009,18 @@ rb_yield_values2(int argc, const VALUE *argv)
return rb_yield_0(argc, argv); return rb_yield_0(argc, 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 VALUE
rb_yield_splat(VALUE values) rb_yield_splat(VALUE values)
{ {