diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-03 11:34:57 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-03 11:34:57 +0000 |
commit | 3be03e9294e208bb0f158a1dd91c31e93dcd96fd (patch) | |
tree | 16a63a9cf6c9e788c17a54c6a81c243ec8938dd2 /array.c | |
parent | 39c871c925cd76c2e61d2741fdc920869da3356b (diff) | |
download | ruby-3be03e9294e208bb0f158a1dd91c31e93dcd96fd.tar.gz |
* array.c (rb_ary_uniq_bang): do not push frozen string from hash
table. [ruby-dev:24695]
* array.c (rb_ary_and): ditto.
* array.c (rb_ary_or): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -2796,7 +2796,7 @@ static VALUE rb_ary_and(ary1, ary2) VALUE ary1, ary2; { - VALUE hash, ary3; + VALUE hash, ary3, v, vv; long i; ary2 = to_ary(ary2); @@ -2805,8 +2805,8 @@ rb_ary_and(ary1, ary2) hash = ary_make_hash(ary2, 0); for (i=0; i<RARRAY(ary1)->len; i++) { - VALUE v = rb_ary_elt(ary1, i); - if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) { + v = vv = rb_ary_elt(ary1, i); + if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) { rb_ary_push(ary3, v); } } @@ -2830,7 +2830,7 @@ rb_ary_or(ary1, ary2) VALUE ary1, ary2; { VALUE hash, ary3; - VALUE v; + VALUE v, vv; long i; ary2 = to_ary(ary2); @@ -2838,14 +2838,14 @@ rb_ary_or(ary1, ary2) hash = ary_make_hash(ary1, ary2); for (i=0; i<RARRAY(ary1)->len; i++) { - v = rb_ary_elt(ary1, i); - if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) { + v = vv = rb_ary_elt(ary1, i); + if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) { rb_ary_push(ary3, v); } } for (i=0; i<RARRAY(ary2)->len; i++) { - v = rb_ary_elt(ary2, i); - if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) { + v = vv = rb_ary_elt(ary2, i); + if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) { rb_ary_push(ary3, v); } } @@ -2870,7 +2870,7 @@ static VALUE rb_ary_uniq_bang(ary) VALUE ary; { - VALUE hash; + VALUE hash, v, vv; long i, j; rb_ary_modify(ary); @@ -2881,8 +2881,8 @@ rb_ary_uniq_bang(ary) return Qnil; } for (i=j=0; i<RARRAY(ary)->len; i++) { - VALUE v = rb_ary_elt(ary, i); - if (st_delete(RHASH(hash)->tbl, (st_data_t*)&v, 0)) { + v = vv = rb_ary_elt(ary, i); + if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) { rb_ary_store(ary, j++, v); } } |