diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 06:59:00 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 06:59:00 +0000 |
commit | 88efadca4aea13b6c5f3cd4b39c932004d4a23e2 (patch) | |
tree | d0c6e0e0506733a3563d3c39826435f94fff1f1d /ext | |
parent | 8d9e1ca97219af43e99f8987070130914c18a584 (diff) |
merge revision(s) 54611,54612: [Backport #12291]
* struct.c (struct_make_members_list): extract making member name
list from char* va_list, with creating symbols without
intermediate IDs.
* struct.c (struct_make_members_list, rb_struct_s_def): member
names should be unique. [ruby-core:74971] [Bug #12291]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/-test-/struct/duplicate.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/ext/-test-/struct/duplicate.c b/ext/-test-/struct/duplicate.c new file mode 100644 index 0000000000..596d32aad8 --- /dev/null +++ b/ext/-test-/struct/duplicate.c @@ -0,0 +1,24 @@ +#include "ruby.h" + +static VALUE +bug_struct_new_duplicate(VALUE obj, VALUE name, VALUE mem) +{ + const char *n = NIL_P(name) ? 0 : StringValueCStr(name); + const char *m = StringValueCStr(mem); + return rb_struct_define(n, m, m, NULL); +} + +static VALUE +bug_struct_new_duplicate_under(VALUE obj, VALUE name, VALUE mem) +{ + const char *n = StringValueCStr(name); + const char *m = StringValueCStr(mem); + return rb_struct_define_under(obj, n, m, m, NULL); +} + +void +Init_duplicate(VALUE klass) +{ + rb_define_singleton_method(klass, "new_duplicate", bug_struct_new_duplicate, 2); + rb_define_singleton_method(klass, "new_duplicate_under", bug_struct_new_duplicate_under, 2); +} |