From f92f8b565f2e749c58f0998fdcf6f23d52096fe3 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 8 Apr 2003 09:02:04 +0000 Subject: * random.c (rb_f_rand): normalize bignum argument. * sprintf.c (rb_f_sprintf): was decrementing width even if there is no sign character. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ random.c | 5 +++++ sprintf.c | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f154260b2..5f885f76b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 8 17:13:53 2003 Yukihiro Matsumoto + + * random.c (rb_f_rand): normalize bignum argument. + Tue Apr 8 11:49:31 2003 Yukihiro Matsumoto * eval.c (Init_Proc): make Method and UnboundMethod independent. @@ -34,6 +38,11 @@ Sat Apr 5 23:41:28 2003 Yukihiro Matsumoto * pack.c (pack_pack): small but serious typo. +Sat Apr 5 04:23:05 2003 Warren Brown + + * sprintf.c (rb_f_sprintf): was decrementing width even if there + is no sign character. + Sat Apr 5 01:41:28 2003 Yukihiro Matsumoto * eval.c (backtrace): skip internal allocator frame. diff --git a/random.c b/random.c index 86c8198d41..b04bcddb8f 100644 --- a/random.c +++ b/random.c @@ -215,6 +215,11 @@ rb_f_rand(argc, argv, obj) vmax = rb_dbl2big(RFLOAT(vmax)->value); /* fall through */ case T_BIGNUM: + vmax = rb_big_norm(vmax); + if (FIXNUM_P(vmax)) { + max = FIX2INT(vmax); + break; + } bignum: { long len = RBIGNUM(vmax)->len; diff --git a/sprintf.c b/sprintf.c index caea4c587f..b89f441708 100644 --- a/sprintf.c +++ b/sprintf.c @@ -475,14 +475,16 @@ rb_f_sprintf(argc, argv) if (s[0] == '-') { s++; sc = '-'; + width--; } else if (flags & FPLUS) { sc = '+'; + width--; } else if (flags & FSPACE) { sc = ' '; + width--; } - width--; goto format_integer; } if (!RBIGNUM(val)->sign) { -- cgit v1.2.3