kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* variable.c (classname): find regular class name if not set.

Browse source 
[ruby-dev:20496]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-08-02 05:02:43 +00:00
parent 9b5701bc6f
commit d7bdf5df56
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Aug 2 14:02:39 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (classname): find regular class name if not set.
[ruby-dev:20496]
Sat Aug 2 03:30:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Sat Aug 2 03:30:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* class.c (rb_obj_singleton_methods): should not go up to * class.c (rb_obj_singleton_methods): should not go up to

35
variable.c
View file

@ -20,7 +20,7 @@
static st_table *rb_global_tbl; static st_table *rb_global_tbl;
st_table *rb_class_tbl; st_table *rb_class_tbl;
static ID autoload; static ID autoload, classpath, tmp_classpath;
void void
Init_var_tables() Init_var_tables()
@ -28,6 +28,8 @@ Init_var_tables()
rb_global_tbl = st_init_numtable(); rb_global_tbl = st_init_numtable();
rb_class_tbl = st_init_numtable(); rb_class_tbl = st_init_numtable();
autoload = rb_intern("__autoload__"); autoload = rb_intern("__autoload__");
classpath = rb_intern("__classpath__");
tmp_classpath = rb_intern("__tmp_classpath__");
} }
struct fc_result { struct fc_result {
@ -49,7 +51,7 @@ fc_path(fc, name)
while (fc) { while (fc) {
if (fc->track == rb_cObject) break; if (fc->track == rb_cObject) break;
if (ROBJECT(fc->track)->iv_tbl && if (ROBJECT(fc->track)->iv_tbl &&
st_lookup(ROBJECT(fc->track)->iv_tbl, rb_intern("__classpath__"), &tmp)) { st_lookup(ROBJECT(fc->track)->iv_tbl, classpath, &tmp)) {
tmp = rb_str_dup(tmp); tmp = rb_str_dup(tmp);
rb_str_cat2(tmp, "::"); rb_str_cat2(tmp, "::");
rb_str_append(tmp, path); rb_str_append(tmp, path);
@ -131,7 +133,8 @@ find_class_path(klass)
if (!ROBJECT(klass)->iv_tbl) { if (!ROBJECT(klass)->iv_tbl) {
ROBJECT(klass)->iv_tbl = st_init_numtable(); ROBJECT(klass)->iv_tbl = st_init_numtable();
} }
st_insert(ROBJECT(klass)->iv_tbl,rb_intern("__classpath__"),arg.path); st_insert(ROBJECT(klass)->iv_tbl, classpath, arg.path);
st_delete(RCLASS(klass)->iv_tbl, &tmp_classpath, 0);
return arg.path; return arg.path;
} }
return Qnil; return Qnil;
@ -142,7 +145,6 @@ classname(klass)
VALUE klass; VALUE klass;
{ {
VALUE path = Qnil; VALUE path = Qnil;
ID classpath = rb_intern("__classpath__");
klass = rb_class_real(klass); klass = rb_class_real(klass);
if (!klass) klass = rb_cObject; if (!klass) klass = rb_cObject;
@ -151,7 +153,7 @@ classname(klass)
ID classid = rb_intern("__classid__"); ID classid = rb_intern("__classid__");
if (!st_lookup(ROBJECT(klass)->iv_tbl, classid, &path)) { if (!st_lookup(ROBJECT(klass)->iv_tbl, classid, &path)) {
return Qnil; return find_class_path(klass);
} }
path = rb_str_new2(rb_id2name(SYM2ID(path))); path = rb_str_new2(rb_id2name(SYM2ID(path)));
st_insert(ROBJECT(klass)->iv_tbl, classpath, path); st_insert(ROBJECT(klass)->iv_tbl, classpath, path);
@ -162,7 +164,7 @@ classname(klass)
} }
return path; return path;
} }
return Qnil; return find_class_path(klass);
} }
VALUE VALUE
@ -182,19 +184,13 @@ rb_class_path(klass)
VALUE path = classname(klass); VALUE path = classname(klass);
if (!NIL_P(path)) return path; if (!NIL_P(path)) return path;
if (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl,
tmp_classpath, &path)) {
return path;
}
else { else {
ID tmppath = rb_intern("__tmp_classpath__");
char *s = "Class"; char *s = "Class";
path = find_class_path(klass);
if (!NIL_P(path)) {
st_delete(RCLASS(klass)->iv_tbl, (st_data_t*)&tmppath, 0);
return path;
}
if (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, tmppath, &path)) {
return path;
}
if (TYPE(klass) == T_MODULE) { if (TYPE(klass) == T_MODULE) {
if (rb_obj_class(klass) == rb_cModule) { if (rb_obj_class(klass) == rb_cModule) {
s = "Module"; s = "Module";
@ -206,7 +202,7 @@ rb_class_path(klass)
path = rb_str_new(0, 2 + strlen(s) + 3 + 2 * SIZEOF_LONG + 1); path = rb_str_new(0, 2 + strlen(s) + 3 + 2 * SIZEOF_LONG + 1);
sprintf(RSTRING(path)->ptr, "#<%s:0x%lx>", s, klass); sprintf(RSTRING(path)->ptr, "#<%s:0x%lx>", s, klass);
RSTRING(path)->len = strlen(RSTRING(path)->ptr); RSTRING(path)->len = strlen(RSTRING(path)->ptr);
rb_iv_set(klass, "__tmp_classpath__", path); rb_ivar_set(klass, tmp_classpath, path);
return path; return path;
} }
@ -227,7 +223,7 @@ rb_set_class_path(klass, under, name)
rb_str_cat2(str, "::"); rb_str_cat2(str, "::");
rb_str_cat2(str, name); rb_str_cat2(str, name);
} }
rb_iv_set(klass, "__classpath__", str); rb_ivar_set(klass, classpath, str);
} }
VALUE VALUE
@ -255,8 +251,7 @@ rb_path2class(path)
} }
if (!rb_const_defined(c, id)) { if (!rb_const_defined(c, id)) {
undefined_class: undefined_class:
rb_raise(rb_eArgError, "undefined class/module %s", rb_id2name(id)); rb_raise(rb_eArgError, "undefined class/module %.*s", p-path, path);
rb_raise(rb_eArgError, "undefined class/module %s", path);
} }
c = rb_const_get_at(c, id); c = rb_const_get_at(c, id);
switch (TYPE(c)) { switch (TYPE(c)) {