* variable.c (rb_mod_constants): when calling Module#constants with
inherit=false, there is no need to use a hashtable to deduplicate constant names. [Feature #9196] [ruby-core:58786] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
01b1f00461
commit
39a8519a56
@ -1,3 +1,9 @@
|
|||||||
|
Mon Dec 2 17:23:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
|
||||||
|
|
||||||
|
* variable.c (rb_mod_constants): when calling Module#constants with
|
||||||
|
inherit=false, there is no need to use a hashtable to deduplicate
|
||||||
|
constant names. [Feature #9196] [ruby-core:58786]
|
||||||
|
|
||||||
Mon Dec 2 14:16:52 2013 Eric Hodel <drbrain@segment7.net>
|
Mon Dec 2 14:16:52 2013 Eric Hodel <drbrain@segment7.net>
|
||||||
|
|
||||||
* lib/net/smtp.rb (Net::SMTP#critical): Always return a
|
* lib/net/smtp.rb (Net::SMTP#critical): Always return a
|
||||||
|
27
variable.c
27
variable.c
@ -1969,6 +1969,26 @@ sv_i(st_data_t k, st_data_t v, st_data_t a)
|
|||||||
return ST_CONTINUE;
|
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*
|
void*
|
||||||
rb_mod_const_at(VALUE mod, void *data)
|
rb_mod_const_at(VALUE mod, void *data)
|
||||||
{
|
{
|
||||||
@ -2037,7 +2057,6 @@ VALUE
|
|||||||
rb_mod_constants(int argc, VALUE *argv, VALUE mod)
|
rb_mod_constants(int argc, VALUE *argv, VALUE mod)
|
||||||
{
|
{
|
||||||
VALUE inherit;
|
VALUE inherit;
|
||||||
st_table *tbl;
|
|
||||||
|
|
||||||
if (argc == 0) {
|
if (argc == 0) {
|
||||||
inherit = Qtrue;
|
inherit = Qtrue;
|
||||||
@ -2045,13 +2064,13 @@ rb_mod_constants(int argc, VALUE *argv, VALUE mod)
|
|||||||
else {
|
else {
|
||||||
rb_scan_args(argc, argv, "01", &inherit);
|
rb_scan_args(argc, argv, "01", &inherit);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (RTEST(inherit)) {
|
if (RTEST(inherit)) {
|
||||||
tbl = rb_mod_const_of(mod, 0);
|
return rb_const_list(rb_mod_const_of(mod, 0));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
tbl = rb_mod_const_at(mod, 0);
|
return rb_local_constants(mod);
|
||||||
}
|
}
|
||||||
return rb_const_list(tbl);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
Loading…
x
Reference in New Issue
Block a user