summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/bigdecimal/bigdecimal.c20
2 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 94042faf45..44412b1b60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@ Tue Dec 16 21:59:29 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/test/unit.rb (Test::Unit.setup_argv): ALT_SEPARATOR support.
+Tue Dec 16 21:59:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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 20:34:44 2008 Tanaka Akira <akr@fsij.org>
* ext/pty/pty.c (getDevice): add nomesg argument.
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index b875f36efa..b25f8e4310 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -1811,7 +1811,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
@@ -3872,7 +3872,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;
@@ -3888,12 +3888,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;