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

numeric.c: rb_int_round

Browse source 
* numeric.c (rb_int_round): rounding function for generic
  Integers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-03-26 01:54:50 +00:00
parent 79b209f19a
commit e9dc649d66
3 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Sat Mar 26 10:54:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Mar 26 10:54:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (rb_int_round): rounding function for generic
Integers.
* numeric.c (rb_int_{uminus,plus,minus,mul,idiv,modulo}): basic * numeric.c (rb_int_{uminus,plus,minus,mul,idiv,modulo}): basic
arithmetic functions for generic Integers. arithmetic functions for generic Integers.

1
internal.h
View file

@ -1013,6 +1013,7 @@ VALUE rb_int_minus(VALUE x, VALUE y);
VALUE rb_int_mul(VALUE x, VALUE y); VALUE rb_int_mul(VALUE x, VALUE y);
VALUE rb_int_idiv(VALUE x, VALUE y); VALUE rb_int_idiv(VALUE x, VALUE y);
VALUE rb_int_modulo(VALUE x, VALUE y); VALUE rb_int_modulo(VALUE x, VALUE y);
VALUE rb_int_round(VALUE num, int ndigits);
VALUE rb_dbl_hash(double d); VALUE rb_dbl_hash(double d);
VALUE rb_fix_plus(VALUE x, VALUE y); VALUE rb_fix_plus(VALUE x, VALUE y);

48
numeric.c
View file

@ -106,6 +106,7 @@ round(double x)
static VALUE fix_uminus(VALUE num); static VALUE fix_uminus(VALUE num);
static VALUE fix_mul(VALUE x, VALUE y); static VALUE fix_mul(VALUE x, VALUE y);
static VALUE int_pow(long x, unsigned long y); static VALUE int_pow(long x, unsigned long y);
static VALUE int_cmp(VALUE x, VALUE y);
static ID id_coerce, id_div, id_divmod; static ID id_coerce, id_div, id_divmod;
#define id_to_i idTo_i #define id_to_i idTo_i
@ -177,6 +178,32 @@ compare_with_zero(VALUE num, ID mid)
#define FIXNUM_NEGATIVE_P(num) ((SIGNED_VALUE)(num) < 0) #define FIXNUM_NEGATIVE_P(num) ((SIGNED_VALUE)(num) < 0)
#define FIXNUM_ZERO_P(num) ((num) == INT2FIX(0)) #define FIXNUM_ZERO_P(num) ((num) == INT2FIX(0))
#if 0
static inline int
int_pos_p(VALUE num)
{
if (FIXNUM_P(num)) {
return FIXNUM_NEGATIVE_P(num);
}
else if (RB_TYPE_P(num, T_BIGNUM)) {
return BIGNUM_NEGATIVE_P(num);
}
return Qnil;
}
#endif
static inline int
int_neg_p(VALUE num)
{
if (FIXNUM_P(num)) {
return FIXNUM_NEGATIVE_P(num);
}
else if (RB_TYPE_P(num, T_BIGNUM)) {
return BIGNUM_NEGATIVE_P(num);
}
return Qnil;
}
static inline int static inline int
positive_int_p(VALUE num) positive_int_p(VALUE num)
{ {
@ -1743,12 +1770,11 @@ flo_ceil(VALUE num)
/* /*
* Assumes num is an Integer, ndigits <= 0 * Assumes num is an Integer, ndigits <= 0
*/ */
static VALUE VALUE
int_round_0(VALUE num, int ndigits) rb_int_round(VALUE num, int ndigits)
{ {
VALUE n, f, h, r; VALUE n, f, h, r;
long bytes; long bytes;
ID op;
/* If 10**N / 2 > num, then return 0 */ /* If 10**N / 2 > num, then return 0 */
/* We have log_256(10) > 0.415241 and log_256(1/2) = -0.125, so */ /* We have log_256(10) > 0.415241 and log_256(1/2) = -0.125, so */
bytes = FIXNUM_P(num) ? sizeof(long) : rb_funcall(num, idSize, 0); bytes = FIXNUM_P(num) ? sizeof(long) : rb_funcall(num, idSize, 0);
@ -1769,12 +1795,12 @@ int_round_0(VALUE num, int ndigits)
/* then int_pow overflow */ /* then int_pow overflow */
return INT2FIX(0); return INT2FIX(0);
} }
h = rb_funcall(f, '/', 1, INT2FIX(2)); h = rb_int_idiv(f, INT2FIX(2));
r = rb_funcall(num, '%', 1, f); r = rb_int_modulo(num, f);
n = rb_funcall(num, '-', 1, r); n = rb_int_minus(num, r);
op = negative_int_p(num) ? idLE : '<'; r = int_cmp(r, h);
if (!RTEST(rb_funcall(r, op, 1, h))) { if (FIXNUM_POSITIVE_P(r) || (FIXNUM_ZERO_P(r) && !int_neg_p(num))) {
n = rb_funcall(n, '+', 1, f); n = rb_int_plus(n, f);
} }
return n; return n;
} }
@ -1826,7 +1852,7 @@ flo_round(int argc, VALUE *argv, VALUE num)
ndigits = NUM2INT(nd); ndigits = NUM2INT(nd);
} }
if (ndigits < 0) { if (ndigits < 0) {
return int_round_0(flo_truncate(num), ndigits); return rb_int_round(flo_truncate(num), ndigits);
} }
number = RFLOAT_VALUE(num); number = RFLOAT_VALUE(num);
if (ndigits == 0) { if (ndigits == 0) {
@ -4123,7 +4149,7 @@ int_round(int argc, VALUE* argv, VALUE num)
if (ndigits == 0) { if (ndigits == 0) {
return num; return num;
} }
return int_round_0(num, ndigits); return rb_int_round(num, ndigits);
} }
/* /*