nagachika	2015-11-29 16:29:09 +0900 (Sun, 29 Nov 2015)

  New Revision: 52783

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

  Log:
    merge revision(s) 51190: [Backport #11338]
    
    * iseq.c (iseq_data_to_ary): dump kw_arg as symbol
    
    * test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
      [ruby-core:69891] [Bug #11338]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/iseq.c
    branches/ruby_2_2/test/-ext-/iseq_load/test_iseq_load.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52782)
+++ ruby_2_2/ChangeLog	(revision 52783)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun Nov 29 16:11:32 2015  Eric Wong  <e@8...>
+
+	* iseq.c (iseq_data_to_ary): dump kw_arg as symbol
+	* test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
+	  [ruby-core:69891] [Bug #11338]
+
 Sun Nov 29 02:55:56 2015  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* gc.c (__has_feature): move into internal.h.
Index: ruby_2_2/iseq.c
===================================================================
--- ruby_2_2/iseq.c	(revision 52782)
+++ ruby_2_2/iseq.c	(revision 52783)
@@ -1834,7 +1834,7 @@ iseq_data_to_ary(rb_iseq_t *iseq) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/iseq.c#L1834
 
 			orig_argc -= ci->kw_arg->keyword_len;
 			for (i = 0; i < ci->kw_arg->keyword_len; i++) {
-			    rb_ary_push(kw, ID2SYM(ci->kw_arg->keywords[i]));
+			    rb_ary_push(kw, ci->kw_arg->keywords[i]);
 			}
 			rb_hash_aset(e, ID2SYM(rb_intern("kw_arg")), kw);
 		    }
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52782)
+++ ruby_2_2/version.h	(revision 52783)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-11-29"
-#define RUBY_PATCHLEVEL 208
+#define RUBY_PATCHLEVEL 209
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_2/test/-ext-/iseq_load/test_iseq_load.rb
===================================================================
--- ruby_2_2/test/-ext-/iseq_load/test_iseq_load.rb	(revision 52782)
+++ ruby_2_2/test/-ext-/iseq_load/test_iseq_load.rb	(revision 52783)
@@ -74,6 +74,15 @@ class TestIseqLoad < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/-ext-/iseq_load/test_iseq_load.rb#L74
     end;
   end
 
+  def test_kwarg
+    assert_iseq_roundtrip <<-'end;'
+      def foo(kwarg: :foo)
+        kwarg
+      end
+      foo(kwarg: :bar)
+    end;
+  end
+
   # FIXME: still failing
   def test_require_integration
     skip "iseq loader require integration tests still failing"

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51190


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