naruse	2012-05-25 10:36:52 +0900 (Fri, 25 May 2012)

  New Revision: 35781

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35781

  Log:
    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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/parse.y
    branches/ruby_1_9_3/test/ruby/test_syntax.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35780)
+++ ruby_1_9_3/ChangeLog	(revision 35781)
@@ -1,3 +1,10 @@
+Fri May 25 10:36:38 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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]
+
 Mon May 21 16:24:40 2012  Akinori MUSHA  <knu@i...>
 
 	* ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().
Index: ruby_1_9_3/parse.y
===================================================================
--- ruby_1_9_3/parse.y	(revision 35780)
+++ ruby_1_9_3/parse.y	(revision 35781)
@@ -4374,6 +4374,8 @@
 		| f_args term
 		    {
 			$$ = $1;
+			lex_state = EXPR_BEG;
+			command_start = TRUE;
 		    }
 		;
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35780)
+++ ruby_1_9_3/version.h	(revision 35781)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 226
+#define RUBY_PATCHLEVEL 227
 
-#define RUBY_RELEASE_DATE "2012-05-21"
+#define RUBY_RELEASE_DATE "2012-05-25"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ruby/test_syntax.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_syntax.rb	(revision 35780)
+++ ruby_1_9_3/test/ruby/test_syntax.rb	(revision 35781)
@@ -52,6 +52,11 @@
     f.close!
   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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/