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

merge revision(s) 44501: [Backport #9353]

Browse source 
* struct.c (rb_struct_set): return assigned value from setter method
	  rather than struct object. [Bug #9353] [ruby-core:59509]

	* test/ruby/test_struct.rb (test_setter_method_returns_value): add test


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-05 04:05:53 +00:00
parent 673745f799
commit bda2300c4d
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Feb 5 11:48:42 2014 Charlie Somerville <charliesome@ruby-lang.org>
* struct.c (rb_struct_set): return assigned value from setter method
rather than struct object. [Bug #9353] [ruby-core:59509]
* test/ruby/test_struct.rb (test_setter_method_returns_value): add test
Wed Feb 5 11:13:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Feb 5 11:13:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_modify_expand): enable capacity and disable * string.c (rb_str_modify_expand): enable capacity and disable

3
struct.c
View file

@ -156,7 +156,8 @@ rb_struct_set(VALUE obj, VALUE val)
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
slot = RARRAY_AREF(members, i); slot = RARRAY_AREF(members, i);
if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) { if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) {
return RSTRUCT_SET(obj, i, val); RSTRUCT_SET(obj, i, val);
return val;
} }
} }
rb_name_error(rb_frame_this_func(), "`%s' is not a struct member", rb_name_error(rb_frame_this_func(), "`%s' is not a struct member",

6
test/ruby/test_struct.rb
View file

@ -298,6 +298,12 @@ module TestStruct
assert_same(x, o.b!) assert_same(x, o.b!)
end end
def test_setter_method_returns_value
klass = @Struct.new(:a)
x = klass.new
assert_equal "[Bug #9353]", x.send(:a=, "[Bug #9353]")
end
class TopStruct < Test::Unit::TestCase class TopStruct < Test::Unit::TestCase
include TestStruct include TestStruct

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.1" #define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-02-05" #define RUBY_RELEASE_DATE "2014-02-05"
#define RUBY_PATCHLEVEL 16 #define RUBY_PATCHLEVEL 17
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2