diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-11 14:37:47 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-11 14:37:47 +0000 |
commit | 2fed0e8e6f5d4a194e1dfcb39ef29a4a08cfa4ec (patch) | |
tree | dbf98e5297fd1e907a0f49ad7d74e88e266f99bc | |
parent | 79c3f54d784ea814be8e4163e8b13deff02ff12d (diff) |
merge revision(s) 20228:
* ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug
pointed by Ryan Platte fixed(Patch to the patch from "NATORI
Shin"). [ruby-talk:273360]
back ported from 1.9. fix [ruby-core:19791]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/bigdecimal/bigdecimal.c | 5 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 16 insertions, 4 deletions
@@ -10,6 +10,13 @@ Tue Feb 10 19:40:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (search_required): ditto. +Wed Feb 11 23:37:35 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug + pointed by Ryan Platte fixed(Patch to the patch from "NATORI + Shin"). [ruby-talk:273360] + back ported from 1.9. fix [ruby-core:19791] + Mon Feb 9 17:35:38 2009 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (rb_w32_accept): secure fd before accept because if diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 636c0907d6..7400b313a4 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -4345,6 +4345,11 @@ VpMidRound(Real *y, int f, int nf) nf += y->exponent*((int)BASE_FIG); exptoadd=0; if (nf < 0) { + /* rounding position too left(large). */ + if((f!=VP_ROUND_CEIL) && (f!=VP_ROUND_FLOOR)) { + VpSetZero(y,VpGetSign(y)); /* truncate everything */ + return 0; + } exptoadd = -nf; nf = 0; } @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-02-10" +#define RUBY_RELEASE_DATE "2009-02-11" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090210 -#define RUBY_PATCHLEVEL 113 +#define RUBY_RELEASE_CODE 20090211 +#define RUBY_PATCHLEVEL 114 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 11 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |