merge revision(s) da4464b: [Backport #19426]

hsbt · hsbt · commit 469a0a4a08dc · 2025-03-13T14:27:06.000+09:00
[Bug #19426] Fix endless `Range#step` with `#succ` method
diff --git a/range.c b/range.c
@@ -532,7 +532,11 @@ range_step(int argc, VALUE *argv, VALUE range)
                 rb_raise(rb_eTypeError, "can't iterate from %s",
                          rb_obj_classname(b));
             }
-            range_each_func(range, step_i, (VALUE)iter);
+            if (!NIL_P(e))
+                range_each_func(range, step_i, (VALUE)iter);
+            else
+                for (;; b = rb_funcallv(b, id_succ, 0, 0))
+                    step_i(b, (VALUE)iter);
         }
     }
     return range;
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
@@ -393,6 +393,26 @@ def test_step_ruby_core_35753
     assert_equal(4, (1.0...5.6).step(1.5).to_a.size)
   end
 
+  def test_step_with_succ
+    c = Struct.new(:i) do
+      def succ; self.class.new(i+1); end
+      def <=>(other) i <=> other.i;end
+    end.new(0)
+
+    result = []
+    (c..c.succ).step(2) do |d|
+      result << d.i
+    end
+    assert_equal([0], result)
+
+    result = []
+    (c..).step(2) do |d|
+      result << d.i
+      break if d.i >= 4
+    end
+    assert_equal([0, 2, 4], result)
+  end
+
   def test_each
     a = []
     (0..10).each {|x| a << x }
@@ -457,6 +477,26 @@ def <=>(other) to_str <=> other end
     assert_equal(["a", "b", "c"], a)
   end
 
+  def test_each_with_succ
+    c = Struct.new(:i) do
+      def succ; self.class.new(i+1); end
+      def <=>(other) i <=> other.i;end
+    end.new(0)
+
+    result = []
+    (c..c.succ).each do |d|
+      result << d.i
+    end
+    assert_equal([0, 1], result)
+
+    result = []
+    (c..).each do |d|
+      result << d.i
+      break if d.i >= 4
+    end
+    assert_equal([0, 1, 2, 3, 4], result)
+  end
+
   def test_begin_end
     assert_equal(0, (0..1).begin)
     assert_equal(1, (0..1).end)
diff --git a/version.h b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 261
+#define RUBY_PATCHLEVEL 262
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,11 @@ range_step(int argc, VALUE *argv, VALUE range)`
`532`	`532`	`rb_raise(rb_eTypeError, "can't iterate from %s",`
`533`	`533`	`rb_obj_classname(b));`
`534`	`534`	`}`
`535`		`- range_each_func(range, step_i, (VALUE)iter);`
	`535`	`+ if (!NIL_P(e))`
	`536`	`+ range_each_func(range, step_i, (VALUE)iter);`
	`537`	`+ else`
	`538`	`+ for (;; b = rb_funcallv(b, id_succ, 0, 0))`
	`539`	`+ step_i(b, (VALUE)iter);`
`536`	`540`	`}`
`537`	`541`	`}`
`538`	`542`	`return range;`