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

merge revision(s) 50421: [Backport #11113]

Browse source 
* 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/branches/ruby_2_1@50581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-05-21 05:05:56 +00:00
parent 137514a399
commit 7a03d4637c
4 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu May 21 14:04:06 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]
Thu May 21 14:01:40 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> Thu May 21 14:01:40 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* rational.c: Added documentation for rational literal. * rational.c: Added documentation for rational literal.

18
range.c
View file

@ -329,6 +329,21 @@ discrete_object_p(VALUE obj)
return rb_respond_to(obj, id_succ); 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 static VALUE
range_step_size(VALUE range, VALUE args, VALUE eobj) range_step_size(VALUE range, VALUE args, VALUE eobj)
{ {
@ -1148,8 +1163,7 @@ range_include(VALUE range, VALUE val)
VALUE beg = RANGE_BEG(range); VALUE beg = RANGE_BEG(range);
VALUE end = RANGE_END(range); VALUE end = RANGE_END(range);
int nv = FIXNUM_P(beg) || FIXNUM_P(end) || int nv = FIXNUM_P(beg) || FIXNUM_P(end) ||
rb_obj_is_kind_of(beg, rb_cNumeric) || linear_object_p(beg) || linear_object_p(end);
rb_obj_is_kind_of(end, rb_cNumeric);
if (nv || if (nv ||
!NIL_P(rb_check_to_integer(beg, "to_int")) || !NIL_P(rb_check_to_integer(beg, "to_int")) ||

8
test/ruby/test_range.rb
View file

@ -278,6 +278,14 @@ class TestRange < Test::Unit::TestCase
assert_not_operator(0..10, :===, 11) assert_not_operator(0..10, :===, 11)
end 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 def test_include
assert_include("a".."z", "c") assert_include("a".."z", "c")
assert_not_include("a".."z", "5") assert_not_include("a".."z", "5")

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.7" #define RUBY_VERSION "2.1.7"
#define RUBY_RELEASE_DATE "2015-05-21" #define RUBY_RELEASE_DATE "2015-05-21"
#define RUBY_PATCHLEVEL 353 #define RUBY_PATCHLEVEL 354
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5