summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-03 11:02:53 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-03 11:02:53 +0000
commit9d22a06ea06e9bec5030fd6e2c8481958fcd30d9 (patch)
tree58b15b4dc85acca1c806388ff3848a3c85fd0ebf /variable.c
parenta11ab83884c47f729a8630ab5ef21c7522b48386 (diff)
* array.c (rb_values_at): extract common procedure from
rb_ary_values_at. follow DRY principle. * re.c (match_values_at): values_at should understand ranges. * struct.c (rb_struct_values_at): ditto. * struct.c (inspect_struct): inspect format changed; add "struct " at the top. * sprintf.c (rb_f_sprintf): "%p" specifier for inspect output. (RCR#68) * eval.c (rb_mod_undef_method): allow "undef_method" to accept multiple arguments. (RCR#146) * lib/timeout.rb: put timeout in Timeout module. (RCR#121) [ruby-talk:61028] * re.c (match_groups): new method added. (RCR#139) * variable.c (rb_mod_const_of): should exclude constant defined in Object, unless retrieving constants of Object. * string.c (rb_str_new4): do not allocate new string if original is frozen or already have copy-on-write entry. [ruby-talk:74940] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/variable.c b/variable.c
index fcbc8cc..8b62aad 100644
--- a/variable.c
+++ b/variable.c
@@ -1387,10 +1387,12 @@ rb_mod_const_of(mod, data)
VALUE mod;
void *data;
{
+ VALUE tmp = mod;
for (;;) {
- data = rb_mod_const_at(mod, data);
- mod = RCLASS(mod)->super;
- if (!mod) break;
+ data = rb_mod_const_at(tmp, data);
+ tmp = RCLASS(tmp)->super;
+ if (!tmp) break;
+ if (tmp == rb_cObject && mod != rb_cObject) break;
}
return data;
}