kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* array.c (rb_ary_and): defer hash creation and some refactoring.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2013-11-06 01:39:55 +00:00
parent 71b70f3cdf
commit e90e8b2ef6
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Nov 6 10:37:07 2013 Masaki Matsushita <glass.saga@gmail.com>
* array.c (rb_ary_and): defer hash creation and some refactoring.
Wed Nov 6 09:14:31 2013 Koichi Sasada <ko1@atdot.net> Wed Nov 6 09:14:31 2013 Koichi Sasada <ko1@atdot.net>
* benchmark/bm_vm1_gc_short_lived.rb: added. * benchmark/bm_vm1_gc_short_lived.rb: added.

14
array.c
View file

@ -4009,20 +4009,20 @@ static VALUE
rb_ary_and(VALUE ary1, VALUE ary2) rb_ary_and(VALUE ary1, VALUE ary2)
{ {
VALUE hash, ary3, v; VALUE hash, ary3, v;
st_table *table;
st_data_t vv; st_data_t vv;
long i; long i;
ary2 = to_ary(ary2); ary2 = to_ary(ary2);
ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ? ary3 = rb_ary_new();
RARRAY_LEN(ary1) : RARRAY_LEN(ary2)); if (RARRAY_LEN(ary2) == 0) return ary3;
hash = ary_make_hash(ary2); hash = ary_make_hash(ary2);
table = rb_hash_tbl_raw(hash);
if (RHASH_EMPTY_P(hash))
return ary3;
for (i=0; i<RARRAY_LEN(ary1); i++) { for (i=0; i<RARRAY_LEN(ary1); i++) {
vv = (st_data_t)(v = rb_ary_elt(ary1, i)); v = RARRAY_AREF(ary1, i);
if (st_delete(rb_hash_tbl_raw(hash), &vv, 0)) { vv = (st_data_t)v;
if (st_delete(table, &vv, 0)) {
rb_ary_push(ary3, v); rb_ary_push(ary3, v);
} }
} }