From a4f838c742dc758de8dec0c002e20d22c791b85a Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 28 Oct 2015 06:36:13 +0000 Subject: error.c: receiver in NameError * error.c (rb_name_err_new): store the receiver directly. * error.c (name_err_receiver): return directly stored receiver. [Feature #10881] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'error.c') diff --git a/error.c b/error.c index 0a84937d78..1db0e74a09 100644 --- a/error.c +++ b/error.c @@ -662,6 +662,7 @@ static VALUE rb_eNOERROR; static ID id_new, id_cause, id_message, id_backtrace; static ID id_name, id_args, id_Errno, id_errno, id_i_path; +static ID id_receiver; extern ID ruby_static_id_status; #define id_bt idBt #define id_bt_locations idBt_locations @@ -1196,6 +1197,7 @@ rb_name_err_new(VALUE mesg, VALUE recv, VALUE method) rb_ivar_set(exc, id_mesg, rb_name_err_mesg_new(mesg, recv, method)); rb_ivar_set(exc, id_bt, Qnil); rb_ivar_set(exc, id_name, method); + rb_ivar_set(exc, id_receiver, recv); return exc; } @@ -1297,8 +1299,12 @@ name_err_mesg_load(VALUE klass, VALUE str) static VALUE name_err_receiver(VALUE self) { - VALUE *ptr, mesg = rb_attr_get(self, id_mesg); + VALUE *ptr, recv, mesg; + recv = rb_ivar_lookup(self, id_receiver, Qundef); + if (recv != Qundef) return recv; + + mesg = rb_attr_get(self, id_mesg); if (!rb_typeddata_is_kind_of(mesg, &name_err_mesg_data_type)) { rb_raise(rb_eArgError, "no receiver is available"); } @@ -1969,6 +1975,7 @@ Init_Exception(void) id_backtrace = rb_intern_const("backtrace"); id_name = rb_intern_const("name"); id_args = rb_intern_const("args"); + id_receiver = rb_intern_const("receiver"); id_Errno = rb_intern_const("Errno"); id_errno = rb_intern_const("errno"); id_i_path = rb_intern_const("@path"); -- cgit v1.2.3