usa	2017-09-14 13:32:54 +0900 (Thu, 14 Sep 2017)

  New Revision: 59884

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59884

  Log:
    merge revision(s) 59375: [Backport #13756]
    
    parse.y: empty hash in defined
    
    * parse.y (command): NODE_ARRAY with NULL is invalid.  traversal
      in defined_expr0 is simplified than iseq_compile_each0.
      [ruby-core:82113] [Bug #13756]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/parse.y
    branches/ruby_2_3/test/ruby/test_syntax.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/parse.y
===================================================================
--- ruby_2_3/parse.y	(revision 59883)
+++ ruby_2_3/parse.y	(revision 59884)
@@ -2506,7 +2506,7 @@ call_args	: command https://github.com/ruby/ruby/blob/trunk/ruby_2_3/parse.y#L2506
 		| assocs opt_block_arg
 		    {
 		    /*%%%*/
-			$$ = NEW_LIST($1 ? new_hash($1) : 0);
+			$$ = $1 ? NEW_LIST(new_hash($1)) : 0;
 			$$ = arg_blk_pass($$, $2);
 		    /*%
 			$$ = arg_add_assocs(arg_new(), $1);
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 59883)
+++ ruby_2_3/ChangeLog	(revision 59884)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Sep 14 13:32:39 2017  Nobuyoshi Nakada  <nobu@r...>
+
+	parse.y: empty hash in defined
+
+	* parse.y (command): NODE_ARRAY with NULL is invalid.  traversal
+	  in defined_expr0 is simplified than iseq_compile_each0.
+	  [ruby-core:82113] [Bug #13756]
+
 Thu Sep 14 13:26:31 2017  Nobuyoshi Nakada  <nobu@r...>
 
 	string.c: fix false coderange
Index: ruby_2_3/test/ruby/test_syntax.rb
===================================================================
--- ruby_2_3/test/ruby/test_syntax.rb	(revision 59883)
+++ ruby_2_3/test/ruby/test_syntax.rb	(revision 59884)
@@ -155,10 +155,16 @@ class TestSyntax < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_syntax.rb#L155
   end
 
   def test_keyword_empty_splat
-    assert_separately([], <<-'end;')
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+    begin;
       bug10719 = '[ruby-core:67446] [Bug #10719]'
       assert_valid_syntax("foo(a: 1, **{})", bug10719)
     end;
+    assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
+    begin;
+      bug13756 = '[ruby-core:82113] [Bug #13756]'
+      assert_valid_syntax("defined? foo(**{})", bug13756)
+    end;
   end
 
   def test_keyword_self_reference
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 59883)
+++ ruby_2_3/version.h	(revision 59884)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-09-14"
-#define RUBY_PATCHLEVEL 374
+#define RUBY_PATCHLEVEL 375
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 59883)
+++ ruby_2_3	(revision 59884)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r59375

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