1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sprintf.c: Rational f by generic Integer functions

Browse Source 
* sprintf.c (rb_str_format): convert Rational to floating point
  format by using gereric Integer functions, not by methods which
  can be overwritten.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-03-27 03:13:39 +00:00
parent 3ce3e196ac
commit ee2f3c6def
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Mar 27 12:13:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_str_format): convert Rational to floating point
format by using gereric Integer functions, not by methods which
can be overwritten.
Sat Mar 26 10:55:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Mar 26 10:55:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (rb_int2str): conversion function to String for * numeric.c (rb_int2str): conversion function to String for

17
sprintf.c
View File

@ -1056,22 +1056,19 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
sign = -1; sign = -1;
} }
} }
else if (rb_num_negative_p(num)) { else if (BIGNUM_NEGATIVE_P(num)) {
sign = -1; sign = -1;
num = rb_funcallv(num, idUMinus, 0, 0); num = rb_big_uminus(num);
} }
if (den != INT2FIX(1) || prec > 1) { if (den != INT2FIX(1)) {
const ID idDiv = rb_intern("div"); num = rb_int_mul(num, rb_int_positive_pow(10, prec));
VALUE p10 = rb_int_positive_pow(10, prec); num = rb_int_plus(num, rb_int_idiv(den, INT2FIX(2)));
VALUE den_2 = rb_funcall(den, idDiv, 1, INT2FIX(2)); num = rb_int_idiv(num, den);
num = rb_funcallv(num, '*', 1, &p10);
num = rb_funcallv(num, '+', 1, &den_2);
num = rb_funcallv(num, idDiv, 1, &den);
} }
else if (prec >= 0) { else if (prec >= 0) {
zero = prec; zero = prec;
} }
val = rb_obj_as_string(num); val = rb_int2str(num, 10);
len = RSTRING_LEN(val) + zero; len = RSTRING_LEN(val) + zero;
if (prec >= len) ++len; /* integer part 0 */ if (prec >= len) ++len; /* integer part 0 */
if (sign || (flags&FSPACE)) ++len; if (sign || (flags&FSPACE)) ++len;