From f2c2fb5ac4929395885ae349231de49d62e2fde4 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 25 Feb 2002 09:16:25 +0000 Subject: * eval.c (method_inspect): should not dump core for unbound singleton methods. * object.c (rb_mod_to_s): better description. * hash.c (env_select): should path the assoc list. * process.c (rb_syswait): thread kludge; should be fixed to support native thread. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index fef1c8680..e6bcdc859 100644 --- a/eval.c +++ b/eval.c @@ -6941,28 +6941,33 @@ method_inspect(method) rb_str_buf_cat2(str, ": "); if (FL_TEST(data->klass, FL_SINGLETON)) { - VALUE v; + VALUE v = rb_iv_get(data->klass, "__attached__"); - rb_str_buf_append(str, rb_inspect(data->recv)); - v = rb_iv_get(data->klass, "__attached__"); - if (data->recv != v) { - rb_str_buf_cat2(str, "("); + if (data->recv == Qundef) { + rb_str_buf_append(str, rb_inspect(data->klass)); + } + else if (data->recv == v) { rb_str_buf_append(str, rb_inspect(v)); - rb_str_buf_cat2(str, ")."); + sharp = "."; } else { - rb_str_buf_cat2(str, "."); + rb_str_buf_append(str, rb_inspect(data->recv)); + rb_str_buf_cat2(str, "("); + rb_str_buf_append(str, rb_inspect(v)); + rb_str_buf_cat2(str, ")"); + sharp = "."; } } else { rb_str_buf_cat2(str, rb_class2name(data->rklass)); - rb_str_buf_cat2(str, "("); - s = rb_class2name(data->klass); - rb_str_buf_cat2(str, s); - rb_str_buf_cat2(str, ")#"); + if (data->rklass != data->klass) { + rb_str_buf_cat2(str, "("); + rb_str_buf_cat2(str, rb_class2name(data->klass)); + rb_str_buf_cat2(str, ")"); + } } - s = rb_id2name(data->oid); - rb_str_buf_cat2(str, s); + rb_str_buf_cat2(str, sharp); + rb_str_buf_cat2(str, rb_id2name(data->oid)); rb_str_buf_cat2(str, ">"); return str; -- cgit