summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/-test-/struct/extconf.rb7
-rw-r--r--ext/-test-/struct/init.c11
-rw-r--r--ext/-test-/struct/member.c18
-rw-r--r--struct.c15
-rw-r--r--test/-ext-/struct/test_member.rb12
6 files changed, 65 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d1a238c..7c678f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 28 19:32:13 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]
+
Fri Mar 28 09:21:54 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/psych/psych.gemspec: update gemspec for psych-2.0.5
diff --git a/ext/-test-/struct/extconf.rb b/ext/-test-/struct/extconf.rb
new file mode 100644
index 0000000..0e4f955
--- /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 0000000..459a939
--- /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 0000000..1d40403
--- /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 7c230c0..75f9add 100644
--- a/struct.c
+++ b/struct.c
@@ -80,6 +80,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, "`%s' is not a struct member", rb_id2name(id));
+}
+
VALUE
rb_struct_getmember(VALUE obj, ID id)
{
@@ -94,7 +101,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;
}
@@ -143,19 +150,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<len; i++) {
slot = RARRAY_AREF(members, i);
- if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) {
+ if (rb_id_attrset(SYM2ID(slot)) == fid) {
RSTRUCT_SET(obj, i, val);
return 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 0000000..002941c
--- /dev/null
+++ b/test/-ext-/struct/test_member.rb
@@ -0,0 +1,12 @@
+require 'test/unit'
+require "-test-/struct"
+
+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)}
+ end
+end