* 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
This commit is contained in:
matz 2008-03-04 10:14:40 +00:00
Родитель 6c76a2577a
Коммит f8c5b8ec90
2 изменённых файлов: 12 добавлений и 6 удалений

Просмотреть файл

@ -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> Tue Mar 4 16:29:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): disallow non digits '0o' expression. * parse.y (parser_yylex): disallow non digits '0o' expression.

13
hash.c
Просмотреть файл

@ -103,6 +103,11 @@ static const struct st_hash_type objhash = {
rb_any_hash, 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); typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
struct foreach_safe_arg { struct foreach_safe_arg {
@ -932,7 +937,8 @@ VALUE
rb_hash_aset(VALUE hash, VALUE key, VALUE val) rb_hash_aset(VALUE hash, VALUE key, VALUE val)
{ {
rb_hash_modify(hash); 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); st_insert(RHASH(hash)->ntbl, key, val);
} }
else { else {
@ -1685,11 +1691,6 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
return ary; return ary;
} }
static const struct st_hash_type identhash = {
st_numcmp,
st_numhash,
};
/* /*
* call-seq: * call-seq:
* hsh.compare_by_identity => hsh * hsh.compare_by_identity => hsh