From 2de3281af4050913ae2c8e47f47c0cdb422a48d1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 14 Dec 2014 11:11:45 +0000
Subject: parse.y: warn reference after method definition

* parse.y (primary): restore current_arg so that circular
  reference after a method definition is also warned.
  [ruby-core:61299] [Bug #9593]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  6 ++++++
 parse.y                  |  4 ++++
 test/ruby/test_syntax.rb | 10 ++++++++++
 3 files changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0b104b70fa..3a47b885b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/parse.y b/parse.y
index 924ec57260..20345085b5 100644
--- a/parse.y
+++ b/parse.y
@@ -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
@@ -202,6 +202,16 @@ class TestSyntax < Test::Unit::TestCase
       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 = (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")
-- 
cgit v1.2.3