aboutsummaryrefslogtreecommitdiffstats
path: root/hash.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-20 08:35:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-20 08:35:25 +0000
commit197ede0e7f2b42cd96395b71bb1e5e432c49f1c6 (patch)
tree6f2f7540de09d53478ed71e7469c9766d0145080 /hash.c
parente31526d1f0f5537d87e2651b641e063aa42f4389 (diff)
downloadruby-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
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/hash.c b/hash.c
index 561aa90400..cab0b9eaa2 100644
--- a/hash.c
+++ b/hash.c
@@ -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;