From 77da5d140bfa3000537ab78a01b9285238176aa3 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 17 Dec 2008 06:18:38 +0000 Subject: merges r20797 from trunk into ruby_1_9_1. * ext/bigdecimal/bigdecimal.c (VpToString): reverted modification (that caused a bug) in r20359. [ruby-dev:37370] * ext/bigdecimal/bigdecimal.c (BigDecimal_limit): comment update. [ruby-dev:37465] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ ext/bigdecimal/bigdecimal.c | 20 +++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00721e9d3d..bc9b4b8cfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Dec 16 21:59:02 2008 Yukihiro Matsumoto + + * ext/bigdecimal/bigdecimal.c (VpToString): reverted modification + (that caused a bug) in r20359. [ruby-dev:37370] + + * ext/bigdecimal/bigdecimal.c (BigDecimal_limit): comment update. + [ruby-dev:37465] + Tue Dec 16 22:42:16 2008 NAKAMURA Usaku * lib/test/unit.rb (Test::Unit.setup_argv): sorry, fixed wrong commit. diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 0a43570903..b21041a329 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -1797,7 +1797,7 @@ BigDecimal_new(int argc, VALUE *argv, VALUE self) * * A limit of 0, the default, means no upper limit. * - * The limit specified by this method takes priority over any limit + * The limit specified by this method takes less priority over any limit * specified to instance methods such as ceil, floor, truncate, or round. */ static VALUE @@ -3858,7 +3858,7 @@ VpToString(Real *a,char *psz,int fFmt,int fPlus) /* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */ { U_LONG i, ZeroSup; - U_LONG n, e; + U_LONG n, m, e, nn; char *pszSav = psz; S_LONG ex; @@ -3874,12 +3874,18 @@ VpToString(Real *a,char *psz,int fFmt,int fPlus) *psz++ = '.'; n = a->Prec; for(i=0;i < n;++i) { + m = BASE1; e = a->frac[i]; - if((!ZeroSup) || e) { - sprintf(psz, "%lu", e); /* The reading zero(s) */ - psz += strlen(psz); - /* as 0.00xx will be ignored. */ - ZeroSup = 0; /* Set to print succeeding zeros */ + while(m) { + nn = e / m; + if((!ZeroSup) || nn) { + sprintf(psz, "%lu", nn); /* The reading zero(s) */ + psz += strlen(psz); + /* as 0.00xx will be ignored. */ + ZeroSup = 0; /* Set to print succeeding zeros */ + } + e = e - nn * m; + m /= 10; } } ex =(a->exponent) * BASE_FIG; -- cgit v1.2.3