1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Feature #19163] Data object should be frozen

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-12-01 17:26:45 +09:00
parent 06a0c58016
commit a14a1a5626
Notes: git 2022-12-01 15:57:12 +00:00 
Merged: https://github.com/ruby/ruby/pull/6843
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
struct.c
View File

@ -1818,9 +1818,19 @@ rb_data_initialize_m(int argc, const VALUE *argv, VALUE self)
if (arg.unknown_keywords != Qnil) {
rb_exc_raise(rb_keyword_error_new("unknown", arg.unknown_keywords));
}
OBJ_FREEZE_RAW(self);
return Qnil;
}
/* :nodoc: */
static VALUE
rb_data_init_copy(VALUE copy, VALUE s)
{
copy = rb_struct_init_copy(copy, s);
RB_OBJ_FREEZE_RAW(copy);
return copy;
}
/*
* call-seq:
* inspect -> string
@ -2180,7 +2190,7 @@ InitVM_Struct(void)
#endif
rb_define_method(rb_cData, "initialize", rb_data_initialize_m, -1);
rb_define_method(rb_cData, "initialize_copy", rb_struct_init_copy, 1);
rb_define_method(rb_cData, "initialize_copy", rb_data_init_copy, 1);
rb_define_method(rb_cData, "==", rb_data_equal, 1);
rb_define_method(rb_cData, "eql?", rb_data_eql, 1);

8
test/ruby/test_data.rb
View File

@ -62,6 +62,7 @@ class TestData < Test::Unit::TestCase
assert_equal(1, test.foo)
assert_equal(2, test.bar)
assert_equal(test, klass.new(1, 2))
assert_predicate(test, :frozen?)
# Keywords
test_kw = klass.new(foo: 1, bar: 2)
@ -169,4 +170,11 @@ class TestData < Test::Unit::TestCase
assert_equal([], test.members)
assert_equal({}, test.to_h)
end
def test_dup
klass = Data.define(:foo, :bar)
test = klass.new(foo: 1, bar: 2)
assert_equal(klass.new(foo: 1, bar: 2), test.dup)
assert_predicate(test.dup, :frozen?)
end
end