kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 66796,66797: [Backport #15525]

Browse source 
No TypeError at nil if exception: false

	[ruby-core:91021] [Bug #15525]

	No FloatDomainError at non-finitive number if exception: false

	[ruby-core:91021] [Bug #15525]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2019-01-18 04:19:32 +00:00
parent b9289589d6
commit 283b3d8f99
7 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
complex.c
View file

@ -1939,8 +1939,10 @@ to_complex(VALUE val)
static VALUE
nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
{
if (NIL_P(a1) || NIL_P(a2))
if (NIL_P(a1) || NIL_P(a2)) {
if (!raise) return Qnil;
rb_raise(rb_eTypeError, "can't convert nil into Complex");
}
if (RB_TYPE_P(a1, T_STRING)) {
a1 = string_to_c_strict(a1, raise);

1
object.c
View file

@ -3159,6 +3159,7 @@ rb_convert_to_integer(VALUE val, int base, int raise_exception)
double f;
if (base != 0) goto arg_error;
f = RFLOAT_VALUE(val);
if (!raise_exception && !isfinite(f)) return Qnil;
if (FIXABLE(f)) return LONG2FIX((long)f);
return rb_dbl2big(f);
}

4
rational.c
View file

@ -2561,8 +2561,10 @@ nurat_convert(VALUE klass, VALUE numv, VALUE denv, int raise)
VALUE a1 = numv, a2 = denv;
int state;
if (NIL_P(a1) || NIL_P(a2))
if (NIL_P(a1) || NIL_P(a2)) {
if (!raise) return Qnil;
rb_raise(rb_eTypeError, "can't convert nil into Rational");
}
if (RB_TYPE_P(a1, T_COMPLEX)) {
if (k_exact_zero_p(RCOMPLEX(a1)->imag))

6
test/ruby/test_complex.rb
View file

@ -863,9 +863,15 @@ class Complex_Test < Test::Unit::TestCase
assert_nothing_raised(ArgumentError){
assert_equal(nil, Complex('5x', exception: false))
}
assert_nothing_raised(ArgumentError){
assert_equal(nil, Complex(nil, exception: false))
}
assert_nothing_raised(ArgumentError){
assert_equal(nil, Complex(Object.new, exception: false))
}
assert_nothing_raised(ArgumentError){
assert_equal(nil, Complex(1, nil, exception: false))
}
assert_nothing_raised(ArgumentError){
assert_equal(nil, Complex(1, Object.new, exception: false))
}

9
test/ruby/test_integer.rb
View file

@ -175,6 +175,15 @@ class TestInteger < Test::Unit::TestCase
def o.to_int; raise; end
assert_equal(nil, Integer(o, exception: false))
}
assert_nothing_raised(FloatDomainError) {
assert_equal(nil, Integer(Float::INFINITY, exception: false))
}
assert_nothing_raised(FloatDomainError) {
assert_equal(nil, Integer(-Float::INFINITY, exception: false))
}
assert_nothing_raised(FloatDomainError) {
assert_equal(nil, Integer(Float::NAN, exception: false))
}
assert_raise(ArgumentError) {
Integer("1z", exception: true)

6
test/ruby/test_rational.rb
View file

@ -815,9 +815,15 @@ class Rational_Test < Test::Unit::TestCase
assert_nothing_raised(ZeroDivisionError) {
assert_equal(nil, Rational("1/0", exception: false))
}
assert_nothing_raised(TypeError) {
assert_equal(nil, Rational(nil, exception: false))
}
assert_nothing_raised(TypeError) {
assert_equal(nil, Rational(Object.new, exception: false))
}
assert_nothing_raised(TypeError) {
assert_equal(nil, Rational(1, nil, exception: false))
}
assert_nothing_raised(TypeError) {
assert_equal(nil, Rational(1, Object.new, exception: false))
}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.1"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 24
#define RUBY_PATCHLEVEL 25
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1