diff options
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/variable.c b/variable.c index a1bb36e088..c65fdcb423 100644 --- a/variable.c +++ b/variable.c @@ -1969,6 +1969,26 @@ sv_i(st_data_t k, st_data_t v, st_data_t a) return ST_CONTINUE; } +static int +rb_local_constants_i(st_data_t const_name, st_data_t const_value, st_data_t ary) +{ + rb_ary_push((VALUE)ary, ID2SYM((ID)const_name)); + return ST_CONTINUE; +} + +static VALUE +rb_local_constants(VALUE mod) +{ + st_table *tbl = RCLASS_CONST_TBL(mod); + VALUE ary; + + if (!tbl) return rb_ary_new2(0); + + ary = rb_ary_new2(tbl->num_entries); + st_foreach(tbl, rb_local_constants_i, ary); + return ary; +} + void* rb_mod_const_at(VALUE mod, void *data) { @@ -2037,7 +2057,6 @@ VALUE rb_mod_constants(int argc, VALUE *argv, VALUE mod) { VALUE inherit; - st_table *tbl; if (argc == 0) { inherit = Qtrue; @@ -2045,13 +2064,13 @@ rb_mod_constants(int argc, VALUE *argv, VALUE mod) else { rb_scan_args(argc, argv, "01", &inherit); } + if (RTEST(inherit)) { - tbl = rb_mod_const_of(mod, 0); + return rb_const_list(rb_mod_const_of(mod, 0)); } else { - tbl = rb_mod_const_at(mod, 0); + return rb_local_constants(mod); } - return rb_const_list(tbl); } static int |