merge revision(s) 35644:

	* parse.y (f_arglist): should reset lexical states after empty
	  argument list with no parenthesis as well as parenthesized list,
	  so that reserved name method definition work.  [ruby-dev:45626]
	  [Bug #6403]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d4ea06026..663a7655f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri May 25 17:18:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_arglist): should reset lexical states after empty
+	  argument list with no parenthesis as well as parenthesized list,
+	  so that reserved name method definition work.  [ruby-dev:45626]
+	  [Bug #6403]
+
 Fri May 25 10:40:31 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
 	* include/ruby/win32.h (FD_SET): change function to macro.
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index dcfdb09d80..215785a051 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -57,6 +57,11 @@ class TestSyntax < Test::Unit::TestCase
     assert_valid_syntax("def self; :foo; end", __FILE__, bug6403)
   end
 
+  def test_reserved_method_no_args
+    bug6403 = '[ruby-dev:45626]'
+    assert_valid_syntax("def self; :foo; end", __FILE__, bug6403)
+  end
+
   private
 
   def make_tmpsrc(f, src)
diff --git a/version.h b/version.h
index 110bc419a9..324ab77793 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 229
+#define RUBY_PATCHLEVEL 230
 
 #define RUBY_RELEASE_DATE "2012-05-25"
 #define RUBY_RELEASE_YEAR 2012