1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug #20324] Uncomparable ranges are not overlapping

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-03-04 21:02:08 +09:00
parent ef5af32799
commit b176315827
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
range.c
View File

@ -2373,8 +2373,16 @@ range_overlap(VALUE range, VALUE other)
if (empty_region_p(self_beg, other_end, other_excl)) return Qfalse;
if (empty_region_p(other_beg, self_end, self_excl)) return Qfalse;
/* if both begin values are equal, no more comparisons needed */
if (rb_equal(self_beg, other_beg)) return Qtrue;
if (!NIL_P(self_beg) && !NIL_P(other_beg)) {
VALUE cmp = rb_funcall(self_beg, id_cmp, 1, other_beg);
if (NIL_P(cmp)) return Qfalse;
/* if both begin values are equal, no more comparisons needed */
if (rb_cmpint(cmp, self_beg, other_beg) == 0) return Qtrue;
}
else if (NIL_P(self_beg) && NIL_P(other_beg)) {
VALUE cmp = rb_funcall(self_end, id_cmp, 1, other_end);
return RBOOL(!NIL_P(cmp));
}
if (empty_region_p(self_beg, self_end, self_excl)) return Qfalse;
if (empty_region_p(other_beg, other_end, other_excl)) return Qfalse;

2
test/ruby/test_range.rb
View File

@ -1265,6 +1265,8 @@ class TestRange < Test::Unit::TestCase
assert_operator(0.., :overlap?, 1..)
assert_not_operator((1..3), :overlap?, ('a'..'d'))
assert_not_operator((1..), :overlap?, ('a'..))
assert_not_operator((..1), :overlap?, (..'a'))
assert_raise(TypeError) { (0..).overlap?(1) }
assert_raise(TypeError) { (0..).overlap?(nil) }