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 /struct.c | |
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 'struct.c')
-rw-r--r-- | struct.c | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -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<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; } |