diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-25 11:47:19 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-25 11:47:19 +0000 |
commit | fe976467437ade210d7b405614f8b8ac37aa31d7 (patch) | |
tree | a3ec7baed3c42258187fdff3b11f5a41cee15ff5 /vm_eval.c | |
parent | e6f670242ce1ea6ebb56aa65b2b5631d9aaff0da (diff) | |
download | ruby-fe976467437ade210d7b405614f8b8ac37aa31d7.tar.gz |
* vm_eval.c (rb_search_method_entry): refine error message.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 23 |
1 files changed, 14 insertions, 9 deletions
@@ -336,33 +336,38 @@ rb_search_method_entry(VALUE recv, ID mid) VALUE klass = CLASS_OF(recv); if (!klass) { + VALUE flags, klass; if (IMMEDIATE_P(recv)) { rb_raise(rb_eNotImpError, "method `%s' called on unexpected immediate object (%p)", rb_id2name(mid), (void *)recv); } - if (RBASIC(recv)->flags == 0) { + flags = RBASIC(recv)->flags; + klass = RBASIC(recv)->klass; + if (flags == 0) { rb_raise(rb_eNotImpError, "method `%s' called on terminated object" " (%p flags=0x%"PRIxVALUE" klass=0x%"PRIxVALUE")", - rb_id2name(mid), (void *)recv, - RBASIC(recv)->flags, RBASIC(recv)->klass); + rb_id2name(mid), (void *)recv, flags, klass); } else { int type = BUILTIN_TYPE(recv); const char *typestr = rb_type_str(type); - if (typestr) + if (typestr && T_OBJECT <= type && type < T_NIL) rb_raise(rb_eNotImpError, "method `%s' called on hidden %s object" " (%p flags=0x%"PRIxVALUE" klass=0x%"PRIxVALUE")", - rb_id2name(mid), typestr, (void *)recv, - RBASIC(recv)->flags, RBASIC(recv)->klass); + rb_id2name(mid), typestr, (void *)recv, flags, klass); + if (typestr) + rb_raise(rb_eNotImpError, + "method `%s' called on unexpected %s object" + " (%p flags=0x%"PRIxVALUE" klass=0x%"PRIxVALUE")", + rb_id2name(mid), typestr, (void *)recv, flags, klass); else rb_raise(rb_eNotImpError, - "method `%s' called on hidden T_???" "(0x%02x) object" + "method `%s' called on broken T_???" "(0x%02x) object" " (%p flags=0x%"PRIxVALUE" klass=0x%"PRIxVALUE")", - rb_id2name(mid), type, (void *)recv, - RBASIC(recv)->flags, RBASIC(recv)->klass); + rb_id2name(mid), type, (void *)recv, flags, klass); } } return rb_method_entry(klass, mid); |