From d4ae6052404886fd0ee60ecca23af1e8f914b571 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 26 Jun 2004 06:17:20 +0000 Subject: * variable.c (rb_mod_class_variables): class variables are no longer inherited. [ruby-dev:23808] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- variable.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'variable.c') diff --git a/variable.c b/variable.c index cb972ba81d..6d4ccd2c53 100644 --- a/variable.c +++ b/variable.c @@ -1800,8 +1800,7 @@ cv_i(key, value, ary) * call-seq: * mod.class_variables => array * - * Returns an array of the names of class variables in mod and - * the ancestors of mod. + * Returns an array of the names of class variables in mod. * * class One * @@var1 = 1 @@ -1810,7 +1809,7 @@ cv_i(key, value, ary) * @@var2 = 2 * end * One.class_variables #=> ["@@var1"] - * Two.class_variables #=> ["@@var2", "@@var1"] + * Two.class_variables #=> ["@@var2"] */ VALUE @@ -1819,12 +1818,8 @@ rb_mod_class_variables(obj) { VALUE ary = rb_ary_new(); - for (;;) { - if (RCLASS(obj)->iv_tbl) { - st_foreach(RCLASS(obj)->iv_tbl, cv_i, ary); - } - obj = RCLASS(obj)->super; - if (!obj) break; + if (RCLASS(obj)->iv_tbl) { + st_foreach(RCLASS(obj)->iv_tbl, cv_i, ary); } return ary; } -- cgit v1.2.3