Skip to content

Commit

Permalink
* hash.c (rb_hash_aset): should not copy key string when
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
matz committed Mar 4, 2008
1 parent 6c76a25 commit f8c5b8e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
13 changes: 7 additions & 6 deletions hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f8c5b8e

Please sign in to comment.