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

[Bug #20725] Should not call compare on nil-endpoint

Browse Source 
It means unbounded, always inclusive of other ranges.
This commit is contained in:
Nobuyoshi Nakada 2024-09-13 10:50:38 +09:00
parent 0f3dc2f958
commit 24493779b7
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2024-09-13 10:38:00 +00:00 
Merged: https://github.com/ruby/ruby/pull/11609
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
range.c
View File

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

1
test/ruby/test_range.rb
View File

@ -1471,6 +1471,7 @@ class TestRange < Test::Unit::TestCase
assert_operator((..3), :overlap?, (3..)) assert_operator((..3), :overlap?, (3..))
assert_operator((nil..nil), :overlap?, (3..)) assert_operator((nil..nil), :overlap?, (3..))
assert_operator((nil...nil), :overlap?, (nil..)) assert_operator((nil...nil), :overlap?, (nil..))
assert_operator((nil..nil), :overlap?, (..3))
assert_raise(TypeError) { (1..3).overlap?(1) } assert_raise(TypeError) { (1..3).overlap?(1) }