diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-03 15:37:51 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-03 15:37:51 +0000 |
| commit | 598fc49d41dbfa392f18f13c4df4357747536c11 (patch) | |
| tree | 572d3df94b454d32bd53360e2d82c803bbfabf8e /ext | |
| parent | 2d90c01a1e8e5076d29e292fa6ed607044389f4d (diff) | |
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 <sto.mar AT
web.de> 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
Diffstat (limited to 'ext')
| -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 |
3 files changed, 36 insertions, 0 deletions
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); +} |