Module#class_variables should check superclasses

2529f1ed · Yukihiro "Matz" Matsumoto · a70419bc · 2529f1ed
Commit 2529f1ed authored Apr 20, 2013 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

src/variable.c src/variable.c +7 -2

No files found.
--- a/src/variable.c
+++ b/src/variable.c
@@ -668,10 +668,15 @@ mrb_value
 mrb_mod_class_variables(mrb_state *mrb, mrb_value mod)
 {
  mrb_value ary;
+  struct RClass *c;
  ary = mrb_ary_new(mrb);
-  if (obj_iv_p(mod) && mrb_obj_ptr(mod)->iv) {
+  c = mrb_obj_ptr(mod);
-    iv_foreach(mrb, mrb_obj_ptr(mod)->iv, cv_i, &ary);
+  while (c) {
+    if (c->iv) {
+      iv_foreach(mrb, c->iv, cv_i, &ary);
+    }
+    c = c->super;
  }
  return ary;
 }