summaryrefslogtreecommitdiff
path: root/struct.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-28 10:32:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-28 10:32:16 +0000
commitafb4bcbfd6a4d315093285679d9aa9270ad7d1ab (patch)
tree7d2ba023b91ba21dac9099625e5759d49bf2042c /struct.c
parent4a3f08d397889f24504c74ee5c7165dcc8a26c36 (diff)
struct.c: not_a_member message
* 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/trunk@45462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'struct.c')
-rw-r--r--struct.c15
1 files changed, 11 insertions, 4 deletions
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;
}