diff options
author | nagachika <nagachika@ruby-lang.org> | 2020-07-26 17:45:27 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2020-07-26 17:45:31 +0900 |
commit | 61c6d433060881e952140d2154c06f8c9803dc8a (patch) | |
tree | 27192727f11eb76d4c7fcb653650953499b8acaf /struct.c | |
parent | 43cc6997c59d2fbe3b91e91ee52faaa8749e9349 (diff) |
partially merge revision adf709a78534c1483ba851ccb0490464ca31503c: [Backport #16801]
Classes made from Struct should have default new singleton method.
Co-authored-by: Yusuke Endoh mame@ruby-lang.org
Co-authored-by: John Hawthorn john@hawthorn.email
Co-authored-by: Adam Hess HParker@github.com
Co-authored-by: Jose Cortinas jacortinas@gmail.com
Co-authored-by: Jean Boussier jean.boussier@gmail.com
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -316,18 +316,15 @@ struct_new_kw(int argc, const VALUE *argv, VALUE klass) } static VALUE -setup_struct(VALUE nstr, VALUE members, int keyword_init) +setup_struct(VALUE nstr, VALUE members) { long i, len; - VALUE (*new_func)(int, const VALUE *, VALUE) = rb_class_new_instance; - - if (keyword_init) new_func = struct_new_kw; members = struct_set_members(nstr, members); rb_define_alloc_func(nstr, struct_alloc); - rb_define_singleton_method(nstr, "new", new_func, -1); - rb_define_singleton_method(nstr, "[]", new_func, -1); + rb_define_singleton_method(nstr, "new", struct_new_kw, -1); + rb_define_singleton_method(nstr, "[]", struct_new_kw, -1); rb_define_singleton_method(nstr, "members", rb_struct_s_members_m, 0); rb_define_singleton_method(nstr, "inspect", rb_struct_s_inspect, 0); len = RARRAY_LEN(members); @@ -442,7 +439,7 @@ rb_struct_define(const char *name, ...) if (!name) st = anonymous_struct(rb_cStruct); else st = new_struct(rb_str_new2(name), rb_cStruct); - return setup_struct(st, ary, 0); + return setup_struct(st, ary); } VALUE @@ -455,7 +452,7 @@ rb_struct_define_under(VALUE outer, const char *name, ...) ary = struct_make_members_list(ar); va_end(ar); - return setup_struct(rb_define_class_under(outer, name, rb_cStruct), ary, 0); + return setup_struct(rb_define_class_under(outer, name, rb_cStruct), ary); } /* @@ -574,7 +571,7 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass) else { st = new_struct(name, klass); } - setup_struct(st, rest, (int)keyword_init); + setup_struct(st, rest); rb_ivar_set(st, id_keyword_init, keyword_init); if (rb_block_given_p()) { rb_mod_module_eval(0, 0, st); |