summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-28 08:35:43 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-28 08:35:43 +0000
commit11f521b98e276262e140f1a40469c910267a7021 (patch)
treeb9ad7da5bbcebfbad27eb7a976989636ef110a59 /variable.c
parentb89299260ee0e70473cf43a14264f14776f8d95f (diff)
* variable.c (rb_const_get_0): should check constants defined in
included modules, if klass is Object. [ruby-talk:79302] * numeric.c (check_uint): check should be done using UINT_MAX, not INT_MAX. this fix is submitted by <lyle@knology.net> in [ruby-core:01486] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c33
1 files changed, 13 insertions, 20 deletions
diff --git a/variable.c b/variable.c
index d8e115a..d182a70 100644
--- a/variable.c
+++ b/variable.c
@@ -1264,28 +1264,12 @@ rb_autoload_p(mod, id)
return autoload_file(mod, id);
}
-VALUE
-rb_const_get_at(klass, id)
- VALUE klass;
- ID id;
-{
- VALUE value;
-
- while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &value)) {
- if (value == Qundef) {
- rb_autoload_load(klass, id);
- continue;
- }
- return value;
- }
- return const_missing(klass, id);
-}
-
static VALUE
-rb_const_get_0(klass, id, exclude)
+rb_const_get_0(klass, id, exclude, recurse)
VALUE klass;
ID id;
int exclude;
+ int recurse;
{
VALUE value, tmp;
int mod_retry = 0;
@@ -1304,6 +1288,7 @@ rb_const_get_0(klass, id, exclude)
}
return value;
}
+ if (!recurse && klass != rb_cObject) break;
tmp = RCLASS(tmp)->super;
}
if (!mod_retry && BUILTIN_TYPE(klass) == T_MODULE) {
@@ -1320,7 +1305,7 @@ rb_const_get_from(klass, id)
VALUE klass;
ID id;
{
- return rb_const_get_0(klass, id, Qtrue);
+ return rb_const_get_0(klass, id, Qtrue, Qtrue);
}
VALUE
@@ -1328,7 +1313,15 @@ rb_const_get(klass, id)
VALUE klass;
ID id;
{
- return rb_const_get_0(klass, id, Qfalse);
+ return rb_const_get_0(klass, id, Qfalse, Qtrue);
+}
+
+VALUE
+rb_const_get_at(klass, id)
+ VALUE klass;
+ ID id;
+{
+ return rb_const_get_0(klass, id, Qfalse, Qfalse);
}
VALUE