diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-12-01 17:26:45 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-12-02 00:56:52 +0900 |
| commit | a14a1a5626a4d8e661a3e606f8f92b8c455b9a04 (patch) | |
| tree | ddef361869df97d4c71e0a6540fe471af2aaa306 | |
| parent | 06a0c580161db7084e8276fcd9fbb5d25bde4a03 (diff) | |
[Feature #19163] Data object should be frozen
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6843
| -rw-r--r-- | struct.c | 12 | ||||
| -rw-r--r-- | test/ruby/test_data.rb | 8 |
2 files changed, 19 insertions, 1 deletions
@@ -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); diff --git a/test/ruby/test_data.rb b/test/ruby/test_data.rb index f63b0236fb..b8dc55815b 100644 --- a/test/ruby/test_data.rb +++ b/test/ruby/test_data.rb @@ -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 |