nagachika	2013-03-09 21:39:11 +0900 (Sat, 09 Mar 2013)

  New Revision: 39655

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

  Log:
    merge revision(s) 39359:
    
    Add test for [Backport #7896] [ruby-core:52607]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ext/-test-/iter/break.c
    branches/ruby_2_0_0/test/-ext-/iter/test_iter_break.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ext/-test-/iter/break.c
===================================================================
--- ruby_2_0_0/ext/-test-/iter/break.c	(revision 39654)
+++ ruby_2_0_0/ext/-test-/iter/break.c	(revision 39655)
@@ -1,6 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/-test-/iter/break.c#L1
 #include <ruby.h>
 
 static VALUE
+iter_break(VALUE self)
+{
+    rb_iter_break();
+
+    UNREACHABLE;
+}
+
+static VALUE
 iter_break_value(VALUE self, VALUE val)
 {
     rb_iter_break_value(val);
@@ -12,5 +20,6 @@ void https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/-test-/iter/break.c#L20
 Init_break(void)
 {
     VALUE breakable = rb_define_module_under(rb_define_module("Bug"), "Breakable");
-    rb_define_module_function(breakable, "iter_break", iter_break_value, 1);
+    rb_define_module_function(breakable, "iter_break", iter_break, 0);
+    rb_define_module_function(breakable, "iter_break_value", iter_break_value, 1);
 }
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39654)
+++ ruby_2_0_0/version.h	(revision 39655)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 24
+#define RUBY_PATCHLEVEL 25
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/test/-ext-/iter/test_iter_break.rb
===================================================================
--- ruby_2_0_0/test/-ext-/iter/test_iter_break.rb	(revision 39654)
+++ ruby_2_0_0/test/-ext-/iter/test_iter_break.rb	(revision 39655)
@@ -3,7 +3,10 @@ require '-test-/iter/break' https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/-ext-/iter/test_iter_break.rb#L3
 
 class TestIterBreak < Test::Unit::TestCase
   def test_iter_break
+    backport7896 = '[ruby-core:52607]'
+    assert_equal(nil, 1.times{Bug::Breakable.iter_break}, backport7896)
+
     feature5895 = '[ruby-dev:45132]'
-    assert_equal(42, 1.times{Bug::Breakable.iter_break(42)}, feature5895)
+    assert_equal(42, 1.times{Bug::Breakable.iter_break_value(42)}, feature5895)
   end
 end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39359


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