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

[Bug #19977] Fix (nil..nil) === x not to raise TypeError

Browse Source
This commit is contained in:
Kouhei Yanagita 2023-10-29 14:57:50 +09:00 committed by Nobuyoshi Nakada
parent f263e44746
commit e8639098ed
2 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
range.c
View File

@ -1844,7 +1844,6 @@ range_inspect(VALUE range)
}
static VALUE range_include_internal(VALUE range, VALUE val);
static VALUE range_string_cover_internal(VALUE range, VALUE val);
VALUE rb_str_include_range_p(VALUE beg, VALUE end, VALUE val, VALUE exclusive);
/*
@ -1889,8 +1888,6 @@ VALUE rb_str_include_range_p(VALUE beg, VALUE end, VALUE val, VALUE exclusive);
static VALUE
range_eqq(VALUE range, VALUE val)
{
VALUE ret = range_string_cover_internal(range, val);
if (!UNDEF_P(ret)) return ret;
return r_cover_p(range, RANGE_BEG(range), RANGE_END(range), val);
}
@ -1939,12 +1936,6 @@ range_integer_edge_p(VALUE beg, VALUE end)
!NIL_P(rb_check_to_integer(end, "to_int")));
}
static inline bool
range_string_edge_p(VALUE beg, VALUE end)
{
return RB_TYPE_P(beg, T_STRING) || RB_TYPE_P(end, T_STRING);
}
static inline bool
range_string_range_p(VALUE beg, VALUE end)
{
@ -1965,48 +1956,6 @@ range_include_fallback(VALUE beg, VALUE end, VALUE val)
return Qundef;
}
static VALUE
range_string_cover_internal(VALUE range, VALUE val)
{
VALUE beg = RANGE_BEG(range);
VALUE end = RANGE_END(range);
int nv = FIXNUM_P(beg) || FIXNUM_P(end) ||
linear_object_p(beg) || linear_object_p(end);
if (nv || range_integer_edge_p(beg, end)) {
return r_cover_p(range, beg, end, val);
}
else if (range_string_edge_p(beg, end)) {
if (range_string_range_p(beg, end)) {
return r_cover_p(range, beg, end, val);
}
if (NIL_P(beg)) {
unbounded_begin:;
VALUE r = rb_funcall(val, id_cmp, 1, end);
if (NIL_P(r)) return Qfalse;
if (RANGE_EXCL(range)) {
return RBOOL(rb_cmpint(r, val, end) < 0);
}
return RBOOL(rb_cmpint(r, val, end) <= 0);
}
else if (NIL_P(end)) {
unbounded_end:;
VALUE r = rb_funcall(beg, id_cmp, 1, val);
if (NIL_P(r)) return Qfalse;
return RBOOL(rb_cmpint(r, beg, val) <= 0);
}
}
if (!NIL_P(beg) && NIL_P(end)) {
goto unbounded_end;
}
if (NIL_P(beg) && !NIL_P(end)) {
goto unbounded_begin;
}
return range_include_fallback(beg, end, val);
}
static VALUE
range_include_internal(VALUE range, VALUE val)
{

4
test/ruby/test_range.rb
View File

@ -726,6 +726,8 @@ class TestRange < Test::Unit::TestCase
assert_not_operator(5..nil, :===, 0)
assert_operator(nil..10, :===, 0)
assert_operator(nil..nil, :===, 0)
assert_operator(nil..nil, :===, Object.new)
assert_not_operator(0..10, :===, 0..10)
end
def test_eqq_string
@ -733,7 +735,7 @@ class TestRange < Test::Unit::TestCase
assert_not_operator('A'..'Z', :===, 'ana')
assert_operator('A'.., :===, 'ANA')
assert_operator(..'Z', :===, 'ANA')
assert_raise(TypeError) {(nil..nil) === 'ANA'}
assert_operator(nil..nil, :===, 'ANA')
end
def test_eqq_time