diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/-test-/struct/extconf.rb | 7 | ||||
| -rw-r--r-- | ext/-test-/struct/init.c | 11 | ||||
| -rw-r--r-- | ext/-test-/struct/member.c | 18 | ||||
| -rw-r--r-- | struct.c | 15 | ||||
| -rw-r--r-- | test/-ext-/struct/test_member.rb | 16 | ||||
| -rw-r--r-- | version.h | 2 |
7 files changed, 70 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Jul 7 12:46:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * struct.c (not_a_member): extract name error and use same error + messages. based on the patch by Marcus Stollsteimer <sto.mar AT + web.de> at [ruby-core:61721]. [Bug #9684] + Mon Jul 7 12:39:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (read_all): truncate the buffer before appending read data, 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); +} @@ -87,6 +87,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) { @@ -103,7 +110,7 @@ rb_struct_getmember(VALUE obj, ID id) return ptr[i]; } } - rb_name_error(id, "%s is not struct member", rb_id2name(id)); + not_a_member(id); UNREACHABLE; } @@ -153,6 +160,7 @@ rb_struct_set(VALUE obj, VALUE val) { VALUE members, slot, *ptr, *ptr_members; long i, len; + ID fid = rb_frame_this_func(); members = rb_struct_members(obj); ptr_members = RARRAY_PTR(members); @@ -161,12 +169,11 @@ rb_struct_set(VALUE obj, VALUE val) ptr = RSTRUCT_PTR(obj); for (i=0; i<len; i++) { slot = ptr_members[i]; - if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) { + if (rb_id_attrset(SYM2ID(slot)) == fid) { return ptr[i] = val; } } - rb_name_error(rb_frame_this_func(), "`%s' is not a struct member", - rb_id2name(rb_frame_this_func())); + not_a_member(fid); UNREACHABLE; } diff --git a/test/-ext-/struct/test_member.rb b/test/-ext-/struct/test_member.rb new file mode 100644 index 0000000000..4e6295c218 --- /dev/null +++ b/test/-ext-/struct/test_member.rb @@ -0,0 +1,16 @@ +require 'test/unit' +require "-test-/struct" +require_relative '../../ruby/envutil' + +class Bug::Struct::Test_Member < Test::Unit::TestCase + S = Bug::Struct.new(:a) + + def test_member_get + s = S.new(1) + assert_equal(1, s.get(:a)) + assert_raise_with_message(NameError, /is not a struct member/) {s.get(:b)} + EnvUtil.with_default_external(Encoding::UTF_8) do + assert_raise_with_message(NameError, /\u{3042}/) {s.get(:"\u{3042}")} + end + end +end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-07-07" -#define RUBY_PATCHLEVEL 523 +#define RUBY_PATCHLEVEL 524 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 7 |