diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-10-03 23:28:01 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-10-03 23:28:01 +0900 |
commit | cbd82f52502630e5298c8b82e8d52c59ee5454e1 (patch) | |
tree | b3e1ca09e8d63b1c754e683caccf450b33b14ca4 | |
parent | c198cf4329e3d68d38e98392494ecb74c830d7d4 (diff) |
Cannot `define` from defined `Data` class again
-rw-r--r-- | struct.c | 10 | ||||
-rw-r--r-- | test/ruby/test_data.rb | 2 |
2 files changed, 8 insertions, 4 deletions
@@ -384,10 +384,12 @@ setup_data(VALUE subclass, VALUE members) members = struct_set_members(subclass, members); rb_define_alloc_func(subclass, struct_alloc); - rb_define_singleton_method(subclass, "new", rb_data_s_new, -1); - rb_define_singleton_method(subclass, "[]", rb_data_s_new, -1); - rb_define_singleton_method(subclass, "members", rb_struct_s_members_m, 0); - rb_define_singleton_method(subclass, "inspect", rb_struct_s_inspect, 0); // FIXME: just a separate method?.. + VALUE sclass = rb_singleton_class(subclass); + rb_undef_method(sclass, "define"); + rb_define_method(sclass, "new", rb_data_s_new, -1); + rb_define_method(sclass, "[]", rb_data_s_new, -1); + rb_define_method(sclass, "members", rb_struct_s_members_m, 0); + rb_define_method(sclass, "inspect", rb_struct_s_inspect, 0); // FIXME: just a separate method?.. len = RARRAY_LEN(members); for (i=0; i< len; i++) { diff --git a/test/ruby/test_data.rb b/test/ruby/test_data.rb index 0117cd22c5..f63b0236fb 100644 --- a/test/ruby/test_data.rb +++ b/test/ruby/test_data.rb @@ -14,6 +14,8 @@ class TestData < Test::Unit::TestCase # Because some code is shared with Struct, check we don't share unnecessary functionality assert_raise(TypeError) { Data.define(:foo, keyword_init: true) } + + assert_not_respond_to(Data.define, :define, "Cannot define from defined Data class") end def test_define_edge_cases |