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

hash.c: rb_hash_add_new_element

Browse source 
* 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
This commit is contained in:
nobu 2016-07-20 08:35:25 +00:00
parent 306b64bd1a
commit aa0e51b529
4 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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

8
array.c
View file

@ -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;
}

24
hash.c
View file

@ -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;

1
internal.h
View file

@ -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