diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-07 10:03:51 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-07 10:03:51 +0000 |
commit | 7c9bd12af58e712f08a9808246bfa5c28e5bc854 (patch) | |
tree | d1beaf90b26e6eafa6efffcb4bc8b3d0e3e568b3 /struct.c | |
parent | 4ccfb9d123338bdf2f89d1f37025da27c312b3c3 (diff) |
merge revision(s) 77596fb7a91cc119b25ac9e19b3c8682709765b4: [Backport #16138]
Do not turn on keyword_init for Struct subclass if keyword hash is
empty
This was accidentally turned on because there was no checking for
Qundef.
Also, since only a single keyword is currently supported, simplify
the rb_get_kwargs call.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -516,7 +516,7 @@ rb_struct_define_under(VALUE outer, const char *name, ...) static VALUE rb_struct_s_def(int argc, VALUE *argv, VALUE klass) { - VALUE name, rest, keyword_init; + VALUE name, rest, keyword_init = Qfalse; long i; VALUE st; st_table *tbl; @@ -532,18 +532,16 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass) } if (RB_TYPE_P(argv[argc-1], T_HASH)) { - VALUE kwargs[1]; static ID keyword_ids[1]; if (!keyword_ids[0]) { keyword_ids[0] = rb_intern("keyword_init"); } - rb_get_kwargs(argv[argc-1], keyword_ids, 0, 1, kwargs); + rb_get_kwargs(argv[argc-1], keyword_ids, 0, 1, &keyword_init); + if (keyword_init == Qundef) { + keyword_init = Qfalse; + } --argc; - keyword_init = kwargs[0]; - } - else { - keyword_init = Qfalse; } rest = rb_ident_hash_new(); |