kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: no duplicate attrset ID

Browse source 
* 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
This commit is contained in:
nobu 2014-05-31 21:55:53 +00:00
parent bcd25152a6
commit 70d34c623a
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 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] * lib/English.rb: [DOC] $LOADED_FEATURES moved to load.c [Fixes GH-620]

4
parse.y
View file

@ -10657,7 +10657,9 @@ next_id(VALUE str)
static ID static ID
intern_str(VALUE str) 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 ID