diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 5 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Mar 31 14:50:25 2011 Shugo Maeda <shugo@ruby-lang.org> + + * eval.c (rb_mod_s_constants): should ignore crefs with + the NODE_FL_CREF_PUSHED_BY_EVAL flag. + Wed Mar 30 22:55:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * misc/ruby-mode.el (ruby-toggle-block): toggle do/end and {}. @@ -322,7 +322,8 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod) while (cref) { klass = cref->nd_clss; - if (!NIL_P(klass)) { + if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) && + !NIL_P(klass)) { data = rb_mod_const_at(cref->nd_clss, data); if (!cbase) { cbase = klass; diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 3373594fe3..6a7f566ac7 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -403,6 +403,11 @@ class TestModule < Test::Unit::TestCase p Module.constants - ary, Module.constants(true), Module.constants(false) INPUT assert_in_out_err([], src, %w([:M] [:WALTER] []), []) + + klass = Class.new do + const_set(:X, 123) + end + assert_equal(false, klass.class_eval { Module.constants }.include?(:X)) end module M1 |