kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Do not turn on keyword_init for Struct subclass if keyword hash is empty

Browse source 
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.
This commit is contained in:
Jeremy Evans 2019-09-03 14:02:24 -07:00 committed by GitHub
parent 39c3252cd1
commit 77596fb7a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2019-09-04 06:02:45 +09:00 
Merged: https://github.com/ruby/ruby/pull/2423

Merged-By: jeremyevans <code@jeremyevans.net>
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
struct.c
View file

@ -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();

4
test/ruby/test_struct.rb
View file

@ -96,6 +96,10 @@ module TestStruct
assert_equal([:utime, :stime, :cutime, :cstime], Process.times.members)
end
def test_struct_new_with_empty_hash
assert_equal({:a=>1}, Struct.new(:a, {}).new({:a=>1}).a)
end
def test_struct_new_with_keyword_init
@Struct.new("KeywordInitTrue", :a, :b, keyword_init: true)
@Struct.new("KeywordInitFalse", :a, :b, keyword_init: false)