summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-15 11:42:51 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-15 11:42:51 +0000
commit99a04c1adfef7da4f4d626d744381c99d42e2a77 (patch)
tree27d9106c6726271f2721036fe9f6b1ab59eb8811 /variable.c
parent61817f40af29cdf56c6bb64182f699c662895231 (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/variable.c b/variable.c
index 17832df..e97eef0 100644
--- a/variable.c
+++ b/variable.c
@@ -146,7 +146,6 @@ classname(klass)
{
VALUE path = Qnil;
- klass = rb_class_real(klass);
if (!klass) klass = rb_cObject;
if (ROBJECT(klass)->iv_tbl) {
if (!st_lookup(ROBJECT(klass)->iv_tbl, classpath, &path)) {
@@ -281,11 +280,18 @@ rb_name_class(klass, id)
rb_iv_set(klass, "__classid__", ID2SYM(id));
}
+VALUE
+rb_class_name(klass)
+ VALUE klass;
+{
+ return rb_class_path(rb_class_real(klass));
+}
+
char *
rb_class2name(klass)
VALUE klass;
{
- return RSTRING(rb_class_path(klass))->ptr;
+ return RSTRING(rb_class_name(klass))->ptr;
}
char *
@@ -1193,7 +1199,7 @@ uninitialized_constant(klass, id)
{
if (klass && klass != rb_cObject)
rb_name_error(id, "uninitialized constant %s::%s",
- RSTRING(rb_class_path(klass))->ptr,
+ rb_class2name(klass),
rb_id2name(id));
else {
rb_name_error(id, "uninitialized constant %s", rb_id2name(id));