diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-20 08:35:25 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-20 08:35:25 +0000 |
commit | 197ede0e7f2b42cd96395b71bb1e5e432c49f1c6 (patch) | |
tree | 6f2f7540de09d53478ed71e7469c9766d0145080 | |
parent | e31526d1f0f5537d87e2651b641e063aa42f4389 (diff) | |
download | ruby-197ede0e7f2b42cd96395b71bb1e5e432c49f1c6.tar.gz |
hash.c: rb_hash_add_new_element
* hash.c (rb_hash_add_new_element): add new element or do nothing
if it is contained already.
* array.c (ary_add_hash, ary_add_hash_by): use
rb_hash_add_new_element.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | array.c | 8 | ||||
-rw-r--r-- | hash.c | 24 | ||||
-rw-r--r-- | internal.h | 1 |
4 files changed, 35 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Wed Jul 20 17:35:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (rb_hash_add_new_element): add new element or do nothing + if it is contained already. + + * array.c (ary_add_hash, ary_add_hash_by): use + rb_hash_add_new_element. + Tue Jul 19 18:21:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp> * lib/unicode_normalize/tables.rb: Remove @@ -4008,9 +4008,7 @@ ary_add_hash(VALUE hash, VALUE ary) for (i=0; i<RARRAY_LEN(ary); i++) { VALUE elt = RARRAY_AREF(ary, i); - if (rb_hash_lookup2(hash, elt, Qundef) == Qundef) { - rb_hash_aset(hash, elt, elt); - } + rb_hash_add_new_element(hash, elt, elt); } return hash; } @@ -4038,9 +4036,7 @@ ary_add_hash_by(VALUE hash, VALUE ary) for (i = 0; i < RARRAY_LEN(ary); ++i) { VALUE v = rb_ary_elt(ary, i), k = rb_yield(v); - if (rb_hash_lookup2(hash, k, Qundef) == Qundef) { - rb_hash_aset(hash, k, v); - } + rb_hash_add_new_element(hash, k, v); } return hash; } @@ -2862,6 +2862,30 @@ rb_hash_to_proc(VALUE hash) return rb_func_proc_new(hash_proc_call, hash); } +static int +add_new_i(st_data_t *key, st_data_t *val, st_data_t arg, int existing) +{ + VALUE *args = (VALUE *)arg; + if (existing) return ST_STOP; + RB_OBJ_WRITTEN(args[0], Qundef, (VALUE)*key); + RB_OBJ_WRITE(args[0], (VALUE *)val, args[1]); + return ST_CONTINUE; +} + +/* + * add +key+ to +val+ pair if +hash+ does not contain +key+. + * returns non-zero if +key+ was contained. + */ +int +rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val) +{ + st_table *tbl = rb_hash_tbl_raw(hash); + VALUE args[2]; + args[0] = hash; + args[1] = val; + return st_update(tbl, (st_data_t)key, add_new_i, (st_data_t)args); +} + static int path_tainted = -1; static char **origenviron; diff --git a/internal.h b/internal.h index b47430cd7d..c59ccc5e19 100644 --- a/internal.h +++ b/internal.h @@ -1049,6 +1049,7 @@ st_table *rb_init_identtable_with_size(st_index_t size); VALUE rb_hash_keys(VALUE hash); VALUE rb_hash_values(VALUE hash); VALUE rb_hash_rehash(VALUE hash); +int rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val); #define HASH_DELETED FL_USER1 #define HASH_PROC_DEFAULT FL_USER2 |