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

Fix ArithmeticSequence#last and ArithmeticSequence#each for non-integer sequences (#3870)

Browse source 
[Bug #17218]
[ruby-core:100312]
This commit is contained in:
Kenta Murata 2020-12-09 18:48:59 +09:00 • committed by GitHub
parent cacdf2681d
commit fad3023e94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2020-12-09 18:49:23 +09:00 
Merged-By: mrkn <mrkn@ruby-lang.org>
7 changed files with 156 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rational.c
View file

@ -894,8 +894,8 @@ rb_rational_mul(VALUE self, VALUE other)
* Rational(9, 8) / 4 #=> (9/32)
* Rational(20, 9) / 9.8 #=> 0.22675736961451246
*/
static VALUE
nurat_div(VALUE self, VALUE other)
VALUE
rb_rational_div(VALUE self, VALUE other)
{
if (RB_INTEGER_TYPE_P(other)) {
if (f_zero_p(other))
@ -947,10 +947,10 @@ nurat_fdiv(VALUE self, VALUE other)
{
VALUE div;
if (f_zero_p(other))
return nurat_div(self, rb_float_new(0.0));
return rb_rational_div(self, rb_float_new(0.0));
if (FIXNUM_P(other) && other == LONG2FIX(1))
return nurat_to_f(self);
div = nurat_div(self, other);
div = rb_rational_div(self, other);
if (RB_TYPE_P(div, T_RATIONAL))
return nurat_to_f(div);
if (RB_FLOAT_TYPE_P(div))
@ -1377,7 +1377,7 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE))
s = (*func)(s);
s = nurat_div(f_rational_new_bang1(CLASS_OF(self), s), b);
s = rb_rational_div(f_rational_new_bang1(CLASS_OF(self), s), b);
if (RB_TYPE_P(s, T_RATIONAL) && FIX2INT(rb_int_cmp(n, ONE)) < 0)
s = nurat_truncate(s);
@ -1385,6 +1385,18 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE))
return s;
}
VALUE
rb_rational_floor(VALUE self, int ndigits)
{
if (ndigits == 0) {
return nurat_floor(self);
}
else {
VALUE n = INT2NUM(ndigits);
return f_round_common(1, &n, self, nurat_floor);
}
}
/*
* call-seq:
* rat.floor([ndigits]) -> integer or rational
@ -2013,7 +2025,7 @@ rb_numeric_quo(VALUE x, VALUE y)
}
x = rb_convert_type(x, T_RATIONAL, "Rational", "to_r");
return nurat_div(x, y);
return rb_rational_div(x, y);
}
VALUE
@ -2751,8 +2763,8 @@ Init_Rational(void)
rb_define_method(rb_cRational, "+", rb_rational_plus, 1);
rb_define_method(rb_cRational, "-", rb_rational_minus, 1);
rb_define_method(rb_cRational, "*", rb_rational_mul, 1);
rb_define_method(rb_cRational, "/", nurat_div, 1);
rb_define_method(rb_cRational, "quo", nurat_div, 1);
rb_define_method(rb_cRational, "/", rb_rational_div, 1);
rb_define_method(rb_cRational, "quo", rb_rational_div, 1);
rb_define_method(rb_cRational, "fdiv", nurat_fdiv, 1);
rb_define_method(rb_cRational, "**", nurat_expt, 1);