diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-04 10:14:40 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-04 10:14:40 +0000 |
commit | f8c5b8ec90cec4a8db42bd07f97c475ba6353b10 (patch) | |
tree | ea0e4ee58714aee78e094979ac331567cf106de0 | |
parent | 6c76a2577ab2ae9ecaf846a908be4b35206b3d69 (diff) |
* hash.c (rb_hash_aset): should not copy key string when
compare_by_identity is set. [ruby-dev:33604]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | hash.c | 13 |
2 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Tue Mar 4 19:10:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * hash.c (rb_hash_aset): should not copy key string when + compare_by_identity is set. [ruby-dev:33604] + Tue Mar 4 16:29:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * parse.y (parser_yylex): disallow non digits '0o' expression. @@ -103,6 +103,11 @@ static const struct st_hash_type objhash = { rb_any_hash, }; +static const struct st_hash_type identhash = { + st_numcmp, + st_numhash, +}; + typedef int st_foreach_func(st_data_t, st_data_t, st_data_t); struct foreach_safe_arg { @@ -932,7 +937,8 @@ VALUE rb_hash_aset(VALUE hash, VALUE key, VALUE val) { rb_hash_modify(hash); - if (TYPE(key) != T_STRING || st_lookup(RHASH(hash)->ntbl, key, 0)) { + if (RHASH(hash)->ntbl->type == &identhash || + TYPE(key) != T_STRING || st_lookup(RHASH(hash)->ntbl, key, 0)) { st_insert(RHASH(hash)->ntbl, key, val); } else { @@ -1685,11 +1691,6 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash) return ary; } -static const struct st_hash_type identhash = { - st_numcmp, - st_numhash, -}; - /* * call-seq: * hsh.compare_by_identity => hsh |