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 /marshal.c | |
parent | d3cea2edeb4d6b7a9800ec9dd2e7d65b6a2ea7dc (diff) |
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 'marshal.c')
-rw-r--r-- | marshal.c | 34 |
1 files changed, 24 insertions, 10 deletions
@@ -1811,17 +1811,31 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) arg->readable += (len - 1) * 2; v = r_entry0(v, idx, arg); values = rb_ary_new2(len); - for (i=0; i<len; i++) { - VALUE n = rb_sym2str(RARRAY_AREF(mem, i)); - slot = r_symbol(arg); - - if (!rb_str_equal(n, slot)) { - rb_raise(rb_eTypeError, "struct %"PRIsVALUE" not compatible (:%"PRIsVALUE" for :%"PRIsVALUE")", - rb_class_name(klass), - slot, n); + { + VALUE keywords; + int keyword_init = RTEST(rb_struct_s_keyword_init(klass)); + if (keyword_init) { + keywords = rb_hash_new(); + rb_ary_push(values, keywords); + } + + for (i=0; i<len; i++) { + VALUE n = rb_sym2str(RARRAY_AREF(mem, i)); + slot = r_symbol(arg); + + if (!rb_str_equal(n, slot)) { + rb_raise(rb_eTypeError, "struct %"PRIsVALUE" not compatible (:%"PRIsVALUE" for :%"PRIsVALUE")", + rb_class_name(klass), + slot, n); + } + if (keyword_init) { + rb_hash_aset(keywords, RARRAY_AREF(mem, i), r_object(arg)); + } + else { + rb_ary_push(values, r_object(arg)); + } + arg->readable -= 2; } - rb_ary_push(values, r_object(arg)); - arg->readable -= 2; } rb_struct_initialize(v, values); v = r_leave(v, arg); |