diff options
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -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; } |