archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) a28c5151f5: [Backport #19855]

Browse source 
Fix Array#bsearch when block returns a non-integer numeric value

	---
	 array.c                 | 4 ++--
	 test/ruby/test_array.rb | 4 ++++
	 2 files changed, 6 insertions(+), 2 deletions(-)
This commit is contained in:
U.Nakamura 2023-10-10 20:02:12 +09:00
parent 4153e807c5
commit eb54ed809f
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
array.c
View file

@ -3469,8 +3469,8 @@ rb_ary_bsearch_index(VALUE ary)
const VALUE zero = INT2FIX(0); const VALUE zero = INT2FIX(0);
switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) { switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) {
case 0: return INT2FIX(mid); case 0: return INT2FIX(mid);
case 1: smaller = 1; break; case 1: smaller = 0; break;
case -1: smaller = 0; case -1: smaller = 1;
} }
} }
else { else {

4
test/ruby/test_array.rb
View file

@ -3218,6 +3218,8 @@ class TestArray < Test::Unit::TestCase
assert_equal(nil, a.bsearch {|x| 1 * (2**100) }) assert_equal(nil, a.bsearch {|x| 1 * (2**100) })
assert_equal(nil, a.bsearch {|x| (-1) * (2**100) }) assert_equal(nil, a.bsearch {|x| (-1) * (2**100) })
assert_equal(4, a.bsearch {|x| (4 - x).to_r })
assert_include([4, 7], a.bsearch {|x| (2**100).coerce((1 - x / 4) * (2**100)).first }) assert_include([4, 7], a.bsearch {|x| (2**100).coerce((1 - x / 4) * (2**100)).first })
end end
@ -3253,6 +3255,8 @@ class TestArray < Test::Unit::TestCase
assert_equal(nil, a.bsearch_index {|x| 1 * (2**100) }) assert_equal(nil, a.bsearch_index {|x| 1 * (2**100) })
assert_equal(nil, a.bsearch_index {|x| (-1) * (2**100) }) assert_equal(nil, a.bsearch_index {|x| (-1) * (2**100) })
assert_equal(1, a.bsearch_index {|x| (4 - x).to_r })
assert_include([1, 2], a.bsearch_index {|x| (2**100).coerce((1 - x / 4) * (2**100)).first }) assert_include([1, 2], a.bsearch_index {|x| (2**100).coerce((1 - x / 4) * (2**100)).first })
end end

6
version.h
View file

@ -11,11 +11,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4 #define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 239 #define RUBY_PATCHLEVEL 240
#define RUBY_RELEASE_YEAR 2023 #define RUBY_RELEASE_YEAR 2023
#define RUBY_RELEASE_MONTH 9 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 19 #define RUBY_RELEASE_DAY 10
#include "ruby/version.h" #include "ruby/version.h"