From 598fc49d41dbfa392f18f13c4df4357747536c11 Mon Sep 17 00:00:00 2001 From: nagachika Date: Thu, 3 Jul 2014 15:37:51 +0000 Subject: merge revision(s) r45462,r45463,r45466: [Backport #9684] * struct.c (not_a_member): extract name error and use same error messages. based on the patch by Marcus Stollsteimer at [ruby-core:61721]. [Bug #9684] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/-test-/struct/extconf.rb | 7 +++++++ ext/-test-/struct/init.c | 11 +++++++++++ ext/-test-/struct/member.c | 18 ++++++++++++++++++ struct.c | 15 +++++++++++---- test/-ext-/struct/test_member.rb | 16 ++++++++++++++++ version.h | 6 +++--- 7 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 ext/-test-/struct/extconf.rb create mode 100644 ext/-test-/struct/init.c create mode 100644 ext/-test-/struct/member.c create mode 100644 test/-ext-/struct/test_member.rb diff --git a/ChangeLog b/ChangeLog index 0807bf46d1..8e37c52494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jul 4 00:25:16 2014 Nobuyoshi Nakada + + * struct.c (not_a_member): extract name error and use same error + messages. based on the patch by Marcus Stollsteimer at [ruby-core:61721]. [Bug #9684] + Thu Jul 3 01:19:50 2014 CHIKANAGA Tomoyuki * numeric.c (num_step_scan_args): table argument of rb_get_kwargs() is diff --git a/ext/-test-/struct/extconf.rb b/ext/-test-/struct/extconf.rb new file mode 100644 index 0000000000..0e4f9551f2 --- /dev/null +++ b/ext/-test-/struct/extconf.rb @@ -0,0 +1,7 @@ +$INCFLAGS << " -I$(topdir) -I$(top_srcdir)" +$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")] +inits = $srcs.map {|s| File.basename(s, ".*")} +inits.delete("init") +inits.map! {|s|"X(#{s})"} +$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\"" +create_makefile("-test-/struct") diff --git a/ext/-test-/struct/init.c b/ext/-test-/struct/init.c new file mode 100644 index 0000000000..459a939e79 --- /dev/null +++ b/ext/-test-/struct/init.c @@ -0,0 +1,11 @@ +#include "ruby.h" + +#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);} + +void +Init_struct(void) +{ + VALUE mBug = rb_define_module("Bug"); + VALUE klass = rb_define_class_under(mBug, "Struct", rb_cStruct); + TEST_INIT_FUNCS(init); +} diff --git a/ext/-test-/struct/member.c b/ext/-test-/struct/member.c new file mode 100644 index 0000000000..1d404039b4 --- /dev/null +++ b/ext/-test-/struct/member.c @@ -0,0 +1,18 @@ +#include "ruby.h" + +static VALUE +bug_struct_get(VALUE obj, VALUE name) +{ + ID id = rb_check_id(&name); + + if (!id) { + rb_name_error_str(name, "`%"PRIsVALUE"' is not a struct member", name); + } + return rb_struct_getmember(obj, id); +} + +void +Init_member(VALUE klass) +{ + rb_define_method(klass, "get", bug_struct_get, 1); +} diff --git a/struct.c b/struct.c index 2e026fbc7f..e13473637b 100644 --- a/struct.c +++ b/struct.c @@ -86,6 +86,13 @@ rb_struct_members_m(VALUE obj) return rb_struct_s_members_m(rb_obj_class(obj)); } +NORETURN(static void not_a_member(ID id)); +static void +not_a_member(ID id) +{ + rb_name_error(id, "`%"PRIsVALUE"' is not a struct member", QUOTE_ID(id)); +} + VALUE rb_struct_getmember(VALUE obj, ID id) { @@ -100,7 +107,7 @@ rb_struct_getmember(VALUE obj, ID id) return RSTRUCT_GET(obj, i); } } - rb_name_error(id, "%s is not struct member", rb_id2name(id)); + not_a_member(id); UNREACHABLE; } @@ -149,19 +156,19 @@ rb_struct_set(VALUE obj, VALUE val) { VALUE members, slot; long i, len; + ID fid = rb_frame_this_func(); members = rb_struct_members(obj); len = RARRAY_LEN(members); rb_struct_modify(obj); for (i=0; i