diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-03 01:02:15 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-03 01:02:15 +0000 |
commit | b0616346f8098d0f2063c48ee61c09eb2ddc851e (patch) | |
tree | adcbfe02df54f0815c1b296d174ba9ebf1b743df | |
parent | 06cb32001ff6825d733ed00029f3f1f68d672faf (diff) | |
download | ruby-b0616346f8098d0f2063c48ee61c09eb2ddc851e.tar.gz |
range.c: covered for linear objects
* range.c (linear_object_p, range_include): test if covered for
linear objects. [ruby-core:69052] [Bug #11113]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | range.c | 18 | ||||
-rw-r--r-- | test/ruby/test_range.rb | 8 |
3 files changed, 29 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun May 3 10:02:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * range.c (linear_object_p, range_include): test if covered for + linear objects. [ruby-core:69052] [Bug #11113] + Fri May 1 13:30:24 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * dln.c (dln_load): check if a different libruby is loaded by the @@ -331,6 +331,21 @@ discrete_object_p(VALUE obj) return rb_respond_to(obj, id_succ); } +static int +linear_object_p(VALUE obj) +{ + if (FIXNUM_P(obj) || FLONUM_P(obj)) return TRUE; + if (SPECIAL_CONST_P(obj)) return FALSE; + switch (BUILTIN_TYPE(obj)) { + case T_FLOAT: + case T_BIGNUM: + return TRUE; + } + if (rb_obj_is_kind_of(obj, rb_cNumeric)) return TRUE; + if (rb_obj_is_kind_of(obj, rb_cTime)) return TRUE; + return FALSE; +} + static VALUE range_step_size(VALUE range, VALUE args, VALUE eobj) { @@ -1156,8 +1171,7 @@ range_include(VALUE range, VALUE val) VALUE beg = RANGE_BEG(range); VALUE end = RANGE_END(range); int nv = FIXNUM_P(beg) || FIXNUM_P(end) || - rb_obj_is_kind_of(beg, rb_cNumeric) || - rb_obj_is_kind_of(end, rb_cNumeric); + linear_object_p(beg) || linear_object_p(end); if (nv || !NIL_P(rb_check_to_integer(beg, "to_int")) || diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index dc07a59fcd..791764b355 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -283,6 +283,14 @@ class TestRange < Test::Unit::TestCase assert_not_operator(0..10, :===, 11) end + def test_eqq_time + bug11113 = '[ruby-core:69052] [Bug #11113]' + t = Time.now + assert_nothing_raised(TypeError, bug11113) { + assert_operator(t..(t+10), :===, t+5) + } + end + def test_include assert_include("a".."z", "c") assert_not_include("a".."z", "5") |