ruby-changes:23740
From: naruse <ko1@a...>
Date: Fri, 25 May 2012 17:18:27 +0900 (JST)
Subject: [ruby-changes:23740] naruse:r35791 (ruby_1_9_3): merge revision(s) 35644:
naruse 2012-05-25 17:18:16 +0900 (Fri, 25 May 2012) New Revision: 35791 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35791 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/test/ruby/test_syntax.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 35790) +++ ruby_1_9_3/ChangeLog (revision 35791) @@ -1,3 +1,10 @@ +Fri May 25 17:18:06 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] + Fri May 25 10:40:31 2012 Hiroshi Shirosaki <h.shirosaki@g...> * include/ruby/win32.h (FD_SET): change function to macro. Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 35790) +++ ruby_1_9_3/version.h (revision 35791) @@ -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 Index: ruby_1_9_3/test/ruby/test_syntax.rb =================================================================== --- ruby_1_9_3/test/ruby/test_syntax.rb (revision 35790) +++ ruby_1_9_3/test/ruby/test_syntax.rb (revision 35791) @@ -57,6 +57,11 @@ 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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/