diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 3 | ||||
| -rw-r--r-- | vm_method.c | 6 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Thu May 21 15:37:32 2015 Zachary Scott <e@zzak.io> + + * vm_method.c: Remove private attribute warning [Bug #10967] + Patch by @spastorino [Fixes GH-849] + https://github.com/ruby/ruby/pull/849 + + * test/ruby/test_module.rb: Update test for changes + Thu May 21 10:59:43 2015 Koichi Sasada <ko1@atdot.net> * proc.c (method_proc): rename to method_to_proc. diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index f1ca0b7cc1..1171e3bc84 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -836,7 +836,7 @@ class TestModule < Test::Unit::TestCase end def test_attr - assert_in_out_err([], <<-INPUT, %w(:ok nil), /warning: private attribute\?$/) + assert_in_out_err([], <<-INPUT, %w(nil)) $VERBOSE = true c = Class.new c.instance_eval do @@ -844,7 +844,6 @@ class TestModule < Test::Unit::TestCase attr_reader :foo end o = c.new - o.foo rescue p(:ok) p(o.instance_eval { foo }) INPUT diff --git a/vm_method.c b/vm_method.c index c7caccb32f..853e66799e 100644 --- a/vm_method.c +++ b/vm_method.c @@ -917,9 +917,9 @@ rb_attr(VALUE klass, ID id, int read, int write, int ex) else { if (SCOPE_TEST(NOEX_PRIVATE)) { noex = NOEX_PRIVATE; - rb_warning((SCOPE_CHECK(NOEX_MODFUNC)) ? - "attribute accessor as module_function" : - "private attribute?"); + if (SCOPE_CHECK(NOEX_MODFUNC)) { + rb_warning("attribute accessor as module_function"); + } } else if (SCOPE_TEST(NOEX_PROTECTED)) { noex = NOEX_PROTECTED; |