* class.c, error.c, eval.c, intern.h, object.c, variable.c:

  do not set path if it is a singleton class.  [ruby-dev:22588]
  (backport from 1.9)


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/error.c b/error.c
index 59ec066b9..06fb92913 100644
--- a/error.c
+++ b/error.c
@@ -400,7 +400,7 @@ exc_to_s(exc)
 {
     VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
 
-    if (NIL_P(mesg)) return rb_class_path(CLASS_OF(exc));
+    if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
     if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
     return mesg;
 }
@@ -439,11 +439,11 @@ exc_inspect(exc)
     klass = CLASS_OF(exc);
     exc = rb_obj_as_string(exc);
     if (RSTRING(exc)->len == 0) {
-	return rb_str_dup(rb_class_path(klass));
+	return rb_str_dup(rb_class_name(klass));
     }
 
     str = rb_str_buf_new2("#<");
-    klass = rb_class_path(klass);
+    klass = rb_class_name(klass);
     rb_str_buf_append(str, klass);
     rb_str_buf_cat(str, ": ", 2);
     rb_str_buf_append(str, exc);
@@ -645,7 +645,7 @@ name_err_to_s(exc)
 {
     VALUE mesg = rb_attr_get(exc, rb_intern("mesg")), str = mesg;
 
-    if (NIL_P(mesg)) return rb_class_path(CLASS_OF(exc));
+    if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
     StringValue(str);
     if (str != mesg) {
 	rb_iv_set(exc, "mesg", mesg = str);