diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-31 21:55:53 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-31 21:55:53 +0000 |
commit | 70d34c623a4a35f15936b7b7fecd618aeb0521d3 (patch) | |
tree | 177c72272c323023f899d7205f13cf0ae51a310b | |
parent | bcd25152a6352eb9952cf4620b2fe4c32fa6508d (diff) | |
download | ruby-70d34c623a4a35f15936b7b7fecd618aeb0521d3.tar.gz |
parse.y: no duplicate attrset ID
* parse.y (intern_str): dynamic attrset ID is registered by
`rb_id_attrset()` already, so no further registration is needed.
[ruby-core:62861]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | parse.y | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Jun 1 06:55:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (intern_str): dynamic attrset ID is registered by + `rb_id_attrset()` already, so no further registration is needed. + [ruby-core:62861] + Sun Jun 1 04:52:47 2014 Zachary Scott <e@zzak.io> * lib/English.rb: [DOC] $LOADED_FEATURES moved to load.c [Fixes GH-620] @@ -10657,7 +10657,9 @@ next_id(VALUE str) static ID intern_str(VALUE str) { - return register_static_symid_str(next_id(str), str); + ID id = next_id(str); + if (ID_DYNAMIC_SYM_P(id) && is_attrset_id(id)) return id; + return register_static_symid_str(id, str); } ID |