mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
usa
parent
8d9e1ca972
commit
88efadca4a
6 changed files with 96 additions and 32 deletions
|
|
@ -1,3 +1,9 @@
|
|||
Fri Apr 22 15:47:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* struct.c (struct_make_members_list): extract making member name
|
||||
list from char* va_list, with creating symbols without
|
||||
intermediate IDs.
|
||||
|
||||
Fri Apr 22 15:19:01 2016 Joe Swatosh <joe.swatosh@gmail.com>
|
||||
|
||||
* ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
|
||||
|
|
|
|||
24
ext/-test-/struct/duplicate.c
Normal file
24
ext/-test-/struct/duplicate.c
Normal file
|
|
@ -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);
|
||||
}
|
||||
67
struct.c
67
struct.c
|
|
@ -231,6 +231,27 @@ rb_struct_alloc_noinit(VALUE klass)
|
|||
return struct_alloc(klass);
|
||||
}
|
||||
|
||||
static VALUE
|
||||
struct_make_members_list(va_list ar)
|
||||
{
|
||||
char *mem;
|
||||
VALUE ary, list = rb_ident_hash_new();
|
||||
st_table *tbl = RHASH_TBL(list);
|
||||
|
||||
RBASIC_CLEAR_CLASS(list);
|
||||
while ((mem = va_arg(ar, char*)) != 0) {
|
||||
VALUE sym = rb_id2sym(rb_intern(mem));
|
||||
if (st_insert(tbl, sym, Qtrue)) {
|
||||
rb_raise(rb_eArgError, "duplicate member: %s", mem);
|
||||
}
|
||||
}
|
||||
ary = rb_hash_keys(list);
|
||||
st_clear(tbl);
|
||||
RBASIC_CLEAR_CLASS(ary);
|
||||
OBJ_FREEZE_RAW(ary);
|
||||
return ary;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
struct_define_without_accessor(VALUE outer, const char *class_name, VALUE super, rb_alloc_func_t alloc, VALUE members)
|
||||
{
|
||||
|
|
@ -265,15 +286,10 @@ rb_struct_define_without_accessor_under(VALUE outer, const char *class_name, VAL
|
|||
{
|
||||
va_list ar;
|
||||
VALUE members;
|
||||
char *name;
|
||||
|
||||
members = rb_ary_tmp_new(0);
|
||||
va_start(ar, alloc);
|
||||
while ((name = va_arg(ar, char*)) != NULL) {
|
||||
rb_ary_push(members, ID2SYM(rb_intern(name)));
|
||||
}
|
||||
members = struct_make_members_list(ar);
|
||||
va_end(ar);
|
||||
OBJ_FREEZE(members);
|
||||
|
||||
return struct_define_without_accessor(outer, class_name, super, alloc, members);
|
||||
}
|
||||
|
|
@ -283,15 +299,10 @@ rb_struct_define_without_accessor(const char *class_name, VALUE super, rb_alloc_
|
|||
{
|
||||
va_list ar;
|
||||
VALUE members;
|
||||
char *name;
|
||||
|
||||
members = rb_ary_tmp_new(0);
|
||||
va_start(ar, alloc);
|
||||
while ((name = va_arg(ar, char*)) != NULL) {
|
||||
rb_ary_push(members, ID2SYM(rb_intern(name)));
|
||||
}
|
||||
members = struct_make_members_list(ar);
|
||||
va_end(ar);
|
||||
OBJ_FREEZE(members);
|
||||
|
||||
return struct_define_without_accessor(0, class_name, super, alloc, members);
|
||||
}
|
||||
|
|
@ -301,15 +312,9 @@ rb_struct_define(const char *name, ...)
|
|||
{
|
||||
va_list ar;
|
||||
VALUE st, ary;
|
||||
char *mem;
|
||||
|
||||
ary = rb_ary_tmp_new(0);
|
||||
|
||||
va_start(ar, name);
|
||||
while ((mem = va_arg(ar, char*)) != 0) {
|
||||
ID slot = rb_intern(mem);
|
||||
rb_ary_push(ary, ID2SYM(slot));
|
||||
}
|
||||
ary = struct_make_members_list(ar);
|
||||
va_end(ar);
|
||||
|
||||
if (!name) st = anonymous_struct(rb_cStruct);
|
||||
|
|
@ -322,15 +327,9 @@ rb_struct_define_under(VALUE outer, const char *name, ...)
|
|||
{
|
||||
va_list ar;
|
||||
VALUE ary;
|
||||
char *mem;
|
||||
|
||||
ary = rb_ary_tmp_new(0);
|
||||
|
||||
va_start(ar, name);
|
||||
while ((mem = va_arg(ar, char*)) != 0) {
|
||||
ID slot = rb_intern(mem);
|
||||
rb_ary_push(ary, ID2SYM(slot));
|
||||
}
|
||||
ary = struct_make_members_list(ar);
|
||||
va_end(ar);
|
||||
|
||||
return setup_struct(rb_define_class_under(outer, name, rb_cStruct), ary);
|
||||
|
|
@ -391,7 +390,7 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
|
|||
VALUE name, rest;
|
||||
long i;
|
||||
VALUE st;
|
||||
ID id;
|
||||
st_table *tbl;
|
||||
|
||||
rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
|
||||
name = argv[0];
|
||||
|
|
@ -402,12 +401,18 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
|
|||
--argc;
|
||||
++argv;
|
||||
}
|
||||
rest = rb_ary_tmp_new(argc);
|
||||
rest = rb_ident_hash_new();
|
||||
RBASIC_CLEAR_CLASS(rest);
|
||||
tbl = RHASH_TBL(rest);
|
||||
for (i=0; i<argc; i++) {
|
||||
id = rb_to_id(argv[i]);
|
||||
RARRAY_ASET(rest, i, ID2SYM(id));
|
||||
rb_ary_set_len(rest, i+1);
|
||||
VALUE mem = rb_to_symbol(argv[i]);
|
||||
if (st_insert(tbl, mem, Qtrue)) {
|
||||
rb_raise(rb_eArgError, "duplicate member: %"PRIsVALUE, mem);
|
||||
}
|
||||
}
|
||||
rest = rb_hash_keys(rest);
|
||||
st_clear(tbl);
|
||||
RBASIC_CLEAR_CLASS(rest);
|
||||
if (NIL_P(name)) {
|
||||
st = anonymous_struct(klass);
|
||||
}
|
||||
|
|
|
|||
22
test/-ext-/struct/test_duplicate.rb
Normal file
22
test/-ext-/struct/test_duplicate.rb
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# frozen_string_literal: false
|
||||
require 'test/unit'
|
||||
require "-test-/struct"
|
||||
|
||||
class Bug::Struct::Test_Duplicate < Test::Unit::TestCase
|
||||
def test_new_dupilicate
|
||||
bug12291 = '[ruby-core:74971] [Bug #12291]'
|
||||
assert_raise_with_message(ArgumentError, /duplicate member/, bug12291) {
|
||||
Bug::Struct.new_duplicate(nil, "a")
|
||||
}
|
||||
assert_raise_with_message(ArgumentError, /duplicate member/, bug12291) {
|
||||
Bug::Struct.new_duplicate("X", "a")
|
||||
}
|
||||
end
|
||||
|
||||
def test_new_dupilicate_under
|
||||
bug12291 = '[ruby-core:74971] [Bug #12291]'
|
||||
assert_raise_with_message(ArgumentError, /duplicate member/, bug12291) {
|
||||
Bug::Struct.new_duplicate_under("x", "a")
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
@ -353,6 +353,13 @@ module TestStruct
|
|||
assert_equal "[Bug #9353]", x.send(:a=, "[Bug #9353]")
|
||||
end
|
||||
|
||||
def test_new_dupilicate
|
||||
bug12291 = '[ruby-core:74971] [Bug #12291]'
|
||||
assert_raise_with_message(ArgumentError, /duplicate member/, bug12291) {
|
||||
@Struct.new(:a, :a)
|
||||
}
|
||||
end
|
||||
|
||||
class TopStruct < Test::Unit::TestCase
|
||||
include TestStruct
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "2.2.5"
|
||||
#define RUBY_RELEASE_DATE "2016-04-22"
|
||||
#define RUBY_PATCHLEVEL 302
|
||||
#define RUBY_PATCHLEVEL 303
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2016
|
||||
#define RUBY_RELEASE_MONTH 4
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue