diff options
| -rw-r--r-- | parse.y | 7 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 40 |
2 files changed, 46 insertions, 1 deletions
@@ -8733,7 +8733,12 @@ gettable_gen(struct parser_params *parser, ID id) } switch (id_type(id)) { case ID_LOCAL: - if (dyna_in_block() && dvar_defined(id)) return NEW_DVAR(id); + if (dyna_in_block() && dvar_defined(id)) { + if (id == current_arg) { + rb_warnV("circular argument reference - %"PRIsVALUE, rb_id2str(id)); + } + return NEW_DVAR(id); + } if (local_id(id)) { if (id == current_arg) { rb_warnV("circular argument reference - %"PRIsVALUE, rb_id2str(id)); diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 2da7797b47..55af33fe48 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -151,6 +151,26 @@ class TestSyntax < Test::Unit::TestCase o.instance_eval("def foo(var: var) var end") end assert_nil(o.foo, bug9593) + + o = Object.new + assert_warn(/circular argument reference - var/) do + o.instance_eval("def foo(var: bar(var)) var end") + end + + o = Object.new + assert_warn(/circular argument reference - var/) do + o.instance_eval("def foo(var: bar {var}) var end") + end + + o = Object.new + assert_warn("") do + o.instance_eval("def foo(var: bar {|var| var}) var end") + end + + o = Object.new + assert_warn("") do + o.instance_eval("def foo(var: def bar(var) var; end) var end") + end end def test_optional_self_reference @@ -167,6 +187,26 @@ class TestSyntax < Test::Unit::TestCase o.instance_eval("def foo(var = var) var end") end assert_nil(o.foo, bug9593) + + o = Object.new + assert_warn(/circular argument reference - var/) do + o.instance_eval("def foo(var = bar(var)) var end") + end + + o = Object.new + assert_warn(/circular argument reference - var/) do + o.instance_eval("def foo(var = bar {var}) var end") + end + + o = Object.new + assert_warn("") do + o.instance_eval("def foo(var = bar {|var| var}) var end") + end + + o = Object.new + assert_warn("") do + o.instance_eval("def foo(var = def bar(var) var; end) var end") + end end def test_warn_grouped_expression |