1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* variable.c (rb_mod_class_variables): class variables are no longer

Browse Source 
inherited.  [ruby-dev:23808]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-06-26 06:17:20 +00:00
parent 11fa3bf8c7
commit d4ae605240
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jun 26 15:17:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_mod_class_variables): class variables are no longer
inherited. [ruby-dev:23808]
Sat Jun 26 11:07:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 26 11:07:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (aix): -b must come at the start of the command line, * configure.in (aix): -b must come at the start of the command line,

9
variable.c
View File

@ -1800,8 +1800,7 @@ cv_i(key, value, ary)
* call-seq: * call-seq:
* mod.class_variables => array * mod.class_variables => array
* *
* Returns an array of the names of class variables in <i>mod</i> and * Returns an array of the names of class variables in <i>mod</i>.
* the ancestors of <i>mod</i>.
* *
* class One * class One
* @@var1 = 1 * @@var1 = 1
@ -1810,7 +1809,7 @@ cv_i(key, value, ary)
* @@var2 = 2 * @@var2 = 2
* end * end
* One.class_variables #=> ["@@var1"] * One.class_variables #=> ["@@var1"]
* Two.class_variables #=> ["@@var2", "@@var1"] * Two.class_variables #=> ["@@var2"]
*/ */
VALUE VALUE
@ -1819,13 +1818,9 @@ rb_mod_class_variables(obj)
{ {
VALUE ary = rb_ary_new(); VALUE ary = rb_ary_new();
for (;;) {
if (RCLASS(obj)->iv_tbl) { if (RCLASS(obj)->iv_tbl) {
st_foreach(RCLASS(obj)->iv_tbl, cv_i, ary); st_foreach(RCLASS(obj)->iv_tbl, cv_i, ary);
} }
obj = RCLASS(obj)->super;
if (!obj) break;
}
return ary; return ary;
} }