diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-05 11:44:31 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-05 11:44:31 +0000 |
commit | 26df9588d6b55cc72526d7a45ebdd631600a6226 (patch) | |
tree | 6597635cf907decdd1664f76c1fa3143c8cfb81e /struct.c | |
parent | d3cea2edeb4d6b7a9800ec9dd2e7d65b6a2ea7dc (diff) | |
download | ruby-26df9588d6b55cc72526d7a45ebdd631600a6226.tar.gz |
marshal.c: allow marshalling keyword_init struct
struct.c: define rb_struct_s_keyword_init to shared with marshal.c
internal.h: add the declaration to be used by marshal.c
test/ruby/test_marshal.rb: add test for Bug#14314
[Feature #14314] [ruby-core:84629]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -48,6 +48,12 @@ struct_ivar_get(VALUE c, ID id) } VALUE +rb_struct_s_keyword_init(VALUE klass) +{ + return struct_ivar_get(klass, id_keyword_init); +} + +VALUE rb_struct_s_members(VALUE klass) { VALUE members = struct_ivar_get(klass, id_members); @@ -298,7 +304,7 @@ static VALUE rb_struct_s_inspect(VALUE klass) { VALUE inspect = rb_class_name(klass); - if (RTEST(struct_ivar_get(klass, id_keyword_init))) { + if (RTEST(rb_struct_s_keyword_init(klass))) { rb_str_cat_cstr(inspect, "(keyword_init: true)"); } return inspect; @@ -616,7 +622,7 @@ rb_struct_initialize_m(int argc, const VALUE *argv, VALUE self) rb_struct_modify(self); n = num_members(klass); - if (argc > 0 && RTEST(struct_ivar_get(klass, id_keyword_init))) { + if (argc > 0 && RTEST(rb_struct_s_keyword_init(klass))) { struct struct_hash_set_arg arg; if (argc > 2 || !RB_TYPE_P(argv[0], T_HASH)) { rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 0)", argc); |