diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 13 |
3 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Jan 17 17:58:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (rb_mod_s_constants): return its own constants for other + than Module itself. [ruby-core:59763] [Bug #9413] + Tue Jan 16 00:17:00 2014 Kenta Murata <mrkn@mrkn.jp> * ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.5. @@ -378,8 +378,8 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod) VALUE cbase = 0; void *data = 0; - if (argc > 0) { - return rb_mod_constants(argc, argv, rb_cModule); + if (argc > 0 || mod != rb_cModule) { + return rb_mod_constants(argc, argv, mod); } while (cref) { diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 4f834f0c1e..ba6f273159 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -866,6 +866,19 @@ class TestModule < Test::Unit::TestCase m.instance_eval { remove_const(:Foo) } end + class Bug9413 + class << self + Foo = :foo + end + end + + def test_singleton_constants + bug9413 = '[ruby-core:59763] [Bug #9413]' + c = Bug9413.singleton_class + assert_include(c.constants(true), :Foo, bug9413) + assert_include(c.constants(false), :Foo, bug9413) + end + def test_frozen_class m = Module.new m.freeze |