diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 10 |
3 files changed, 20 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sun Dec 14 20:11:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (primary): restore current_arg so that circular + reference after a method definition is also warned. + [ruby-core:61299] [Bug #9593] + Sat Dec 13 20:41:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_trace.c (rb_postponed_job_flush): mask signal trap interrupt @@ -3027,12 +3027,15 @@ primary : literal %*/ local_pop(); in_def--; + current_arg = $<id>3; } | k_def singleton dot_or_colon {lex_state = EXPR_FNAME;} fname { in_single++; lex_state = EXPR_ENDFN; /* force for args */ local_push(0); + $<id>$ = current_arg; + current_arg = 0; } f_arglist bodystmt @@ -3048,6 +3051,7 @@ primary : literal %*/ local_pop(); in_single--; + current_arg = $<id>6; } | keyword_break { diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 38799a841e..eb63e3dfa7 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -203,6 +203,16 @@ class TestSyntax < Test::Unit::TestCase end o = Object.new + assert_warn(/circular argument reference - var/) do + o.instance_eval("def foo(var = (def bar;end; var)) var end") + end + + o = Object.new + assert_warn(/circular argument reference - var/) do + o.instance_eval("def foo(var = (def self.bar;end; var)) var end") + end + + o = Object.new assert_warn("") do o.instance_eval("def foo(var = bar {|var| var}) var end") end |