mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
*** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@49 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f31c91fd29
commit
db34086b5b
4 changed files with 10 additions and 15 deletions
15
variable.c
15
variable.c
|
@ -130,12 +130,6 @@ classname(klass)
|
|||
klass = (VALUE)RCLASS(klass)->super;
|
||||
}
|
||||
path = rb_iv_get(klass, "__classpath__");
|
||||
if (NIL_P(path)) {
|
||||
path = rb_iv_get(klass, "__classid__");
|
||||
if (!NIL_P(path)) {
|
||||
path = str_new2(rb_id2name(FIX2INT(path)));
|
||||
}
|
||||
}
|
||||
if (NIL_P(path)) {
|
||||
path = find_class_path(klass);
|
||||
if (NIL_P(path)) {
|
||||
|
@ -153,7 +147,7 @@ mod_name(mod)
|
|||
{
|
||||
VALUE path = classname(mod);
|
||||
|
||||
if (path) return path;
|
||||
if (path) return str_dup(path);
|
||||
return str_new(0,0);
|
||||
}
|
||||
|
||||
|
@ -209,12 +203,7 @@ rb_name_class(klass, id)
|
|||
{
|
||||
extern VALUE cString;
|
||||
|
||||
if (cString) {
|
||||
rb_iv_set(klass, "__classpath__", str_new2(rb_id2name(id)));
|
||||
}
|
||||
else {
|
||||
rb_iv_set(klass, "__classid__", INT2FIX(id));
|
||||
}
|
||||
rb_iv_set(klass, "__classpath__", str_new2(rb_id2name(id)));
|
||||
}
|
||||
|
||||
static st_table *autoload_tbl = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue