diff options
| author | Jean Boussier <jean.boussier@gmail.com> | 2020-05-04 16:56:45 +0200 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-05-26 14:10:33 +0900 |
| commit | 385ac07fd8f5a50825aee8db459086e617f492aa (patch) | |
| tree | fc1d12126f2f04cb5032e9e7329157dabb6ef6d6 /error.c | |
| parent | 4e1f2283b432e833bd4e6f7724ba0496760e68e8 (diff) | |
| download | ruby-385ac07fd8f5a50825aee8db459086e617f492aa.tar.gz | |
Use receiver #name rather than #inspect to build NameError message
Diffstat (limited to 'error.c')
| -rw-r--r-- | error.c | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -1763,6 +1763,17 @@ name_err_mesg_equal(VALUE obj1, VALUE obj2) /* :nodoc: */ static VALUE +name_err_mesg_receiver_name(VALUE obj) +{ + if (RB_SPECIAL_CONST_P(obj)) return Qundef; + if (RB_BUILTIN_TYPE(obj) == T_MODULE || RB_BUILTIN_TYPE(obj) == T_CLASS) { + return rb_check_funcall(obj, rb_intern("name"), 0, 0); + } + return Qundef; +} + +/* :nodoc: */ +static VALUE name_err_mesg_to_str(VALUE obj) { VALUE *ptr, mesg; @@ -1789,7 +1800,9 @@ name_err_mesg_to_str(VALUE obj) d = FAKE_CSTR(&d_str, "false"); break; default: - d = rb_protect(rb_inspect, obj, &state); + d = rb_protect(name_err_mesg_receiver_name, obj, &state); + if (state || d == Qundef || d == Qnil) + d = rb_protect(rb_inspect, obj, &state); if (state) rb_set_errinfo(Qnil); if (NIL_P(d)) { |