diff options
| author | (no author) <(no author)@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-04-10 06:09:00 +0000 |
|---|---|---|
| committer | (no author) <(no author)@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-04-10 06:09:00 +0000 |
| commit | e14f4ff4ab9a2af85a1a0e31e03445fc6c5c0c84 (patch) | |
| tree | 05852fad6a378aa3c04243244f793964ccb42d7f /variable.c | |
| parent | 99020d6e50702eb371111d73280eb80b4b29ba5b (diff) | |
This commit was manufactured by cvs2svn to create tag
'v1_6_4_preview1'.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_6_4_preview1@1317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/variable.c b/variable.c index 69791ab26d..445f811a18 100644 --- a/variable.c +++ b/variable.c @@ -1064,10 +1064,11 @@ rb_const_get(klass, id) VALUE klass; ID id; { - VALUE value; - VALUE tmp; + VALUE value, tmp; + int mod_retry = 0; tmp = klass; + retry: while (tmp) { if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) { return value; @@ -1075,8 +1076,10 @@ rb_const_get(klass, id) if (tmp == rb_cObject && top_const_get(id, &value)) return value; tmp = RCLASS(tmp)->super; } - if (BUILTIN_TYPE(klass) == T_MODULE) { - return rb_const_get(rb_cObject, id); + if (!mod_retry && BUILTIN_TYPE(klass) == T_MODULE) { + mod_retry = 1; + tmp = rb_cObject; + goto retry; } /* Uninitialized constant */ |